You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/03 17:30:10 UTC
svn commit: r391069 [7/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...
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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -2,17 +2,17 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.RichTextEditor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.RichTextEditor;
import com.opensymphony.xwork.util.OgnlValueStack;
/**
- * WebWork's RichTextEditor Jsp Tag.
+ * Struts's RichTextEditor Jsp Tag.
*
* @author tm_jee
* @version $Date: 2006/02/17 15:17:33 $ $Id: RichTextEditorTag.java,v 1.1 2006/02/17 15:17:33 tmjee Exp $
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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
import java.io.OutputStream;
@@ -13,15 +13,15 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
import com.opensymphony.xwork.ActionInvocation;
/**
* <!-- START SNIPPET: javadoc -->
*
- * WebWork's result, creating the apropriate result (in xml form) and write it out
+ * Struts's result, creating the apropriate result (in xml form) and write it out
* to the response stream corresponding to a 'CreateFolder' command from the
* Rich Text Editor.
*
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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
import java.io.PrintWriter;
@@ -11,14 +11,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
import com.opensymphony.xwork.ActionInvocation;
/**
* <!-- START SNIPPET: javadoc -->
*
- * WebWork's result, creating the appropriate result (in javascript form) and write to
+ * Struts's result, creating the appropriate result (in javascript form) and write to
* the response stream corresponding to a 'FileUpload' command from the
* Rich Text Editor.
*
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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
import java.io.OutputStream;
@@ -13,16 +13,16 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.File;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.Folder;
-import org.apache.struts.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;
/**
* <!-- START SNIPPET: javadoc -->
*
- * WebWork's result, creating the appropriate result (in xml form) and write to
+ * Struts's result, creating the appropriate result (in xml form) and write to
* the response stream corresponding to the Rich Text Editor's 'GetFoldersAndFiles'
* command
*
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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
import java.io.OutputStream;
@@ -13,14 +13,14 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
import com.opensymphony.xwork.ActionInvocation;
/**
* <!-- START SNIPPET: javadoc -->
*
- * WebWork's result, creating the appropriate result (in xml form) and write to the
+ * Struts's result, creating the appropriate result (in xml form) and write to the
* response stream corresponding the the Rich Text Editor's 'GetFolders' command.
*
* <p/>
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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Panel;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 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.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2005 Opensymphony. All Rights Reserved.
*/
-package org.apache.struts.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2005 Opensymphony. All Rights Reserved.
*/
-package org.apache.struts.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.jsp.ui.table;
+package org.apache.struts.action2.views.jsp.ui.table;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.table.WebTable;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.tiles;
+package org.apache.struts.action2.views.tiles;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.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="org.apache.struts.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=391069&r1=390927&r2=391069&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 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.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 org.apache.struts.webwork.views.jsp.ui.OgnlTool;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.util.StrutsUtil;
-import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.StrutsUtil;
+import org.apache.struts.action2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +33,7 @@
public static final String BASE = "base";
public static final String STACK = "stack";
public static final String OGNL = "ognl";
- public static final String STRUTS = "webwork";
+ public static final String STRUTS = "struts";
public static final String ACTION = "action";
public static Map getStandardContext(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.webwork.views.util;
+package org.apache.struts.action2.views.util;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -8,7 +8,7 @@
* Distributable under Apache license.
* See terms of license at opensource.org
*/
-package org.apache.struts.webwork.views.util;
+package org.apache.struts.action2.views.util;
/**
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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.webwork.views.util;
+package org.apache.struts.action2.views.util;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsConstants;
+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/StrutsResourceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.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.views.velocity;
+package org.apache.struts.action2.views.velocity;
-import org.apache.struts.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/StrutsVelocityContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.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.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/StrutsVelocityServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
-import org.apache.struts.webwork.RequestUtils;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.views.util.ContextUtil;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsConstants;
+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;
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=391069&r1=390927&r2=391069&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 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.views.velocity;
+package org.apache.struts.action2.views.velocity;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.util.VelocityStrutsUtil;
-import org.apache.struts.webwork.views.jsp.ui.OgnlTool;
-import org.apache.struts.webwork.views.util.ContextUtil;
-import org.apache.struts.webwork.views.velocity.components.*;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.VelocityStrutsUtil;
+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;
@@ -42,7 +42,7 @@
public class VelocityManager {
private static final Log log = LogFactory.getLog(VelocityManager.class);
private static VelocityManager instance;
- public static final String STRUTS = "webwork";
+ public static final String STRUTS = "struts";
/**
* the parent JSP tag
@@ -103,7 +103,7 @@
}
/**
- * @return a reference to the VelocityEngine used by <b>all</b> webwork velocity thingies with the exception of
+ * @return a reference to the VelocityEngine used by <b>all</b> struts velocity thingies with the exception of
* directly accessed *.vm pages
*/
public VelocityEngine getVelocityEngine() {
@@ -119,7 +119,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 org.apache.struts.action2.util.StrutsUtil}</li>
+ * <li><strong>struts</strong> - an instance of {@link org.apache.struts.action2.util.StrutsUtil}</li>
* <li><strong>action</strong> - the current Struts action</li>
* </ul>
*
@@ -140,7 +140,7 @@
try {
ctx = ServletActionContext.getServletContext();
} catch (NullPointerException npe) {
- // in case this was used outside the lifecycle of webwork servlet
+ // in case this was used outside the lifecycle of struts servlet
log.debug("internal toolbox context ignored");
}
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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.ActionComponent;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Bean;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Checkbox;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.CheckboxList;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.ComboBox;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 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.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/OptionTransferSelectDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/PanelDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/ParamDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Param;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Param;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/PropertyDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Property;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Property;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Push;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Push;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/ResetDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java Mon Apr 3 08:28:51 2006
@@ -2,17 +2,17 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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 org.apache.struts.webwork.components.Reset
+ * @see org.apache.struts.action2.components.Reset
*/
public class ResetDirective extends AbstractDirective {
public String getBeanName() {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/SelectDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/SetDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Set;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Set;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/TabbedPanelDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.TabbedPanel;
+import org.apache.struts.action2.components.Component;
+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/velocity/components/TextAreaDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/TextDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Text;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Text;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/TokenDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/TreeDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.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.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/TreeNodeDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.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.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/URLDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.URL;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.URL;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.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/velocity/components/WebTableDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.table.WebTable;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/AdapterNode.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.w3c.dom.Node;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.*;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.w3c.dom.*;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.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.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.w3c.dom.*;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org