Compiles correctly with new package

git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@388357 13f79535-47bb-0310-9956-ffa450edef68
2026-08-07 15:46:57 +00:00 · 2006-03-24 04:12:49 +00:00
parent f02c429125
commit c94ad18aa3
458 changed files with 1262 additions and 1262 deletions
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork;
+package org.apache.struts.action2;

 import java.io.File;
 import java.io.FilenameFilter;
@@ -127,7 +127,7 @@ public class Main {
                return;
            }

-            launch("com.opensymphony.webwork.quickstart.QuickStart", programArgs, urls);
+            launch("org.apache.struts.action2.quickstart.QuickStart", programArgs, urls);
            return;
        }

@@ -140,7 +140,7 @@ public class Main {
        }

        if ("sitegraph".equals(command)) {
-            launch("com.opensymphony.webwork.sitegraph.SiteGraph", programArgs, urls);
+            launch("org.apache.struts.action2.sitegraph.SiteGraph", programArgs, urls);
        }
    }

@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;

 import javax.servlet.http.HttpServletRequest;

@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;

 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;

 /**
 * This class provides a central location for framework constants related to
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;


 /**
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork;
+package org.apache.struts.action2;

-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.config.Configuration;
 import com.opensymphony.xwork.XWorkTestCase;

 /**
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.io.Serializable;

@@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

-import com.opensymphony.webwork.interceptor.ServletRequestAware;
-import com.opensymphony.webwork.interceptor.ServletResponseAware;
+import org.apache.struts.action2.interceptor.ServletRequestAware;
+import org.apache.struts.action2.interceptor.ServletResponseAware;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;

@@ -29,7 +29,7 @@ import com.opensymphony.xwork.ActionSupport;
 * <!-- START SNIPPET: example -->
 * 
 *   &lt;package name="richtexteditor-browse" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
- *   	&lt;action name="connector" class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" method="browse">
+ *   	&lt;action name="connector" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="browse">
 *   		&lt;result name="getFolders" type="richtexteditorGetFolders" /&gt;
 *   		&lt;result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" /&gt;
 *   		&lt;result name="createFolder" type="richtexteditorCreateFolder" /&gt;
@@ -38,7 +38,7 @@ import com.opensymphony.xwork.ActionSupport;
 *   &lt;/package&gt;
 * 
 *   &lt;package name="richtexteditor-upload" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/upload"&gt;
- *		&lt;action name="uploader" class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" method="upload"&gt;
+ *		&lt;action name="uploader" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="upload"&gt;
 *			&lt;result name="richtexteditorFileUpload" /&gt;
 *		&lt;/action&gt;    
 *   &lt;/package&gt;
@@ -49,7 +49,7 @@ import com.opensymphony.xwork.ActionSupport;
 * 
 * @author tm_jee
 * @version $Date: 2006/03/08 20:22:33 $ $Id: AbstractRichtexteditorConnector.java,v 1.4 2006/03/08 20:22:33 rainerh Exp $
- * @see com.opensymphony.webwork.components.DefaultRichtexteditorConnector
+ * @see org.apache.struts.action2.components.DefaultRichtexteditorConnector
 */
 public abstract class AbstractRichtexteditorConnector extends ActionSupport implements ServletRequestAware, ServletResponseAware {
 	
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
-import com.opensymphony.webwork.dispatcher.RequestMap;
-import com.opensymphony.webwork.views.jsp.TagUtils;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.dispatcher.RequestMap;
+import org.apache.struts.action2.views.jsp.TagUtils;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.ActionProxyFactory;
@@ -90,7 +90,7 @@ import java.util.Map;
 * @version $Revision: 1.22 $
 * @since 2.2
 *
- * @ww.tag name="action" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ActionTag"
+ * @ww.tag name="action" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ActionTag"
 * description="Execute an action from within a view"
 */
 public class ActionComponent extends Component {
@@ -169,7 +169,7 @@ public class ActionComponent extends Component {
     * and the namespace will be saved into the instance variables proxy and
     * namespace respectively.
     *
-     * @see com.opensymphony.webwork.views.jsp.TagUtils#buildNamespace
+     * @see org.apache.struts.action2.views.jsp.TagUtils#buildNamespace
     */
    private void executeAction() {
        String actualName = findString(name, "name", "Action name is required. Example: updatePerson");
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 *
 * @author tm_jee
 * @version $Date: 2006/01/01 15:16:03 $ $Id: ActionError.java,v 1.5 2006/01/01 15:16:03 tmjee Exp $
- * @ww.tag name="actionerror" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ActionErrorTag"
+ * @ww.tag name="actionerror" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ActionErrorTag"
 * description="Render action errors if they exists"
 * @since 2.2
 */
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 *
 * @author tm_jee
 * @version $Date: 2006/01/07 20:43:28 $ $Id: ActionMessage.java,v 1.6 2006/01/07 20:43:28 plightbo Exp $
- * @ww.tag name="actionmessage" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ActionMessageTag"
+ * @ww.tag name="actionmessage" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ActionMessageTag"
 * description="Render action messages if they exists"
 * @since 2.2
 */
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -63,7 +63,7 @@ import javax.servlet.http.HttpServletResponse;
 * @author Ian Roughley
 * @author Rene Gielen
 * @version $Revision: 1.5 $
- * @ww.tag name="a" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.AnchorTag"
+ * @ww.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.AnchorTag"
 * description="Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest"
 * @since 2.2
 */
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.io.Writer;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

-import com.opensymphony.webwork.components.Param.UnnamedParametric;
-import com.opensymphony.webwork.util.AppendIteratorFilter;
-import com.opensymphony.webwork.util.MakeIterator;
+import org.apache.struts.action2.components.Param.UnnamedParametric;
+import org.apache.struts.action2.util.AppendIteratorFilter;
+import org.apache.struts.action2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;

 /**
@@ -95,10 +95,10 @@ import com.opensymphony.xwork.util.OgnlValueStack;
 *
 * @author tm_jee ( tm_jee (at) yahoo.co.uk )
 * @version $Date: 2006/03/18 15:57:09 $ $Id: AppendIterator.java,v 1.10 2006/03/18 15:57:09 rgielen Exp $
- * @see com.opensymphony.webwork.util.AppendIteratorFilter
- * @see com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag
+ * @see org.apache.struts.action2.util.AppendIteratorFilter
+ * @see org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag
 *
- * @ww.tag name="append" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag"
+ * @ww.tag name="append" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag"
 * description="Append the values of a list of iterators to one iterator"
 */
 public class AppendIterator extends Component implements UnnamedParametric {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

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

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.9 $
 * @since 2.2
 *
- * @ww.tag name="checkbox" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.CheckboxTag"
+ * @ww.tag name="checkbox" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.CheckboxTag"
 * description="Render a checkbox input field"
  */
 public class Checkbox extends UIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.6 $
 * @since 2.2
 *
- * @ww.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.CheckboxListTag"
+ * @ww.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.CheckboxListTag"
 * description="Render a list of checkboxes"
  */
 public class CheckboxList extends ListUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.8 $
 * @since 2.2
 *
- * @ww.tag name="combobox" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ComboBoxTag"
+ * @ww.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComboBoxTag"
 * description="Widget that fills a text box from a select"
  */
 public class ComboBox extends TextField {
@@ -1,12 +1,12 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.util.FastByteArrayOutputStream;
-import com.opensymphony.webwork.views.jsp.TagUtils;
-import com.opensymphony.webwork.views.util.ContextUtil;
-import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.util.FastByteArrayOutputStream;
+import org.apache.struts.action2.views.jsp.TagUtils;
+import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts.action2.views.util.UrlHelper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;
 import org.apache.commons.logging.Log;
@@ -297,7 +297,7 @@ public class Component {
    }

    /**
-     * Renders an action URL by consulting the {@link com.opensymphony.webwork.dispatcher.mapper.ActionMapper}.
+     * Renders an action URL by consulting the {@link org.apache.struts.action2.dispatcher.mapper.ActionMapper}.
     * @param action      the action
     * @param namespace   the namespace
     * @param method      the method
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.TextProvider;
@@ -124,7 +124,7 @@ import java.util.List;
 *
 *
 * @ww.tag name="date" tld-body-content="empty"
- *         tld-tag-class="com.opensymphony.webwork.views.jsp.DateTag"
+ *         tld-tag-class="org.apache.struts.action2.views.jsp.DateTag"
 *         description="Render a formatted date."
 */
 public class Date extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -83,7 +83,7 @@ import java.util.Locale;
 * @author Patrick Lightbody
 * @author Rene Gielen
 * @version $Revision: 1.12 $
- * @ww.tag name="datepicker" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DatePickerTag"
+ * @ww.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DatePickerTag"
 * description="Render datepicker"
 * @since 2.2
 */
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlUtil;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -40,7 +40,7 @@ import java.util.Map;
 * @version $Revision: 1.2 $
 * @since 2.2
 *
- * @ww.tag name="debug" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DebugTag"
+ * @ww.tag name="debug" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DebugTag"
 * description="Render debug tag"
  */
 public class Debug extends UIBean {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -20,8 +20,8 @@ import javax.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

-import com.opensymphony.webwork.util.ServletContextAware;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.util.ServletContextAware;
+import org.apache.struts.action2.views.util.UrlHelper;

 /**
 * 
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.util.TextUtils;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory;
 * @version $Revision: 1.11 $
 * @since 2.2
 *
- * @ww.tag name="div" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DivTag"
+ * @ww.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DivTag"
 * description="Render HTML div providing content from remote call via AJAX"
  */
 public class Div extends RemoteCallUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.util.Map;

@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.11 $
 * @since 2.2
 *
- * @ww.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DoubleSelectTag"
+ * @ww.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DoubleSelectTag"
 * description="Renders two HTML select elements with second one changing displayed values depending on selected entry of first one."
 */
 public class DoubleSelect extends DoubleListUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -36,7 +36,7 @@ import java.util.Map;
 *
 * @author Rick Salsa (rsal@mb.sympatico.ca)
 * @author tmjee
- * @ww.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="com.opensymphony.webwork.views.jsp.ElseTag"
+ * @ww.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="org.apache.struts.action2.views.jsp.ElseTag"
 */
 public class Else extends Component {
    public Else(OgnlValueStack stack) {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -40,7 +40,7 @@ import java.io.Writer;
 *
 * @author Rick Salsa (rsal@mb.sympatico.ca)
 * @author tmjee
- * @ww.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="com.opensymphony.webwork.views.jsp.ElseIfTag"
+ * @ww.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="org.apache.struts.action2.views.jsp.ElseIfTag"
 */
 public class ElseIf extends Component {
    public ElseIf(OgnlValueStack stack) {
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.components.Param.UnnamedParametric;
+import org.apache.struts.action2.components.Param.UnnamedParametric;
 import com.opensymphony.xwork.util.OgnlValueStack;

 import javax.servlet.http.HttpServletRequest;
@@ -65,7 +65,7 @@ import java.util.List;
 *
 * @author tm_jee
 * @version $Date: 2006/01/01 15:16:03 $ $Id: FieldError.java,v 1.7 2006/01/01 15:16:03 tmjee Exp $
- * @ww.tag name="fielderror" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.FieldErrorTag"
+ * @ww.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FieldErrorTag"
 * description="Render field error (all or partial depending on param tag nested)if they exists"
 */
 public class FieldError extends UIBean implements UnnamedParametric {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
 * @version $Revision: 1.11 $
 * @since 2.2
 *
- * @ww.tag name="file" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.FileTag"
+ * @ww.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FileTag"
 * description="Render a file input field"
  */
 public class File extends UIBean {
@@ -1,11 +1,11 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.portlet.util.PortletUrlHelper;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.util.PortletUrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -53,7 +53,7 @@ import java.util.Iterator;
 * @version $Date: 2006/03/18 15:49:26 $ $Id: Form.java,v 1.29 2006/03/18 15:49:26 rgielen Exp $
 * @since 2.2
 *
- * @ww.tag name="form" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.FormTag"
+ * @ww.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FormTag"
 * description="Renders an input form"
  */
 public class Form extends ClosingUIBean {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.util.ContainUtil;
+import org.apache.struts.action2.util.ContainUtil;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,7 +54,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.5 $
 * @since 2.2
 *
- * @ww.tag name="component" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ComponentTag"
+ * @ww.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComponentTag"
 * description="Render a custom ui widget"
 */
 public class GenericUIBean extends UIBean {
@@ -2,11 +2,11 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.WebWorkConstants;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -60,7 +60,7 @@ import javax.servlet.http.HttpServletResponse;
 * @author Patrick Lightbody
 * @author Rainer Hermanns
 * @author Rene Gielen
- * @ww.tag name="head" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.HeadTag"
+ * @ww.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HeadTag"
 * description="Render a chunk of HEAD for your HTML file"
 * @since 2.2
 */
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.5 $
 * @since 2.2
 *
- * @ww.tag name="hidden" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.HiddenTag"
+ * @ww.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HiddenTag"
 * description="Render a hidden input field"
  */
 public class Hidden extends UIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.LocaleProvider;
@@ -63,7 +63,7 @@ import java.util.ResourceBundle;
 * @version $Revision: 1.13 $
 * @since 2.2
 *
- * @ww.tag name="i18n" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.I18nTag"
+ * @ww.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.I18nTag"
 * description="Get a resource bundle and place it on the value stack"
 */
 public class I18n extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -43,7 +43,7 @@ import java.io.Writer;
 * @see Else
 * @see ElseIf
 *
- * @ww.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="com.opensymphony.webwork.views.jsp.IfTag"
+ * @ww.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.action2.views.jsp.IfTag"
 */
 public class If extends Component {
    public static final String ANSWER = "webwork.if.answer";
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.FastByteArrayOutputStream;
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.FastByteArrayOutputStream;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.util.OgnlValueStack;

 import org.apache.commons.logging.Log;
@@ -69,7 +69,7 @@ import java.util.*;
 * @version $Revision: 1.20 $
 * @since 2.2
 *
- * @ww.tag name="include" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.IncludeTag"
+ * @ww.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IncludeTag"
 * description="Include a servlet's output (result of servlet or a JSP page)"
 */
 public class Include extends Component {
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.util.MakeIterator;
-import com.opensymphony.webwork.views.jsp.IteratorStatus;
+import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.action2.views.jsp.IteratorStatus;
 import com.opensymphony.xwork.util.OgnlValueStack;

 import java.io.Writer;
@@ -58,7 +58,7 @@ import java.util.Iterator;
 * <pre>
 * <!-- START SNIPPET: example2code -->
 * 
- * &lt;ww:bean name="com.opensymphony.webwork.example.IteratorExample" id="it"&gt;
+ * &lt;ww:bean name="org.apache.struts.action2.example.IteratorExample" id="it"&gt;
 *   &lt;ww:param name="day" value="'foo'"/&gt;
 *   &lt;ww:param name="day" value="'bar'"/&gt;
 * &lt;/ww:bean&gt;
@@ -140,7 +140,7 @@ import java.util.Iterator;
 * @author Rick Salsa (rsal@mb.sympatico.ca)
 * @author tm_jee ( tm_jee(at)yahoo.co.uk )
 * @version $Revision: 1.11 $
- * @ww.tag name="iterator" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.IteratorTag"
+ * @ww.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IteratorTag"
 * description="Iterate over a iterable value"
 */
 public class IteratorComponent extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.11 $
 * @since 2.2
 *
- * @ww.tag name="label" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.LabelTag"
+ * @ww.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.LabelTag"
 * description="Render a label that displays read-only information"
  */
 public class Label extends UIBean {
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.util.ContainUtil;
-import com.opensymphony.webwork.util.MakeIterator;
+import org.apache.struts.action2.util.ContainUtil;
+import org.apache.struts.action2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;

 import javax.servlet.http.HttpServletRequest;
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.io.Writer;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

-import com.opensymphony.webwork.components.Param.UnnamedParametric;
-import com.opensymphony.webwork.util.MakeIterator;
-import com.opensymphony.webwork.util.MergeIteratorFilter;
+import org.apache.struts.action2.components.Param.UnnamedParametric;
+import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.action2.util.MergeIteratorFilter;
 import com.opensymphony.xwork.util.OgnlValueStack;

 /**
@@ -108,10 +108,10 @@ import com.opensymphony.xwork.util.OgnlValueStack;
 *
 * @author tm_jee (tm_jee (at) yahoo.co.uk)
 * @version $Date: 2006/03/18 16:14:40 $ $Id: MergeIterator.java,v 1.10 2006/03/18 16:14:40 rgielen Exp $
- * @see com.opensymphony.webwork.util.MergeIteratorFilter
- * @see com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag
+ * @see org.apache.struts.action2.util.MergeIteratorFilter
+ * @see org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag
 *
- * @ww.tag name="merge" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag"
+ * @ww.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag"
 * description="Merge the values of a list of iterators into one iterator"
 */
 public class MergeIterator extends Component implements UnnamedParametric {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -78,7 +78,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
 * 
 * @author tm_jee
 * @version $Date: 2006/03/18 16:14:42 $ $Id: OptionTransferSelect.java,v 1.9 2006/03/18 16:14:42 rgielen Exp $
- * @ww.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.OptionTransferSelectTag"
+ * @ww.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag"
 * description="Renders an input form"
 */
 public class OptionTransferSelect extends DoubleListUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -25,7 +25,7 @@ import java.io.Writer;
 *
 * @see TabbedPanel
 *
- * @ww.tag name="panel" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.PanelTag"
+ * @ww.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PanelTag"
 * description="Render a panel for tabbedPanel"
 */
 public class Panel extends Div {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -74,7 +74,7 @@ import java.io.Writer;
 * @see Bean
 * @see Text
 *
- * @ww.tag name="param" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ParamTag"
+ * @ww.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ParamTag"
 * description="Parametrize other tags"
 */
 public class Param extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.8 $
 * @since 2.2
 *
- * @ww.tag name="password" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.PasswordTag"
+ * @ww.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PasswordTag"
 * description="Render an HTML input tag of type password"
 */
 public class Password extends TextField {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.util.TextUtils;
@@ -71,7 +71,7 @@ import org.apache.commons.logging.LogFactory;
 * @author Rene Gielen
 * @version $Revision: 1.4 $
 *
- * @ww.tag name="property" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.PropertyTag"
+ * @ww.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.PropertyTag"
 * description="Print out expression which evaluates against the stack"
 */
 public class Property extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -92,7 +92,7 @@ import java.io.Writer;
 * @version $Revision: 1.15 $
 * @since 2.2
 *
- * @ww.tag name="push" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.PushTag"
+ * @ww.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.PushTag"
 * description="Push value on stack for simplified usage."
 */
 public class Push extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.6 $
 * @since 2.2
 *
- * @ww.tag name="radio" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.RadioTag"
+ * @ww.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RadioTag"
 * description="Renders a radio button input field"
 */
 public class Radio extends ListUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2006 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.4 $
 * @since 2.2.2
 *
- * @ww.tag name="reset" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ResetTag"
+ * @ww.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ResetTag"
 * description="Render a reset button"
 */
 public class Reset extends FormButton {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -47,7 +47,7 @@ import java.util.Locale;
 *   &lt;package name="richtexteditor-browse" extends="webwork-default" 
 *   namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
 *   	&lt;action name="connector" 
- *      class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" 
+ *      class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
 *      method="browse">
 *   		&lt;result name="getFolders" type="richtexteditorGetFolders" /&gt;
 *   		&lt;result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" /&gt;
@@ -108,7 +108,7 @@ import java.util.Locale;
 *   &lt;package name="richtexteditor-upload" extends="webwork-default" 
 *   namespace="/webwork/richtexteditor/editor/filemanager/upload"&gt;
 *		&lt;action name="uploader" 
- *       class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" 
+ *       class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
 *       method="upload"&gt;
 *			&lt;result name="richtexteditorFileUpload" /&gt;
 *		&lt;/action&gt;    
@@ -180,7 +180,7 @@ import java.util.Locale;
 * @version $Date: 2006/03/18 15:45:33 $ $Id: RichTextEditor.java,v 1.9 2006/03/18 15:45:33 rgielen Exp $
 * @see AbstractRichtexteditorConnector
 * 
- * @ww.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.RichTextEditorTag"
+ * @ww.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RichTextEditorTag"
 * description="Render a rich text editor element"
 */
 public class RichTextEditor extends UIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -59,7 +59,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.9 $
 * @since 2.2
 *
- * @ww.tag name="select" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.SelectTag"
+ * @ww.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SelectTag"
 * description="Render a select element"
 */
 public class Select extends ListUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -44,7 +44,7 @@ import java.io.Writer;
 * @version $Revision: 1.12 $
 * @since 2.2
 *
- * @ww.tag name="set" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.SetTag"
+ * @ww.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.SetTag"
 * description="Assigns a value to a variable in a specified scope"
 */
 public class Set extends Component {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -145,7 +145,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.16 $
 * @since 2.2
 *
- * @ww.tag name="submit" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.SubmitTag"
+ * @ww.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SubmitTag"
 * description="Render a submit button"
 */
 public class Submit extends FormButton {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -76,7 +76,7 @@ import java.util.List;
 *
 * @see Panel
 *
- * @ww.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TabbedPanelTag"
+ * @ww.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TabbedPanelTag"
 * description="Render a tabbedPanel widget."
 */
 public class TabbedPanel extends ClosingUIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.io.IOException;
 import java.io.Writer;
@@ -87,7 +87,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
 *
 * @see Param
 *
- * @ww.tag name="text" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.TextTag"
+ * @ww.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.TextTag"
 * description="Render a I18n text message."
 */
 public class Text extends Component implements Param.UnnamedParametric {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 *
 * @see TabbedPanel
 *
- * @ww.tag name="textarea" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TextareaTag"
+ * @ww.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextareaTag"
 * description="Render HTML textarea tag."
 */
 public class TextArea extends UIBean {
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 * @version $Revision: 1.10 $
 * @since 2.2
 *
- * @ww.tag name="textfield" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TextFieldTag"
+ * @ww.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextFieldTag"
 * description="Render an HTML input field of type text"
 */
 public class TextField extends UIBean {
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.util.TokenHelper;
+import org.apache.struts.action2.util.TokenHelper;
 import com.opensymphony.xwork.util.OgnlValueStack;

 import javax.servlet.http.HttpServletRequest;
@@ -34,10 +34,10 @@ import java.util.Map;
 * @version $Date: 2006/03/18 16:24:46 $ $Id: Token.java,v 1.8 2006/03/18 16:24:46 rgielen Exp $
 * @since 2.2
 *
- * @see com.opensymphony.webwork.interceptor.TokenInterceptor
- * @see com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor
+ * @see org.apache.struts.action2.interceptor.TokenInterceptor
+ * @see org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor
 *
- * @ww.tag name="token" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TokenTag"
+ * @ww.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TokenTag"
 * description="Stop double-submission of forms"
 */
 public class Token extends UIBean {
@@ -53,7 +53,7 @@ public class Token extends UIBean {
    }

    /**
-     * First looks for the token in the PageContext using the supplied name (or {@link com.opensymphony.webwork.util.TokenHelper#DEFAULT_TOKEN_NAME}
+     * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts.action2.util.TokenHelper#DEFAULT_TOKEN_NAME}
     * if no name is provided) so that the same token can be re-used for the scope of a request for the same name. If
     * the token is not in the PageContext, a new Token is created and set into the Session and the PageContext with
     * the name.
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2005 ePlus Corporation. All Rights Reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -28,7 +28,7 @@ import java.io.Writer;
 *
 * @author Jason Carreira <jcarreira@eplus.com>
 *
- * @ww.tag name="tree" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TreeTag"
+ * @ww.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeTag"
 * description="Render a tree widget."
 */
 public class Tree extends ClosingUIBean {
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2005 Opensymphony. All Rights Reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import com.opensymphony.xwork.util.OgnlValueStack;

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 *
 * @author Jason Carreira <jcarreira@eplus.com>
 *
- * @ww.tag name="treenode" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TreeNodeTag"
+ * @ww.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeNodeTag"
 * description="Render a tree node within a tree widget."
 */
 public class TreeNode extends ClosingUIBean {
@@ -2,15 +2,15 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.components.template.Template;
-import com.opensymphony.webwork.components.template.TemplateEngine;
-import com.opensymphony.webwork.components.template.TemplateEngineManager;
-import com.opensymphony.webwork.components.template.TemplateRenderingContext;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.util.ContextUtil;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.components.template.Template;
+import org.apache.struts.action2.components.template.TemplateEngine;
+import org.apache.struts.action2.components.template.TemplateEngineManager;
+import org.apache.struts.action2.components.template.TemplateRenderingContext;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.util.ContextUtil;
 import com.opensymphony.xwork.config.ConfigurationException;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -3,12 +3,12 @@
 * All rights reserved.
 */

-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.portlet.util.PortletUrlHelper;
-import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.util.PortletUrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.XWorkContinuationConfig;
 import com.opensymphony.xwork.ActionContext;
@@ -93,7 +93,7 @@ import java.util.Map;
 *
 * @see Param
 *
- * @ww.tag name="url" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.URLTag"
+ * @ww.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.URLTag"
 * description="This tag is used to create a URL"
 */
 public class URL extends Component {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;

 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -58,7 +58,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
 * @author tm_jee
 * @version $Date: 2006/03/18 15:50:12 $ $Id: UpDownSelect.java,v 1.7 2006/03/18 15:50:12 rgielen Exp $
 * 
- * @ww.tag name="updownselect" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.UpDownSelectTag"
+ * @ww.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.UpDownSelectTag"
 * description="Render a up down select element"
 */
 public class UpDownSelect extends Select {
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;

 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableModel;
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;

 import javax.swing.table.TableModel;

@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;

 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;

 import javax.swing.table.TableModel;

@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;

-import com.opensymphony.webwork.components.GenericUIBean;
-import com.opensymphony.webwork.components.table.renderer.CellRenderer;
+import org.apache.struts.action2.components.GenericUIBean;
+import org.apache.struts.action2.components.table.renderer.CellRenderer;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;

 /**
- * @ww.tag name="table" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.table.WebTableTag"
+ * @ww.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.table.WebTableTag"
 * description="Instantiate a JavaBean and place it in the context."
 */
 public class WebTable extends GenericUIBean {
@@ -274,7 +274,7 @@ public class WebTable extends GenericUIBean {
    }

    /**
-     * Whether the table should be sortable. Requires that model implements com.opensymphony.webwork.components.table.SortableTableModel if set to true.
+     * Whether the table should be sortable. Requires that model implements org.apache.struts.action2.components.table.SortableTableModel if set to true.
     * @ww.tagattribute required="false" type="Boolean" default="false"
     */
    public void setSortable(boolean sortable) {
@@ -2,10 +2,10 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;

-import com.opensymphony.webwork.components.table.renderer.CellRenderer;
-import com.opensymphony.webwork.components.table.renderer.DefaultCellRenderer;
+import org.apache.struts.action2.components.table.renderer.CellRenderer;
+import org.apache.struts.action2.components.table.renderer.DefaultCellRenderer;


 /**
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;


 /**
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;


 /**
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;

 /**
 * @author $author$
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;

 import java.text.SimpleDateFormat;

@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;


 /**
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;


 /**
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;


 /**
@@ -2,9 +2,9 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;

-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;

 import java.text.DecimalFormat;

@@ -2,7 +2,7 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

 import com.opensymphony.util.ClassLoaderUtil;
 import org.apache.commons.logging.Log;
@@ -2,10 +2,10 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.freemarker.FreemarkerManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.freemarker.FreemarkerManager;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -2,11 +2,11 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.Include;
-import com.opensymphony.webwork.components.UIBean;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.Include;
+import org.apache.struts.action2.components.UIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -2,7 +2,7 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

 import java.util.ArrayList;
 import java.util.List;
@@ -2,7 +2,7 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

 import java.util.Map;

@@ -2,9 +2,9 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.config.Configuration;

 import java.util.HashMap;
 import java.util.Map;
@@ -2,9 +2,9 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

-import com.opensymphony.webwork.components.UIBean;
+import org.apache.struts.action2.components.UIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;

 import java.io.Writer;
@@ -2,10 +2,10 @@
 *  Copyright (c) 2002-2006 by OpenSymphony
 *  All rights reserved.
 */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;

-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.app.VelocityEngine;
@@ -2,10 +2,10 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;

 import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.WebWorkConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -2,10 +2,10 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;

 import com.opensymphony.xwork.util.LocalizedTextUtil;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.WebWorkConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;

 import java.util.HashSet;
 import java.util.Iterator;
@@ -14,7 +14,7 @@ import java.util.Set;
 * a config method is called (get, set, list, etc..) this class will go through the list of configurations
 * and call the method until successful.
 *
- * @author Rickard Öberg
+ * @author Rickard �berg
 * @author Jason Carreira
 * @author Bill Lynch (docs)
 */
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;

 import java.io.IOException;
 import java.net.URL;
@@ -13,7 +13,7 @@ import java.util.Properties;
 /**
 * A class to handle configuration via a properties file.
 *
- * @author Rickard Öberg
+ * @author Rickard �berg
 * @author Jason Carreira
 * @author Bill Lynch (docs)
 */
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;

 import javax.servlet.ServletContext;

@@ -10,9 +10,9 @@ import javax.servlet.ServletContext;
 * from the web session object.
 * <p/>
 * This class is created to bet that this singleton can be set by
- * {@link com.opensymphony.webwork.dispatcher.FilterDispatcherCompatWeblogic61}
+ * {@link org.apache.struts.action2.dispatcher.FilterDispatcherCompatWeblogic61}
 * before the servlet context is needed by
- * {@link com.opensymphony.webwork.lifecycle.SessionLifecycleListener}
+ * {@link org.apache.struts.action2.lifecycle.SessionLifecycleListener}
 * which will use this object to get it.
 *
 * @author Scott N. Smith scottnelsonsmith@yahoo.com
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;

 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.WebWorkConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;

 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.entities.ActionConfig;
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;

 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.validator.ActionValidatorManagerFactory;
-import com.opensymphony.webwork.util.ClassLoaderUtils;
+import org.apache.struts.action2.util.ClassLoaderUtils;

 import java.util.Collections;
 import java.util.List;
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;

 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.config.entities.ActionConfig;
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;

 import com.opensymphony.xwork.util.OgnlUtil;
 import com.opensymphony.xwork.validator.Validator;
@@ -5,9 +5,9 @@
 ###

 ### Specifies the Configuration used to configure webwork
-### one could extend com.opensymphony.webwork.config.Configuration
+### one could extend org.apache.struts.action2.config.Configuration
 ### to build one's customize way of getting the configurations parameters into webwork
-# webwork.configuration=com.opensymphony.webwork.config.DefaultConfiguration
+# webwork.configuration=org.apache.struts.action2.config.DefaultConfiguration

 ### This can be used to set your default locale and encoding scheme
 # webwork.locale=en_US
@@ -48,7 +48,7 @@ webwork.multipart.maxSize=2097152
 # webwork.custom.properties=application,com/webwork/extension/custom

 ### How request URLs are mapped to and from actions
-webwork.mapper.class=com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper
+webwork.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper

 ### Used by the DefaultActionMapper
 ### You may provide a comma separated list, e.g. webwork.action.extension=action,jnlp,do
@@ -109,8 +109,8 @@ webwork.dispatcher.parametersWorkaround = false

 ### configure the Freemarker Manager class to be used
 ### Allows user to plug-in customised Freemarker Manager if necessary
-### MUST extends off com.opensymphony.webwork.views.freemarker.FreemarkerManager
-#webwork.freemarker.manager.classname=com.opensymphony.webwork.views.freemarker.FreemarkerManager
+### MUST extends off org.apache.struts.action2.views.freemarker.FreemarkerManager
+#webwork.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager

 ### See the WebWorkBeanWrapper javadocs for more information
 webwork.freemarker.wrapper.altMap=true
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;

 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2003 by OpenSymphony
 * All rights reserved.
 */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;

 import javax.servlet.ServletContext;
 import java.io.Serializable;
@@ -15,7 +15,7 @@ import java.util.*;
 * enumerates over all servlet context attributes and init parameters and returns a collection of both.
 * Note, this will occur lazily - only when the entry set is asked for.
 *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
 * @author Bill Lynch (docs)
 */
 public class ApplicationMap extends AbstractMap implements Serializable {
@@ -8,9 +8,9 @@
 * To change the template for this generated file go to
 * Window - Preferences - Java - Code Generation - Code and Comments
 */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;

-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
 import org.jfree.chart.ChartUtilities;
--- a/Show More
+++ b/Show More