struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tm...@apache.org
Subject svn commit: r391069 [2/9] - in /incubator/webwork2/src: java/org/apache/struts/action2/ java/org/apache/struts/action2/components/ java/org/apache/struts/action2/components/table/ java/org/apache/struts/action2/components/table/renderer/ java/org/apach...
Date Mon, 03 Apr 2006 15:30:10 GMT
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/CheckboxList.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/CheckboxList.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/CheckboxList.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/CheckboxList.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -25,7 +25,7 @@
  * @version $Revision: 1.6 $
  * @since 2.2
  *
- * @a2.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.CheckboxListTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/ClosingUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/ClosingUIBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/ClosingUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/ClosingUIBean.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@
  * @version $Revision: 1.8 $
  * @since 2.2
  *
- * @a2.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.ComboBoxTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java Mon Apr  3 08:28:51 2006
@@ -1,12 +1,12 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.util.FastByteArrayOutputStream;
-import org.apache.struts.webwork.views.jsp.TagUtils;
-import org.apache.struts.webwork.views.util.ContextUtil;
-import org.apache.struts.webwork.views.util.UrlHelper;
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapper;
-import org.apache.struts.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 @@
     }
 
     /**
-     * Renders an action URL by consulting the {@link org.apache.struts.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

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.TextProvider;
@@ -124,7 +124,7 @@
  *
  *
  * @a2.tag name="date" tld-body-content="empty"
- *         tld-tag-class="org.apache.struts.webwork.views.jsp.DateTag"
+ *         tld-tag-class="org.apache.struts.action2.views.jsp.DateTag"
  *         description="Render a formatted date."
  */
 public class Date extends Component {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/DatePicker.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/DatePicker.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/DatePicker.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/DatePicker.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -69,21 +69,21 @@
  * <!-- START SNIPPET: expldesc2 -->
  *
  * If you use this jscalendar based datepicker widget, you might want to use one of the standard stylesheets provided
- * with jscalendar (all distribution stylesheets are included in webwork jar). The easiest way to do so is to place the
+ * with jscalendar (all distribution stylesheets are included in struts jar). The easiest way to do so is to place the
  * &lt;a:head/&gt; tag in the head of your html page, as it takes care of including calendar css.
  * Otherwise, to manually activate the calendar-blue style, include the following in your stylesheet definition:
  *
  * <!-- END SNIPPET: expldesc2 -->
  * <pre>
  * <!-- START SNIPPET: expl2 -->
- * &lt;link href="&lt;a:url value="/webwork/jscalendar/calendar-blue.css" /&gt;" rel="stylesheet" type="text/css" media="all"/&gt;
+ * &lt;link href="&lt;a:url value="/struts/jscalendar/calendar-blue.css" /&gt;" rel="stylesheet" type="text/css" media="all"/&gt;
  * <!-- END SNIPPET: expl2 -->
  * </pre>
  *
  * @author Patrick Lightbody
  * @author Rene Gielen
  * @version $Revision: 1.12 $
- * @a2.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.DatePickerTag"
+ * @a2.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DatePickerTag"
  * description="Render datepicker"
  * @since 2.2
  */

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Debug.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Debug.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Debug.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Debug.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlUtil;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -40,7 +40,7 @@
  * @version $Revision: 1.2 $
  * @since 2.2
  *
- * @a2.tag name="debug" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.DebugTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -20,8 +20,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.webwork.util.ServletContextAware;
-import org.apache.struts.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.util.ServletContextAware;
+import org.apache.struts.action2.views.util.UrlHelper;
 
 /**
  * 
@@ -34,7 +34,7 @@
 	
 	private static final long serialVersionUID = -3792445192115623052L;
 	
-	protected String _actualServerPath = "/org/apache/struts/webwork/static/richtexteditor/data/";
+	protected String _actualServerPath = "/org/apache/struts/static/richtexteditor/data/";
 	
 	
 	public String getActualServerPath() { return _actualServerPath; }

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Div.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Div.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Div.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Div.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,7 +33,7 @@
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @a2.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.DivTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleListUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleListUIBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleListUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleListUIBean.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.util.Map;
 
@@ -8,7 +8,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * DoubleListUIBean is the standard superclass of all webwork double list handling components.
+ * DoubleListUIBean is the standard superclass of all Struts Action Framework 2.0 double list handling components.
  *
  * <p/>
  *

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleSelect.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleSelect.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleSelect.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/DoubleSelect.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -24,7 +24,7 @@
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @a2.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.DoubleSelectTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Else.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Else.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Else.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Else.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -36,7 +36,7 @@
  *
  * @author Rick Salsa (rsal@mb.sympatico.ca)
  * @author tmjee
- * @a2.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="org.apache.struts.webwork.views.jsp.ElseTag"
+ * @a2.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) {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/ElseIf.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/ElseIf.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/ElseIf.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/ElseIf.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -40,7 +40,7 @@
  *
  * @author Rick Salsa (rsal@mb.sympatico.ca)
  * @author tmjee
- * @a2.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="org.apache.struts.webwork.views.jsp.ElseIfTag"
+ * @a2.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) {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/FieldError.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/FieldError.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/FieldError.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/FieldError.java Mon Apr  3 08:28:51 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.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 @@
  *
  * @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 $
- * @a2.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.FieldErrorTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/File.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/File.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/File.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/File.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @a2.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.FileTag"
+ * @a2.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 {
@@ -54,13 +54,13 @@
             String encType = (String) form.getParameters().get("enctype");
             if (!"multipart/form-data".equals(encType)) {
                 // uh oh, this isn't good! Let's warn the developer
-                log.warn("WebWork has detected a file upload UI tag (a:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!");
+                log.warn("Struts Action Framework has detected a file upload UI tag (a:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!");
             }
 
             String method = (String) form.getParameters().get("method");
             if (!"post".equalsIgnoreCase(method)) {
                 // uh oh, this isn't good! Let's warn the developer
-                log.warn("WebWork has detected a file upload UI tag (a:file) being used without a form set to method 'POST'. This is probably an error!");
+                log.warn("Struts Action Framework has detected a file upload UI tag (a:file) being used without a form set to method 'POST'. This is probably an error!");
             }
         }
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Form.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Form.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Form.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Form.java Mon Apr  3 08:28:51 2006
@@ -1,11 +1,11 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
-import org.apache.struts.webwork.dispatcher.DispatcherUtils;
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
-import org.apache.struts.webwork.portlet.util.PortletUrlHelper;
-import org.apache.struts.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 @@
  * @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
  *
- * @a2.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.FormTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/FormButton.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/FormButton.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/FormButton.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/FormButton.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/GenericUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/GenericUIBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/GenericUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/GenericUIBean.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.util.ContainUtil;
+import org.apache.struts.action2.util.ContainUtil;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,7 +54,7 @@
  * @version $Revision: 1.5 $
  * @since 2.2
  *
- * @a2.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.ComponentTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java Mon Apr  3 08:28:51 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.StrutsConstants;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -60,7 +60,7 @@
  * @author Patrick Lightbody
  * @author Rainer Hermanns
  * @author Rene Gielen
- * @a2.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.HeadTag"
+ * @a2.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
  */

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Hidden.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Hidden.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Hidden.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Hidden.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -31,7 +31,7 @@
  * @version $Revision: 1.5 $
  * @since 2.2
  *
- * @a2.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.HiddenTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/I18n.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/I18n.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/I18n.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/I18n.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.LocaleProvider;
@@ -63,7 +63,7 @@
  * @version $Revision: 1.13 $
  * @since 2.2
  *
- * @a2.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.I18nTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/If.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/If.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/If.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/If.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@
  * @see Else
  * @see ElseIf
  *
- * @a2.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.webwork.views.jsp.IfTag"
+ * @a2.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 = "struts.if.answer";

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java Mon Apr  3 08:28:51 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.util.FastByteArrayOutputStream;
-import org.apache.struts.webwork.RequestUtils;
-import org.apache.struts.webwork.StrutsConstants;
+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 com.opensymphony.xwork.util.OgnlValueStack;
 
 import org.apache.commons.logging.Log;
@@ -69,7 +69,7 @@
  * @version $Revision: 1.20 $
  * @since 2.2
  *
- * @a2.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.IncludeTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/IteratorComponent.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/IteratorComponent.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/IteratorComponent.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/IteratorComponent.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.util.MakeIterator;
-import org.apache.struts.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;
@@ -22,7 +22,7 @@
  * <li>value (Object) - the source to iterate over, must be iteratable, else an the object itself will be put into a
  * newly created List (see MakeIterator#convert(Object)</li>
  *
- * <li>id (String) - if specified the current iteration object will be place with this id in webwork stack's context
+ * <li>id (String) - if specified the current iteration object will be place with this id in Struts stack's context
  * scope</li>
  *
  * </ul>
@@ -58,7 +58,7 @@
  * <pre>
  * <!-- START SNIPPET: example2code -->
  * 
- * &lt;a:bean name="org.apache.struts.webwork.example.IteratorExample" id="it"&gt;
+ * &lt;a:bean name="org.apache.struts.action2.example.IteratorExample" id="it"&gt;
  *   &lt;a:param name="day" value="'foo'"/&gt;
  *   &lt;a:param name="day" value="'bar'"/&gt;
  * &lt;/a:bean&gt;
@@ -94,17 +94,17 @@
  * <pre>
  * <!-- START SNIPPET: example3code -->
  * 
- * 	&lt;webwork:iterator value="groupDao.groups" status="groupStatus"&gt;
- * 		&lt;tr class="&lt;webwork:if test="#groupStatus.odd == true "&gt;odd&lt;/webwork:if&gt;&lt;webwork:else&gt;even&lt;/webwork:else&gt;"&gt;
- * 			&lt;td&gt;&lt;webwork:property value="name" /&gt;&lt;/td&gt;
- * 			&lt;td&gt;&lt;webwork:property value="description" /&gt;&lt;/td&gt;
+ * 	&lt;saf:iterator value="groupDao.groups" status="groupStatus"&gt;
+ * 		&lt;tr class="&lt;saf:if test="#groupStatus.odd == true "&gt;odd&lt;/saf:if&gt;&lt;saf:else&gt;even&lt;/saf:else&gt;"&gt;
+ * 			&lt;td&gt;&lt;saf:property value="name" /&gt;&lt;/td&gt;
+ * 			&lt;td&gt;&lt;saf:property value="description" /&gt;&lt;/td&gt;
  * 			&lt;td&gt;
- * 				&lt;webwork:iterator value="users" status="userStatus"&gt;
- * 					&lt;webwork:property value="fullName" /&gt;&lt;webwork:if test="!#userStatus.last"&gt;,&lt;/webwork:if&gt;
- * 				&lt;/webwork:iterator&gt;
+ * 				&lt;saf:iterator value="users" status="userStatus"&gt;
+ * 					&lt;saf:property value="fullName" /&gt;&lt;saf:if test="!#userStatus.last"&gt;,&lt;/saf:if&gt;
+ * 				&lt;/saf:iterator&gt;
  * 			&lt;/td&gt;
  * 		&lt;/tr&gt;
- * 	&lt;/webwork:iterator&gt;
+ * 	&lt;/saf:iterator&gt;
  * 
  * <!-- END SNIPPET: example3code -->
  * </pre>
@@ -140,7 +140,7 @@
  * @author Rick Salsa (rsal@mb.sympatico.ca)
  * @author tm_jee ( tm_jee(at)yahoo.co.uk )
  * @version $Revision: 1.11 $
- * @a2.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.IteratorTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Label.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Label.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Label.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Label.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -29,7 +29,7 @@
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @a2.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.LabelTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/ListUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/ListUIBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/ListUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/ListUIBean.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.util.ContainUtil;
-import org.apache.struts.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;
@@ -11,7 +11,7 @@
 import java.util.Map;
 
 /**
- * DoubleListUIBean is the standard superclass of all webwork list handling components.
+ * DoubleListUIBean is the standard superclass of all Struts Action Framework list handling components.
  *
  * <p/>
  * 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/MergeIterator.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/MergeIterator.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/MergeIterator.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/MergeIterator.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.io.Writer;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.webwork.components.Param.UnnamedParametric;
-import org.apache.struts.webwork.util.MakeIterator;
-import org.apache.struts.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 @@
  *
  * @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 org.apache.struts.webwork.util.MergeIteratorFilter
- * @see org.apache.struts.webwork.views.jsp.iterator.MergeIteratorTag
+ * @see org.apache.struts.action2.util.MergeIteratorFilter
+ * @see org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag
  *
- * @a2.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.iterator.MergeIteratorTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/OptionTransferSelect.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/OptionTransferSelect.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/OptionTransferSelect.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/OptionTransferSelect.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -76,7 +76,7 @@
  * 
  * @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 $
- * @a2.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.OptionTransferSelectTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Panel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Panel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Panel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Panel.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -23,7 +23,7 @@
  *
  * @see TabbedPanel
  *
- * @a2.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.PanelTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Param.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Param.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Param.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Param.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -29,7 +29,7 @@
  * <p/>
  * <b>Note:</b>
  * When you declare the param tag, the value can be defined in either a <tt>value</tt> attribute or
- * as text between the start and end tag. WebWork behaves a bit different according to these two situations.
+ * as text between the start and end tag. Struts behaves a bit different according to these two situations.
  * This is best illustrated using an example:
  * <br/>&lt;param name="color"&gt;blue&lt;/param&gt; &lt;-- (A) --&gt;
  * <br/>&lt;param name="color" value="blue"/&gt; &lt;-- (B) --&gt;
@@ -74,7 +74,7 @@
  * @see Bean
  * @see Text
  *
- * @a2.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ParamTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Password.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Password.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Password.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Password.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@
  * @version $Revision: 1.8 $
  * @since 2.2
  *
- * @a2.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.PasswordTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Property.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Property.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Property.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Property.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.util.TextUtils;
@@ -71,7 +71,7 @@
  * @author Rene Gielen
  * @version $Revision: 1.4 $
  *
- * @a2.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts.webwork.views.jsp.PropertyTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Push.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Push.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Push.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Push.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -92,7 +92,7 @@
  * @version $Revision: 1.15 $
  * @since 2.2
  *
- * @a2.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.PushTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Radio.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Radio.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Radio.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Radio.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -32,7 +32,7 @@
  * @version $Revision: 1.6 $
  * @since 2.2
  *
- * @a2.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.RadioTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Reset.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Reset.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Reset.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Reset.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -40,7 +40,7 @@
  * @version $Revision: 1.4 $
  * @since 2.2.2
  *
- * @a2.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.ResetTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/RichTextEditor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/RichTextEditor.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/RichTextEditor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/RichTextEditor.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -41,13 +41,13 @@
  * 
  * It is possible to have a rich text editor do server side browsing  
  * when for example the image button is clicked. To integrate this functionality with 
- * webwork, one need to defined the following action definition typically in xwork.xml
+ * Struts Action Framework, one need to defined the following action definition typically in xwork.xml
  * 
  * <pre>
- *   &lt;package name="richtexteditor-browse" extends="webwork-default" 
- *   namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
+ *   &lt;package name="richtexteditor-browse" extends="struts-default" 
+ *   namespace="/struts/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
  *   	&lt;action name="connector" 
- *      class="org.apache.struts.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;
@@ -58,27 +58,27 @@
  * </pre>
  * 
  * By default whenever a browse command is triggered (eg. by clicking on the 'image' button and then
- * 'browse server' button, the url '/webwork/static/richtexteditor/editor/filemanager/browser/default/browser.html?&Type=Image&Connector=connectors/jsp/connector.action'.
+ * 'browse server' button, the url '/struts/static/richtexteditor/editor/filemanager/browser/default/browser.html?&Type=Image&Connector=connectors/jsp/connector.action'.
  * The page browser.html which comes with FCK Editor will trigger the url 
- * '/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp/connector.action' which will
- * caused the webwork's DefaultRichtexteditorConnector to be executed. The trigerring url could be
+ * '/struts/richtexteditor/editor/filemanager/browser/default/connectors/jsp/connector.action' which will
+ * caused the Struts Action Framework's DefaultRichtexteditorConnector to be executed. The trigerring url could be
  * changed by altering the 'imageBrowseURL'. There 3 types of such related url, namely 'imageBrowseURL', 
  * 'linkBrowseURL' and 'flashBrowseURL'. It is recomended that the default one being used. One could change the
  * Connector parameter instead. For example
  * 
  * <pre>
- * /webwork/static/richtexteditor/editor/filemanager/browser/default/browser.html?
+ * /struts/static/richtexteditor/editor/filemanager/browser/default/browser.html?
  * &Type=Image&Connector=connectors/jsp/connector.action
  * </pre>
  * 
  * could be changed to 
  * 
  * <pre>
- * /webwork/static/richtexteditor/editor/filemanager/browser/default/browser.html?
+ * /struts/static/richtexteditor/editor/filemanager/browser/default/browser.html?
  * &Type=Image&Connector=myLittlePath/myConnector.action
  * </pre>
  * 
- * In this case the action will need to have a namespace of '/webwork/richtexteditor/editor/filemanager/browser/default/myLittlePath'
+ * In this case the action will need to have a namespace of '/struts/richtexteditor/editor/filemanager/browser/default/myLittlePath'
  * and action name of 'myConnector'
  * 
  * <p/>
@@ -102,36 +102,36 @@
  * It is possible for the richtexteditor to do server side uploading as well. For example when clicking
  * on the 'Image' button and then the 'Upload' tab and then selecting a file from client local
  * machine and the clicking 'Send it to the server'. To integrate this functionality with 
- * webwork, one need to defined the following action definition typically in xwork.xml
+ * Struts Action Framework, one need to defined the following action definition typically in xwork.xml
  * 
  * <pre>
- *   &lt;package name="richtexteditor-upload" extends="webwork-default" 
- *   namespace="/webwork/richtexteditor/editor/filemanager/upload"&gt;
+ *   &lt;package name="richtexteditor-upload" extends="struts-default" 
+ *   namespace="/struts/richtexteditor/editor/filemanager/upload"&gt;
  *		&lt;action name="uploader" 
- *       class="org.apache.struts.webwork.components.DefaultRichtexteditorConnector" 
+ *       class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
  *       method="upload"&gt;
  *			&lt;result name="richtexteditorFileUpload" /&gt;
  *		&lt;/action&gt;    
  *   &lt;/package&gt;
  * </pre>
  * 
- * By default whenever an upload command is triggered, a '/webwork/static/richtexteditor/editor/filemanager/upload/uploader.action?Type=Image'
+ * By default whenever an upload command is triggered, a '/struts/static/richtexteditor/editor/filemanager/upload/uploader.action?Type=Image'
  * will be issued. This could be changed by setting the imageUploadURL attribute of the tag. 
- * When this link is issued, the webwork action will get executed. There's 3 such related upload url
+ * When this link is issued, the Struts Action Framework action will get executed. There's 3 such related upload url
  * namely, 'imageUploadURL', 'linkUploadURL' and 'flashUploadURL'. It is recomended that the default 
  * one being used. However one could change the url, but need to include the Type parameter. For example
  * 
  * <pre>
- * /webwork/static/richtexteditor/editor/filemanager/upload/uploader.action?Type=Image
+ * /struts/static/richtexteditor/editor/filemanager/upload/uploader.action?Type=Image
  * </pre>
  * 
  * could be changed to 
  * 
  * <pre>
- * /webwork/static/richtexteditor/editor/filemanager/upload/aDifferentUploader.action?Type=Image
+ * /struts/static/richtexteditor/editor/filemanager/upload/aDifferentUploader.action?Type=Image
  * </pre>
  * 
- * In this case the action will need to have a namespace of '/webwork/static/richtexteditor/editor/filemanager/upload'
+ * In this case the action will need to have a namespace of '/struts/static/richtexteditor/editor/filemanager/upload'
  * and action name of 'aDifferentUploader'
  * 
  * By default the action method that needs to be defined in xwork.xml needs to be 'upload'. If this needs
@@ -148,7 +148,7 @@
  * 
  * <!-- START SNIPPET: richtexteditoraction -->
  * 
- * The webwork action that handles the server-side browsing and uploading needs to extends from 
+ * The Struts Action Framework action that handles the server-side browsing and uploading needs to extends from 
  * AbstractRichtexteditorConnector.
  * 
  * There are four abstract methods need to be implemented, namely 
@@ -180,7 +180,7 @@
  * @version $Date: 2006/03/18 15:45:33 $ $Id: RichTextEditor.java,v 1.9 2006/03/18 15:45:33 rgielen Exp $
  * @see AbstractRichtexteditorConnector
  * 
- * @a2.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.RichTextEditorTag"
+ * @a2.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 {
@@ -610,7 +610,7 @@
 
 	/**
 	 * Set the dir where the FCKeditor files reside on the server
-	 * @a2.tagattribute required="false" type="String" default="/webwork/static/richtexteditor/"
+	 * @a2.tagattribute required="false" type="String" default="/struts/static/richtexteditor/"
 	 */
 	public void setBasePath(String basePath) {
 		this.basePath = basePath;
@@ -722,7 +722,7 @@
 
 	/**
 	 * Sets the URL of the page called when the user clicks the 'Browse Server' button in the "Flash" dialog window. In this way, you can create your custom Flash Browser that is well integrated with your system.
-	 * @a2.tagattribute required="false" type="String" default="/webwork/static/ richtexteditor/ editor/filemanager/ browser/default/browser.html? Type=Flash& Connector=connectors/jsp/connector.action"
+	 * @a2.tagattribute required="false" type="String" default="/struts/static/ richtexteditor/ editor/filemanager/ browser/default/browser.html? Type=Flash& Connector=connectors/jsp/connector.action"
 	 */
 	public void setFlashBrowserURL(String flashBrowserURL) {
 		this.flashBrowserURL = flashBrowserURL;
@@ -734,7 +734,7 @@
 
 	/**
 	 * Sets the URL of the upload handler called when the user clicks the 'Send it to server' button in the "Flash" dialog window. In this way, you can create your custom Flash Uploader that is well integrated with your system.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/ richtexteditor/ editor/filemanager/ upload/uploader.action? Type=Flash"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/ richtexteditor/ editor/filemanager/ upload/uploader.action? Type=Flash"
 	 */
 	public void setFlashUploadURL(String flashUploadURL) {
 		this.flashUploadURL = flashUploadURL;
@@ -890,7 +890,7 @@
 
 	/**
      * Sets the URL of the page called when the user clicks the 'Browse Server' button in the 'Image' dialog window. In this way, you can create your custom Image Browser that is well integrated with your system.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/ richtexteditor/ editor/filemanager/ browser/default/browser.html? Type=Image& Connector=connectors/jsp/connector.action"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/ richtexteditor/ editor/filemanager/ browser/default/browser.html? Type=Image& Connector=connectors/jsp/connector.action"
 	 */
 	public void setImageBrowserURL(String imageBrowserURL) {
 		this.imageBrowserURL = imageBrowserURL;
@@ -902,7 +902,7 @@
 
 	/**
      * Sets the URL of the upload handler called when the user clicks the 'Send it to server' button in the 'Image' dialog window. In this way, you can create your custom Image Uploader that is well integrated with your system.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/ richtexteditor/ editor/filemanager/ upload/uploader.action? Type=Image"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/ richtexteditor/ editor/filemanager/ upload/uploader.action? Type=Image"
 	 */
 	public void setImageUploadURL(String imageUploadURL) {
 		this.imageUploadURL = imageUploadURL;
@@ -914,7 +914,7 @@
 
 	/**
      * Sets the URL of the page called when the user clicks the 'Browse Server' button in the 'Link' dialog window. In this way, you can create your custom File Browser that is well integrated with your system.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/ richtexteditor/ editor/filemanager/ browser/default/browser.html? Type=File& Connector=connectors/jsp/connector.action"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/ richtexteditor/ editor/filemanager/ browser/default/browser.html? Type=File& Connector=connectors/jsp/connector.action"
 	 */
 	public void setLinkBrowserURL(String linkBrowserURL) {
 		this.linkBrowserURL = linkBrowserURL;
@@ -926,7 +926,7 @@
 
 	/**
      * Sets the URL of the upload handler called when the user clicks the 'Send it to server' button in the 'Link' dialog window. In this way, you can create your custom Link Uploader that is well integrated with your system.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/ richtexteditor/ editor/filemanager/ upload/uploader.action? Type=File"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/ richtexteditor/ editor/filemanager/ upload/uploader.action? Type=File"
 	 */
 	public void setLinkUploadURL(String linkUploadURL) {
 		this.linkUploadURL = linkUploadURL;
@@ -938,7 +938,7 @@
 
 	/**
 	 * Sets the base path used when looking for registered plugins.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/richtexteditor/plugins/"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/richtexteditor/plugins/"
 	 */
 	public void setPluginsPath(String pluginsPath) {
 		this.pluginsPath = pluginsPath;
@@ -950,7 +950,7 @@
 
 	/**
 	 * Sets the path to the skin (graphical interface settings) to be used by the editor.
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/richtexteditor/skins/default"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/richtexteditor/skins/default"
 	 */
 	public void setSkinPath(String skinPath) {
 		this.skinPath = skinPath;
@@ -974,7 +974,7 @@
 
 	/**
 	 * Sets the path to the XML file that has the definitions and rules of the styles used by the 'Style' toolbar command
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/richtexteditor/fckstyles.xml"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/richtexteditor/fckstyles.xml"
 	 */
 	public void setStylesXmlPath(String stylesXmlPath) {
 		this.stylesXmlPath = stylesXmlPath;
@@ -1215,7 +1215,7 @@
 
 	/**
 	 * path where smilies are located
-	 * @a2.tagattribute required="false" type="string" default="/webwork/static/ richtexteditor/editor/ images/smiley/msn/"
+	 * @a2.tagattribute required="false" type="string" default="/struts/static/ richtexteditor/editor/ images/smiley/msn/"
 	 */
 	public void setSmileyPath(String smileyPath) {
 		this.smileyPath = smileyPath;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Select.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Select.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Select.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Select.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -59,7 +59,7 @@
  * @version $Revision: 1.9 $
  * @since 2.2
  *
- * @a2.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.SelectTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Set.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Set.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Set.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Set.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -44,7 +44,7 @@
  * @version $Revision: 1.12 $
  * @since 2.2
  *
- * @a2.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts.webwork.views.jsp.SetTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Submit.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Submit.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Submit.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Submit.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -72,7 +72,7 @@
  *       method='post'
  *       theme="ajax"&gt;
  *
- *   &lt;input type='text' name='data' value='WebWork User' /&gt;
+ *   &lt;input type='text' name='data' value='Struts User' /&gt;
  *   &lt;a:submit value="GO2" theme="ajax" resultDivId="two" /&gt;
  *
  * &lt;/a:form &gt;
@@ -145,7 +145,7 @@
  * @version $Revision: 1.16 $
  * @since 2.2
  *
- * @a2.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.SubmitTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/TabbedPanel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/TabbedPanel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/TabbedPanel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/TabbedPanel.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -51,10 +51,10 @@
  *
  * <pre>
  * <!-- START SNIPPET: example2 -->
- * &lt;link rel="stylesheet" type="text/css" href="&lt;a:url value="/webwork/tabs.css"/&gt;"&gt;
- * &lt;link rel="stylesheet" type="text/css" href="&lt;a:url value="/webwork/niftycorners/niftyCorners.css"/&gt;"&gt;
- * &lt;link rel="stylesheet" type="text/css" href="&lt;a:url value="/webwork/niftycorners/niftyPrint.css"/&gt;" media="print"&gt;
- * &lt;script type="text/javascript" src="&lt;a:url value="/webwork/niftycorners/nifty.js"/&gt;"&gt;&lt;/script&gt;
+ * &lt;link rel="stylesheet" type="text/css" href="&lt;a:url value="/struts/tabs.css"/&gt;"&gt;
+ * &lt;link rel="stylesheet" type="text/css" href="&lt;a:url value="/struts/niftycorners/niftyCorners.css"/&gt;"&gt;
+ * &lt;link rel="stylesheet" type="text/css" href="&lt;a:url value="/struts/niftycorners/niftyPrint.css"/&gt;" media="print"&gt;
+ * &lt;script type="text/javascript" src="&lt;a:url value="/struts/niftycorners/nifty.js"/&gt;"&gt;&lt;/script&gt;
  * &lt;script type="text/javascript"&gt;
  *     dojo.event.connect(window, "onload", function() {
  *         if (!NiftyCheck())
@@ -76,7 +76,7 @@
  *
  * @see Panel
  *
- * @a2.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TabbedPanelTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -87,7 +87,7 @@
  *
  * @see Param
  *
- * @a2.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.TextTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/TextArea.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/TextArea.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/TextArea.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/TextArea.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -25,7 +25,7 @@
  *
  * @see TabbedPanel
  *
- * @a2.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TextareaTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/TextField.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/TextField.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/TextField.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/TextField.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@
  * @version $Revision: 1.10 $
  * @since 2.2
  *
- * @a2.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TextFieldTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Token.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Token.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Token.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Token.java Mon Apr  3 08:28:51 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.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 @@
  * @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 org.apache.struts.webwork.interceptor.TokenInterceptor
- * @see org.apache.struts.webwork.interceptor.TokenSessionStoreInterceptor
+ * @see org.apache.struts.action2.interceptor.TokenInterceptor
+ * @see org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor
  *
- * @a2.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TokenTag"
+ * @a2.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 @@
     }
 
     /**
-     * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts.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.
@@ -86,7 +86,7 @@
     }
 
     /**
-     * This will be removed in a future version of WebWork.
+     * This will be removed in a future version of Struts Action Framework.
      * @deprecated Templates should use $parameters from now on, not $tag.
      */
     public String getTokenNameField() {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Tree.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Tree.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Tree.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Tree.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 ePlus Corporation. All Rights Reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -28,7 +28,7 @@
  *
  * @author Jason Carreira <jcarreira@eplus.com>
  *
- * @a2.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TreeTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/TreeNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/TreeNode.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/TreeNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/TreeNode.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@
  *
  * @author Jason Carreira <jcarreira@eplus.com>
  *
- * @a2.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TreeNodeTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java Mon Apr  3 08:28:51 2006
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.components.template.Template;
-import org.apache.struts.webwork.components.template.TemplateEngine;
-import org.apache.struts.webwork.components.template.TemplateEngineManager;
-import org.apache.struts.webwork.components.template.TemplateRenderingContext;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.views.util.ContextUtil;
+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 com.opensymphony.xwork.config.ConfigurationException;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -25,8 +25,8 @@
 import java.util.Map;
 
 /**
- * UIBean is the standard superclass of all webwork UI componentns.
- * It defines common webwork and html properties all UI components should present for usage.
+ * UIBean is the standard superclass of all Struts Action Framework UI componentns.
+ * It defines common Struts Action Framework and html properties all UI components should present for usage.
  *
  * <!-- START SNIPPET: templateRelatedAttributes -->
  *
@@ -265,7 +265,7 @@
  *    <tr>
  *   	<td>tooltipIcon</td>
  *   	<td>String</td>
- *   	<td>/webwork/static/tooltip/tooltip.gif</td>
+ *   	<td>/struts/static/tooltip/tooltip.gif</td>
  *   	<td>The url to the tooltip icon</td>
  *   </tr>
  *   	<td>tooltipAboveMousePointer</td>

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/URL.java Mon Apr  3 08:28:51 2006
@@ -3,12 +3,12 @@
  * All rights reserved.
  */
 
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
-import org.apache.struts.webwork.portlet.util.PortletUrlHelper;
-import org.apache.struts.webwork.views.util.UrlHelper;
-import org.apache.struts.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 @@
  *
  * @see Param
  *
- * @a2.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.URLTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/UpDownSelect.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/UpDownSelect.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/UpDownSelect.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/UpDownSelect.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -58,7 +58,7 @@
  * @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 $
  * 
- * @a2.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.UpDownSelectTag"
+ * @a2.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 {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableModel;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.table.TableModel;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortFilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortFilterModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortFilterModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortFilterModel.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortableTableModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortableTableModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortableTableModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/table/SortableTableModel.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.table.TableModel;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTable.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTable.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTable.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTable.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
-import org.apache.struts.webwork.components.GenericUIBean;
-import org.apache.struts.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.NoSuchElementException;
 
 /**
- * @a2.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.table.WebTableTag"
+ * @a2.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 @@
     }
 
     /**
-     * Whether the table should be sortable. Requires that model implements org.apache.struts.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.
      * @a2.tagattribute required="false" type="Boolean" default="false"
      */
     public void setSortable(boolean sortable) {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTableColumn.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTableColumn.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTableColumn.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/table/WebTableColumn.java Mon Apr  3 08:28:51 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
-import org.apache.struts.webwork.components.table.renderer.CellRenderer;
-import org.apache.struts.webwork.components.table.renderer.DefaultCellRenderer;
+import org.apache.struts.action2.components.table.renderer.CellRenderer;
+import org.apache.struts.action2.components.table.renderer.DefaultCellRenderer;
 
 
 /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message