struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tm...@apache.org
Subject svn commit: r390846 [5/7] - in /incubator/webwork2/src/java/org/apache/struts: action2/ action2/components/ action2/config/ action2/config_browser/ action2/dispatcher/ action2/interceptor/ action2/lifecycle/ action2/pico/ action2/plexus/ action2/portle...
Date Sun, 02 Apr 2006 16:27:55 GMT
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/problems/LogCompilationProblemHandler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/problems/LogCompilationProblemHandler.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/problems/LogCompilationProblemHandler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/problems/LogCompilationProblemHandler.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.problems;
+package org.apache.struts.webwork.util.classloader.problems;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/FileResourceReader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/FileResourceReader.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/FileResourceReader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/FileResourceReader.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.readers;
+package org.apache.struts.webwork.util.classloader.readers;
 
 import org.apache.commons.io.FileUtils;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/ResourceReader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/ResourceReader.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/ResourceReader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/readers/ResourceReader.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.readers;
+package org.apache.struts.webwork.util.classloader.readers;
 
 /**
  * @author tcurdt

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/FileResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/FileResourceStore.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/FileResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/FileResourceStore.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts.webwork.util.classloader.stores;
 
 import org.apache.commons.io.IOUtils;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/MemoryResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/MemoryResourceStore.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/MemoryResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/MemoryResourceStore.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts.webwork.util.classloader.stores;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStore.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStore.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts.webwork.util.classloader.stores;
 
 /**
  * @author tcurdt

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStoreClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStoreClassLoader.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStoreClassLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/ResourceStoreClassLoader.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts.webwork.util.classloader.stores;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/TransactionalResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/TransactionalResourceStore.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/TransactionalResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/stores/TransactionalResourceStore.java Sun Apr  2 09:27:22 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts.webwork.util.classloader.stores;
 
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/utils/ThreadUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/utils/ThreadUtils.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/utils/ThreadUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/util/classloader/utils/ThreadUtils.java Sun Apr  2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.util.classloader.utils;
+package org.apache.struts.webwork.util.classloader.utils;
 
 
 public final class ThreadUtils {

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/validators/DWRValidator.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/validators/DWRValidator.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/validators/DWRValidator.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/validators/DWRValidator.java Sun Apr  2 09:27:22 2006
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.action2.validators;
+package org.apache.struts.webwork.validators;
 
-import org.apache.struts.action2.dispatcher.ApplicationMap;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
-import org.apache.struts.action2.dispatcher.RequestMap;
-import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts.webwork.dispatcher.ApplicationMap;
+import org.apache.struts.webwork.dispatcher.DispatcherUtils;
+import org.apache.struts.webwork.dispatcher.RequestMap;
+import org.apache.struts.webwork.dispatcher.SessionMap;
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import org.apache.commons.logging.Log;
@@ -26,7 +26,7 @@
  * <p/>
  * <dwr>
  * <allow>
- * <create creator="new" javascript="validator" class="org.apache.struts.action2.validators.DWRValidator"/>
+ * <create creator="new" javascript="validator" class="org.apache.struts.webwork.validators.DWRValidator"/>
  * <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
  * </allow>
  * </dwr>

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/JspSupportServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/JspSupportServlet.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/JspSupportServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/JspSupportServlet.java Sun Apr  2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.views;
+package org.apache.struts.webwork.views;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -10,7 +10,10 @@
  * Time: 8:27:24 AM
  */
 public class JspSupportServlet extends HttpServlet {
-    public static JspSupportServlet jspSupportServlet;
+	
+	private static final long serialVersionUID = 8302309812391541933L;
+	
+	public static JspSupportServlet jspSupportServlet;
 
     public void init(ServletConfig servletConfig) throws ServletException {
         super.init(servletConfig);

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerManager.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerManager.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerManager.java Sun Apr  2 09:27:22 2006
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
 import com.opensymphony.util.FileManager;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.JspSupportServlet;
-import org.apache.struts.action2.views.freemarker.tags.StrutsModels;
-import org.apache.struts.action2.views.util.ContextUtil;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.views.JspSupportServlet;
+import org.apache.struts.webwork.views.freemarker.tags.StrutsModels;
+import org.apache.struts.webwork.views.util.ContextUtil;
+import org.apache.struts.webwork.StrutsConstants;
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.cache.FileTemplateLoader;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerResult.java Sun Apr  2 09:27:22 2006
@@ -5,11 +5,11 @@
 /*
  * Created on 15/04/2004
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.StrutsResultSupport;
-import org.apache.struts.action2.views.util.ResourceUtil;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
+import org.apache.struts.webwork.views.util.ResourceUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.LocaleProvider;
@@ -28,7 +28,7 @@
  * <!-- START SNIPPET: description -->
  *
  * Renders a view using the Freemarker template engine.  Alternatively, the
- * {@link org.apache.struts.action2.dispatcher.ServletDispatcherResult
+ * {@link org.apache.struts.webwork.dispatcher.ServletDispatcherResult
  * dispatcher} result type can be used in conjunction Webwork's {@link
  * FreemarkerServlet}.
  * <p>
@@ -73,7 +73,9 @@
  */
 public class FreemarkerResult extends StrutsResultSupport {
 
-    protected ActionInvocation invocation;
+	private static final long serialVersionUID = -3778230771704661631L;
+	
+	protected ActionInvocation invocation;
     protected Configuration configuration;
     protected ObjectWrapper wrapper;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerServlet.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/FreemarkerServlet.java Sun Apr  2 09:27:22 2006
@@ -6,10 +6,10 @@
  * Created on 27/08/2003
  *
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
-import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.RequestUtils;
+import org.apache.struts.webwork.ServletActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.*;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/PortletFreemarkerResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/PortletFreemarkerResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/PortletFreemarkerResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/PortletFreemarkerResult.java Sun Apr  2 09:27:22 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -15,11 +15,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.StrutsResultSupport;
-import org.apache.struts.action2.portlet.PortletActionConstants;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
-import org.apache.struts.action2.views.util.ResourceUtil;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
+import org.apache.struts.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.webwork.views.util.ResourceUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -37,7 +37,9 @@
  */
 public class PortletFreemarkerResult extends StrutsResultSupport {
 
-    protected ActionInvocation invocation;
+	private static final long serialVersionUID = -5570612389289887543L;
+
+	protected ActionInvocation invocation;
 
     protected Configuration configuration;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/ScopesHashModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/ScopesHashModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/ScopesHashModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/ScopesHashModel.java Sun Apr  2 09:27:22 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.ObjectWrapper;
@@ -24,7 +24,9 @@
  */
 public class ScopesHashModel extends SimpleHash {
 
-    private HttpServletRequest request;
+	private static final long serialVersionUID = 5551686380141886764L;
+	
+	private HttpServletRequest request;
     private ObjectWrapper objectWraper;
     private ServletContext servletContext;
     private OgnlValueStack stack;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsBeanWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsBeanWrapper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsBeanWrapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsBeanWrapper.java Sun Apr  2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
 import freemarker.core.CollectionAndSequence;
 import freemarker.ext.beans.BeansWrapper;
@@ -26,7 +26,7 @@
  */
 public class StrutsBeanWrapper extends BeansWrapper {
     private static final boolean altMapWrapper
-            = "true".equals(org.apache.struts.action2.config.Configuration.get("struts.freemarker.wrapper.altMap"));
+            = "true".equals(org.apache.struts.webwork.config.Configuration.get("struts.freemarker.wrapper.altMap"));
 
     public TemplateModel wrap(Object object) throws TemplateModelException {
         if (object instanceof TemplateBooleanModel) {

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsClassTemplateLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsClassTemplateLoader.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsClassTemplateLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/StrutsClassTemplateLoader.java Sun Apr  2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import freemarker.cache.URLTemplateLoader;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionErrorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionErrorModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionErrorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionErrorModel.java Sun Apr  2 09:27:22 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.ActionError;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.ActionError;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionMessageModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionMessageModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionMessageModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionMessageModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.ActionMessage;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.ActionMessage;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ActionModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.ActionComponent;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.ActionComponent;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/AnchorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/AnchorModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/AnchorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/AnchorModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Anchor;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/BeanModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/BeanModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/BeanModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/BeanModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Bean;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.Bean;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CallbackWriter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CallbackWriter.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CallbackWriter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CallbackWriter.java Sun Apr  2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.Component;
 import freemarker.template.TemplateModelException;
 import freemarker.template.TransformControl;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxListModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxListModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxListModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxListModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.CheckboxList;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.CheckboxList;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/CheckboxModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Checkbox;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.Checkbox;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComboBoxModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComboBoxModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComboBoxModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComboBoxModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.ComboBox;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.ComboBox;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComponentModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComponentModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComponentModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ComponentModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.GenericUIBean;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DateModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DateModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DateModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DateModel.java Sun Apr  2 09:27:22 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Date;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Date;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DatePickerModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DatePickerModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DatePickerModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DatePickerModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.DatePicker;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DebugModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DebugModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DebugModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DebugModel.java Sun Apr  2 09:27:22 2006
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Debug;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Debug;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DivModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DivModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DivModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DivModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Div;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DoubleSelectModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DoubleSelectModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DoubleSelectModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/DoubleSelectModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.DoubleSelect;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FieldErrorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FieldErrorModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FieldErrorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FieldErrorModel.java Sun Apr  2 09:27:22 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.FieldError;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.FieldError;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FileModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FileModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FileModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FileModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.File;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FormModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FormModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FormModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/FormModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Form;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HeadModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HeadModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HeadModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HeadModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Head;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HiddenModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HiddenModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HiddenModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/HiddenModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Hidden;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/I18nModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/I18nModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/I18nModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/I18nModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.I18n;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IncludeModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IncludeModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IncludeModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IncludeModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Include;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IteratorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IteratorModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IteratorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/IteratorModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.IteratorComponent;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.IteratorComponent;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/LabelModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/LabelModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/LabelModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/LabelModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Label;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Label;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/OptionTransferSelectModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/OptionTransferSelectModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/OptionTransferSelectModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/OptionTransferSelectModel.java Sun Apr  2 09:27:22 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.OptionTransferSelect;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.OptionTransferSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PanelModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PanelModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PanelModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PanelModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Panel;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Panel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ParamModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ParamModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ParamModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ParamModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Param;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Param;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PasswordModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PasswordModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PasswordModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PasswordModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Password;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Password;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PropertyModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PropertyModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PropertyModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PropertyModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Property;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Property;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PushModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PushModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PushModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/PushModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Push;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Push;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RadioModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RadioModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RadioModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RadioModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Radio;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Radio;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ResetModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ResetModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ResetModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/ResetModel.java Sun Apr  2 09:27:22 2006
@@ -2,17 +2,17 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Reset;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Reset;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @see org.apache.struts.action2.components.Reset
+ * @see org.apache.struts.webwork.components.Reset
  */
 public class ResetModel extends TagModel {
     public ResetModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RichTextEditorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RichTextEditorModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RichTextEditorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/RichTextEditorModel.java Sun Apr  2 09:27:22 2006
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.RichTextEditor;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.RichTextEditor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SelectModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SelectModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SelectModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SelectModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Select;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Select;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SetModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SetModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SetModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SetModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Set;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Set;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/StrutsModels.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/StrutsModels.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/StrutsModels.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/StrutsModels.java Sun Apr  2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SubmitModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SubmitModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SubmitModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/SubmitModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Submit;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Submit;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TabbedPanelModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TabbedPanelModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TabbedPanelModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TabbedPanelModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TabbedPanel;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.TabbedPanel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TagModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TagModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TagModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TagModel.java Sun Apr  2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.SimpleNumber;
 import freemarker.template.TemplateModelException;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextAreaModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextAreaModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextAreaModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextAreaModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TextArea;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.TextArea;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextFieldModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextFieldModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextFieldModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextFieldModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TextField;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.TextField;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TextModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Text;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Text;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TokenModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TokenModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TokenModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TokenModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Token;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Token;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeModel.java Sun Apr  2 09:27:22 2006
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Tree;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Tree;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeNodeModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeNodeModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeNodeModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/TreeNodeModel.java Sun Apr  2 09:27:22 2006
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TreeNode;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.TreeNode;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/URLModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/URLModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/URLModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/URLModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.URL;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.URL;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/UpDownSelectModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/UpDownSelectModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/UpDownSelectModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/UpDownSelectModel.java Sun Apr  2 09:27:22 2006
@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.UpDownSelect;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.UpDownSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/WebTableModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/WebTableModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/WebTableModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/freemarker/tags/WebTableModel.java Sun Apr  2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts.webwork.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.table.WebTable;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/CompileReport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/CompileReport.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/CompileReport.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/CompileReport.java Sun Apr  2 09:27:22 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts.webwork.views.jasperreports;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperCompileManager;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportConstants.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportConstants.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportConstants.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportConstants.java Sun Apr  2 09:27:22 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts.webwork.views.jasperreports;
 
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportsResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportsResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportsResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/JasperReportsResult.java Sun Apr  2 09:27:22 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2005 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts.webwork.views.jasperreports;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -29,8 +29,8 @@
 import org.apache.commons.logging.LogFactory;
 
 import com.opensymphony.util.TextUtils;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.StrutsResultSupport;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -103,7 +103,11 @@
  * @author Rainer Hermanns
  */
 public class JasperReportsResult extends StrutsResultSupport implements JasperReportConstants {
-    private final static Log LOG = LogFactory.getLog(JasperReportsResult.class);
+	
+	private static final long serialVersionUID = -2523174799621182907L;
+
+
+	private final static Log LOG = LogFactory.getLog(JasperReportsResult.class);
 
 
     protected String dataSource;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackDataSource.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackDataSource.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackDataSource.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackDataSource.java Sun Apr  2 09:27:22 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts.webwork.views.jasperreports;
 
-import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.webwork.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackShadowMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackShadowMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackShadowMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jasperreports/OgnlValueStackShadowMap.java Sun Apr  2 09:27:22 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts.webwork.views.jasperreports;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -18,7 +18,9 @@
  */
 public class OgnlValueStackShadowMap extends HashMap {
 
-    /**
+	private static final long serialVersionUID = -167109778490907240L;
+
+	/**
      * valueStack reference
      */
     OgnlValueStack valueStack;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ActionTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ActionTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ActionTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ActionTag.java Sun Apr  2 09:27:22 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.ActionComponent;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.ActionComponent;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15,7 +15,10 @@
  * @see ActionComponent
  */
 public class ActionTag extends ComponentTagSupport {
-    protected String name;
+	
+	private static final long serialVersionUID = -5384167073331678855L;
+	
+	protected String name;
     protected String namespace;
     protected boolean executeResult;
     protected boolean ignoreContextParams;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/BeanTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/BeanTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/BeanTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/BeanTag.java Sun Apr  2 09:27:22 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Bean;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.Bean;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -18,7 +18,10 @@
  * @see Bean
  */
 public class BeanTag extends ComponentTagSupport {
-    protected static Log log = LogFactory.getLog(BeanTag.class);
+	
+	private static final long serialVersionUID = -3863152522071209267L;
+
+	protected static Log log = LogFactory.getLog(BeanTag.class);
 
     protected String name;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ComponentTagSupport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ComponentTagSupport.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ComponentTagSupport.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ComponentTagSupport.java Sun Apr  2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Component;
+import org.apache.struts.webwork.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/DateTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/DateTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/DateTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/DateTag.java Sun Apr  2 09:27:22 2006
@@ -1,10 +1,10 @@
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Date;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Date;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
@@ -12,7 +12,9 @@
  */
 public class DateTag extends ComponentTagSupport {
 
-    protected String name;
+	private static final long serialVersionUID = -6216963123295613440L;
+	
+	protected String name;
     protected String format;
     protected boolean nice;
 

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseIfTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseIfTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseIfTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseIfTag.java Sun Apr  2 09:27:22 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.ElseIf;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.ElseIf;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15,7 +15,10 @@
  * @see ElseIf
  */
 public class ElseIfTag extends ComponentTagSupport {
-    protected String test;
+	
+	private static final long serialVersionUID = -3872016920741400345L;
+	
+	protected String test;
 
     public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new ElseIf(stack);

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/ElseTag.java Sun Apr  2 09:27:22 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Else;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Else;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,7 +16,10 @@
  * @see Else
  */
 public class ElseTag extends ComponentTagSupport {
-    public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+	
+	private static final long serialVersionUID = 8166807953193406785L;
+
+	public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Else(stack);
     }
 }

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/I18nTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/I18nTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/I18nTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/I18nTag.java Sun Apr  2 09:27:22 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.I18n;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,7 +16,10 @@
  * @see I18n
  */
 public class I18nTag extends ComponentTagSupport {
-    protected String name;
+	
+	private static final long serialVersionUID = -7914587341936116887L;
+	
+	protected String name;
 
     public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new I18n(stack);

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IfTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IfTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IfTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IfTag.java Sun Apr  2 09:27:22 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.If;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.If;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,7 +16,10 @@
  * @see If
  */
 public class IfTag extends ComponentTagSupport {
-    String test;
+	
+	private static final long serialVersionUID = 4448870162549923833L;
+	
+	String test;
 
     public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new If(stack);

Modified: incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IncludeTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IncludeTag.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IncludeTag.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/views/jsp/IncludeTag.java Sun Apr  2 09:27:22 2006
@@ -8,10 +8,10 @@
  * Distributable under Apache license.
  * See terms of license at opensource.org
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Include;
+import org.apache.struts.webwork.components.Component;
+import org.apache.struts.webwork.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,7 +22,10 @@
  * @see Include
  */
 public class IncludeTag extends ComponentTagSupport {
-    protected String value;
+	
+	private static final long serialVersionUID = -1585165567043278243L;
+	
+	protected String value;
 
     public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Include(stack, req, res);



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


Mime
View raw message