You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/03/24 05:13:13 UTC

svn commit: r388357 [6/7] - in /incubator/webwork2/src/java/org/apache/struts/action2: ./ components/ components/table/ components/table/renderer/ components/template/ config/ config_browser/ dispatcher/ dispatcher/mapper/ dispatcher/multipart/ interce...

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.io.OutputStream;
 import java.io.StringWriter;
@@ -20,10 +20,10 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FoldersAndFiles;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
 
@@ -39,13 +39,13 @@
  * <pre>
  *  &lt;!-- Results necessary when using 'browse server' and 'upload' feature of Richtexteditor --&gt;
  *  &lt;result-type name="richtexteditorGetFolders" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersResult" /&gt;
  *  &lt;result-type name="richtexteditorGetFoldersAndFiles" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" /&gt;
  *  &lt;result-type name="richtexteditorCreateFolder" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorCreateFolderResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorCreateFolderResult" /&gt;
  *  &lt;result-type name="richtexteditorFileUpload" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorFileUploadResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult" /&gt;
  * </pre>
  * 
  * <!-- END SNIPPET: javadoc -->
@@ -200,7 +200,7 @@
 	 * 
 	 * @param invocation
 	 * @return The server path calculated from AbstractRichtexteditoConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#calculateServerPath(String, String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#calculateServerPath(String, String, String)
 	 */
 	protected String getServerPath(ActionInvocation invocation) {
 		return (String) invocation.getStack().getContext().get("__richtexteditorServerPath");
@@ -213,7 +213,7 @@
 	 * 
 	 * @param invocation
 	 * @return The <code>Folder[]</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#getFolders(String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#getFolders(String, String)
 	 */
 	protected Folder[] richtexteditorFolders(ActionInvocation invocation) {
 		return (Folder[]) invocation.getStack().getContext().get("__richtexteditorGetFolders");
@@ -226,7 +226,7 @@
 	 * 
 	 * @param invocation
 	 * @return The <code>FoldersAndFiles</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#getFoldersAndFiles(String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#getFoldersAndFiles(String, String)
 	 */
 	protected FoldersAndFiles richtexteditorFoldersAndFiles(ActionInvocation invocation) {
 		return (FoldersAndFiles) invocation.getStack().getContext().get("__richtexteditorGetFoldersAndFiles");
@@ -240,7 +240,7 @@
 	 * 
 	 * @param invocation
 	 * @return The <code>CreateFolderResult</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#createFolder(String, String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#createFolder(String, String, String)
 	 */
 	protected CreateFolderResult richtexteditorCreateFolderResult(ActionInvocation invocation) {
 		return (CreateFolderResult) invocation.getStack().getContext().get("__richtexteditorCreateFolder");
@@ -253,7 +253,7 @@
 	 * 
 	 * @param invocation
 	 * @return The <code>FileUploadResult</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#fileUpload(String, String, String, String, java.io.File)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#fileUpload(String, String, String, String, java.io.File)
 	 */
 	protected FileUploadResult richtexteditorFileUploadResult(ActionInvocation invocation) {
 		return (FileUploadResult) invocation.getStack().getContext().get("__richtexteditorFileUpload");

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.UIBean;
-import com.opensymphony.webwork.views.jsp.ComponentTagSupport;
+import org.apache.struts.action2.components.UIBean;
+import org.apache.struts.action2.views.jsp.ComponentTagSupport;
 
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.ActionError;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionError;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.ActionMessage;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionMessage;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Anchor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.CheckboxList;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.CheckboxList;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Checkbox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Checkbox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.ComboBox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ComboBox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.GenericUIBean;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DatePicker;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Debug;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Debug;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Div;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.FieldError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.FieldError;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.File;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Form;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Head;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Hidden;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Label;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Label;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import com.opensymphony.xwork.util.OgnlUtil;
 import ognl.Ognl;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.OptionTransferSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.OptionTransferSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Panel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Panel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Password;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Password;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Radio;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Radio;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java Thu Mar 23 20:12:49 2006
@@ -2,17 +2,17 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Reset;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Reset;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @see com.opensymphony.webwork.components.Reset
+ * @see org.apache.struts.action2.components.Reset
  */
 public class ResetTag extends AbstractUITag {
     protected String action;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.RichTextEditor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.RichTextEditor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.io.OutputStream;
 
@@ -13,8 +13,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
 import com.opensymphony.xwork.ActionInvocation;
 
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.io.PrintWriter;
 
@@ -11,8 +11,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.io.OutputStream;
 
@@ -13,10 +13,10 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.File;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FoldersAndFiles;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.File;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.io.OutputStream;
 
@@ -13,8 +13,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Select;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Select;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Submit;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Submit;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java Thu Mar 23 20:12:49 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.util.TabbedPane;
+import org.apache.struts.action2.util.TabbedPane;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java Thu Mar 23 20:12:49 2006
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Panel;
-import com.opensymphony.webwork.components.TabbedPanel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Panel;
+import org.apache.struts.action2.components.TabbedPanel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TextField;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextField;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TextArea;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextArea;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Token;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Token;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java Thu Mar 23 20:12:49 2006
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TreeNode;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TreeNode;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java Thu Mar 23 20:12:49 2006
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Tree;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Tree;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.UpDownSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.UpDownSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java Thu Mar 23 20:12:49 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui.table;
+package org.apache.struts.action2.views.jsp.ui.table;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.table.WebTable;
-import com.opensymphony.webwork.views.jsp.ui.ComponentTag;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.action2.views.jsp.ui.ComponentTag;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/tiles/TilesResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/tiles/TilesResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/tiles/TilesResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/tiles/TilesResult.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.tiles;
+package org.apache.struts.action2.views.tiles;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.ServletDispatcherResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.LocaleProvider;
 import org.apache.commons.logging.Log;
@@ -52,7 +52,7 @@
  * Making this result type the default for the current package.
  *
  * <result-types>
- *      <result-type name="tiles" class="com.opensymphony.webwork.views.tiles.TilesResult" default="true" />
+ *      <result-type name="tiles" class="org.apache.struts.action2.views.tiles.TilesResult" default="true" />
  * </result-types>
  * <!-- END SNIPPET: packageconfig -->
  *

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/util/ContextUtil.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/util/ContextUtil.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/util/ContextUtil.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/util/ContextUtil.java Thu Mar 23 20:12:49 2006
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.webwork.views.jsp.ui.OgnlTool;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.WebWorkUtil;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.WebWorkUtil;
+import org.apache.struts.action2.WebWorkConstants;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/util/ResourceUtil.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/util/ResourceUtil.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/util/ResourceUtil.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/util/ResourceUtil.java Thu Mar 23 20:12:49 2006
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.opensymphony.webwork.RequestUtils;
+import org.apache.struts.action2.RequestUtils;
 
 /**
  * User: plightbo

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/util/TextUtil.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/util/TextUtil.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/util/TextUtil.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/util/TextUtil.java Thu Mar 23 20:12:49 2006
@@ -8,7 +8,7 @@
 * Distributable under Apache license.
 * See terms of license at opensource.org
 */
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 
 /**
@@ -154,18 +154,18 @@
         addMapping(0xa1, "&iexcl;", strings); //
         addMapping(0xa2, "&cent;", strings); //
         addMapping(0xa3, "&pound;", strings); //
-        addMapping(0xa9, "&copy;", strings); // ©
-        addMapping(0xae, "&reg;", strings); // ®
+        addMapping(0xa9, "&copy;", strings); // �
+        addMapping(0xae, "&reg;", strings); // �
         addMapping(0xbf, "&iquest;", strings); //
 
-        addMapping(0xc0, "&Agrave;", strings); // À
-        addMapping(0xc1, "&Aacute;", strings); // Á
-        addMapping(0xc2, "&Acirc;", strings); // Â
-        addMapping(0xc3, "&Atilde;", strings); // Â
-        addMapping(0xc4, "&Auml;", strings); // Ä
-        addMapping(0xc5, "&Aring;", strings); // Å
-        addMapping(0xc6, "&AElig;", strings); // Æ
-        addMapping(0xc7, "&Ccedil;", strings); // Ç
+        addMapping(0xc0, "&Agrave;", strings); // �
+        addMapping(0xc1, "&Aacute;", strings); // �
+        addMapping(0xc2, "&Acirc;", strings); // �
+        addMapping(0xc3, "&Atilde;", strings); // �
+        addMapping(0xc4, "&Auml;", strings); // �
+        addMapping(0xc5, "&Aring;", strings); // �
+        addMapping(0xc6, "&AElig;", strings); // �
+        addMapping(0xc7, "&Ccedil;", strings); // �
         addMapping(0xc8, "&Egrave;", strings); //
         addMapping(0xc9, "&Eacute;", strings); //
         addMapping(0xca, "&Ecirc;", strings); //
@@ -181,7 +181,7 @@
         addMapping(0xd3, "&Oacute;", strings); //
         addMapping(0xd4, "&Ocirc;", strings); //
         addMapping(0xd5, "&Otilde;", strings); //
-        addMapping(0xd6, "&Ouml;", strings); // Ö
+        addMapping(0xd6, "&Ouml;", strings); // �
         addMapping(0xd7, "&times;", strings); //
         addMapping(0xd8, "&Oslash;", strings); //
         addMapping(0xd9, "&Ugrave;", strings); //
@@ -196,8 +196,8 @@
         addMapping(0xe1, "&aacute;", strings); //
         addMapping(0xe2, "&acirc;", strings); //
         addMapping(0xe3, "&atilde;", strings); //
-        addMapping(0xe4, "&auml;", strings); // ä
-        addMapping(0xe5, "&aring;", strings); // å
+        addMapping(0xe4, "&auml;", strings); // �
+        addMapping(0xe5, "&aring;", strings); // �
         addMapping(0xe6, "&aelig;", strings); //
         addMapping(0xe7, "&ccedil;", strings); //
         addMapping(0xe8, "&egrave;", strings); //
@@ -215,7 +215,7 @@
         addMapping(0xf3, "&oacute;", strings); //
         addMapping(0xf4, "&ocirc;", strings); //
         addMapping(0xf5, "&otilde;", strings); //
-        addMapping(0xf6, "&ouml;", strings); // ö
+        addMapping(0xf6, "&ouml;", strings); // �
         addMapping(0xf7, "&divide;", strings); //
         addMapping(0xf8, "&oslash;", strings); //
         addMapping(0xf9, "&ugrave;", strings); //

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/util/UrlHelper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/util/UrlHelper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/util/UrlHelper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/util/UrlHelper.java Thu Mar 23 20:12:49 2006
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java Thu Mar 23 20:12:49 2006
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.VelocityWebWorkUtil;
-import com.opensymphony.webwork.views.jsp.ui.OgnlTool;
-import com.opensymphony.webwork.views.util.ContextUtil;
-import com.opensymphony.webwork.views.velocity.components.*;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.VelocityWebWorkUtil;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts.action2.views.velocity.components.*;
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -118,7 +118,7 @@
      * <li><strong>res</strong> - the current HttpServletResponse</li>
      * <li><strong>stack</strong> - the current {@link OgnlValueStack}</li>
      * <li><strong>ognl</strong> - an {@link OgnlTool}</li>
-     * <li><strong>webwork</strong> - an instance of {@link com.opensymphony.webwork.util.WebWorkUtil}</li>
+     * <li><strong>webwork</strong> - an instance of {@link org.apache.struts.action2.util.WebWorkUtil}</li>
      * <li><strong>action</strong> - the current WebWork action</li>
      * </ul>
      *
@@ -403,7 +403,7 @@
      *  resource.loader = file, class
      *  file.resource.loader.path = real path of webapp
      *  class.resource.loader.description = Velocity Classpath Resource Loader
-     *  class.resource.loader.class = com.opensymphony.webwork.views.velocity.WebWorkResourceLoader
+     *  class.resource.loader.class = org.apache.struts.action2.views.velocity.WebWorkResourceLoader
      * </pre>
      * <p/>
      * this default configuration can be overridden by specifying a webwork.velocity.configfile property in the
@@ -499,7 +499,7 @@
          * Matt Ho - Mon Mar 17 00:21:46 PST 2003
          */
         p.setProperty("wwclass.resource.loader.description", "Velocity Classpath Resource Loader");
-        p.setProperty("wwclass.resource.loader.class", "com.opensymphony.webwork.views.velocity.WebWorkResourceLoader");
+        p.setProperty("wwclass.resource.loader.class", "org.apache.struts.action2.views.velocity.WebWorkResourceLoader");
         p.setProperty("wwclass.resource.loader.modificationCheckInterval", "2");
         p.setProperty("wwclass.resource.loader.cache", "true");
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java Thu Mar 23 20:12:49 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
-import com.opensymphony.webwork.util.ClassLoaderUtils;
+import org.apache.struts.action2.util.ClassLoaderUtils;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.velocity.VelocityContext;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.util.ContextUtil;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.util.ContextUtil;
 import com.opensymphony.xwork.ActionContext;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
@@ -34,7 +34,7 @@
 /**
  * @author $Author: the_mindstorm $
  * @version $Revision: 1.20 $
- * @deprecated please use {@link com.opensymphony.webwork.dispatcher.VelocityResult} instead of direct access
+ * @deprecated please use {@link org.apache.struts.action2.dispatcher.VelocityResult} instead of direct access
  */
 public class WebWorkVelocityServlet extends VelocityServlet {
     private VelocityManager velocityManager;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.ActionComponent;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionComponent;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.ActionError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionError;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.ActionMessage;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionMessage;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Anchor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Bean;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Bean;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Checkbox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Checkbox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.CheckboxList;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.CheckboxList;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.ComboBox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ComboBox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.GenericUIBean;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Date;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Date;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DatePicker;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Debug;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Debug;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Div;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.FieldError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.FieldError;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.File;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Form;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Head;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Hidden;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.I18n;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Include;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;



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