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/02 18:27:55 UTC
svn commit: r390846 [3/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...
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcher.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcher.java Sun Apr 2 09:27:22 2006
@@ -2,16 +2,16 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.webwork.RequestUtils;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapper;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
import com.opensymphony.xwork.interceptor.component.ComponentManager;
@@ -71,7 +71,7 @@
*
* <ul>
*
- * <li>org.apache.struts.action2.static</li>
+ * <li>org.apache.struts.webwork.static</li>
*
* <li>template</li>
*
@@ -79,7 +79,7 @@
*
* <p/> This means that you can simply request /struts/xhtml/styles.css and the XHTML UI theme's default stylesheet
* will be returned. Likewise, many of the AJAX UI components require various JavaScript files, which are found in the
- * org.apache.struts.action2.static package. If you wish to add additional packages to be searched, you can add a comma
+ * org.apache.struts.webwork.static package. If you wish to add additional packages to be searched, you can add a comma
* separated (space, tab and new line will do as well) list in the filter init parameter named "packages". <b>Be
* careful</b>, however, to expose any packages that may have sensitive information, such as properties file with
* database access credentials.
@@ -88,10 +88,10 @@
*
* <p/> This filter also kicks off the XWork IoC request scope, provided that you are using XWork's IoC. All you have to
* do to get started with XWork's IoC is add a components.xml file to WEB-INF/classes and properly set up the {@link
- * org.apache.struts.action2.lifecycle.LifecycleListener} in web.xml. See the IoC docs for more information. <p/>
+ * org.apache.struts.webwork.lifecycle.LifecycleListener} in web.xml. See the IoC docs for more information. <p/>
*
* @author Patrick Lightbody
- * @see org.apache.struts.action2.lifecycle.LifecycleListener
+ * @see org.apache.struts.webwork.lifecycle.LifecycleListener
* @see ActionMapper
* @see ActionContextCleanUp
* @since 2.2
@@ -121,7 +121,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
this.filterConfig = filterConfig;
String param = filterConfig.getInitParameter("packages");
- String packages = "org.apache.struts.action2.static template org.apache.struts.action2.interceptor.debugging";
+ String packages = "org.apache.struts.webwork.static template org.apache.struts.webwork.interceptor.debugging";
if (param != null) {
packages = param + " " + packages;
}
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcherCompatWeblogic61.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcherCompatWeblogic61.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcherCompatWeblogic61.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/FilterDispatcherCompatWeblogic61.java Sun Apr 2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.config.ServletContextSingleton;
+import org.apache.struts.webwork.config.ServletContextSingleton;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,7 +39,7 @@
/**
* dummy setter for {@link #filterConfig}; this method
- * sets up the {@link org.apache.struts.action2.config.ServletContextSingleton} with
+ * sets up the {@link org.apache.struts.webwork.config.ServletContextSingleton} with
* the servlet context from the filter configuration.
* <p/>
* This is needed by Weblogic Server 6.1 because it
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/HttpHeaderResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/HttpHeaderResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/HttpHeaderResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/HttpHeaderResult.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
@@ -54,7 +54,9 @@
*/
public class HttpHeaderResult implements Result {
- public static final String DEFAULT_PARAM = "status";
+ private static final long serialVersionUID = 195648957144219214L;
+
+ public static final String DEFAULT_PARAM = "status";
protected boolean parse = true;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/PlainTextResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/PlainTextResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/PlainTextResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/PlainTextResult.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import java.io.InputStreamReader;
import java.io.PrintWriter;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/RequestMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/RequestMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/RequestMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/RequestMap.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
@@ -20,7 +20,9 @@
*/
public class RequestMap extends AbstractMap implements Serializable {
- Set entries;
+ private static final long serialVersionUID = -7675640869293787926L;
+
+ Set entries;
private HttpServletRequest request;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletActionRedirectResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletActionRedirectResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletActionRedirectResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletActionRedirectResult.java Sun Apr 2 09:27:22 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapper;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
import com.opensymphony.xwork.ActionInvocation;
/**
@@ -61,7 +61,10 @@
* @see ActionMapper
*/
public class ServletActionRedirectResult extends ServletRedirectResult {
- public static final String DEFAULT_PARAM = "actionName";
+
+ private static final long serialVersionUID = -9042425229314584066L;
+
+ public static final String DEFAULT_PARAM = "actionName";
protected String actionName;
protected String namespace;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcher.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcher.java Sun Apr 2 09:27:22 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcherResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcherResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcherResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletDispatcherResult.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,7 +71,9 @@
*/
public class ServletDispatcherResult extends StrutsResultSupport {
- private static final Log log = LogFactory.getLog(ServletDispatcherResult.class);
+ private static final long serialVersionUID = -1970659272360685627L;
+
+ private static final Log log = LogFactory.getLog(ServletDispatcherResult.class);
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletRedirectResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletRedirectResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletRedirectResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ServletRedirectResult.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapperFactory;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import org.apache.commons.logging.Log;
@@ -60,7 +60,10 @@
* @author Patrick Lightbody
*/
public class ServletRedirectResult extends StrutsResultSupport {
- private static final Log log = LogFactory.getLog(ServletRedirectResult.class);
+
+ private static final long serialVersionUID = 6316947346435301270L;
+
+ private static final Log log = LogFactory.getLog(ServletRedirectResult.class);
protected boolean prependServletContext = true;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/SessionMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/SessionMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/SessionMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/SessionMap.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -20,7 +20,9 @@
*/
public class SessionMap extends AbstractMap implements Serializable {
- protected HttpSession session;
+ private static final long serialVersionUID = 4678843241638046854L;
+
+ protected HttpSession session;
protected Set entries;
protected HttpServletRequest request;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StreamResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StreamResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StreamResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StreamResult.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.opensymphony.xwork.ActionInvocation;
@@ -62,7 +62,10 @@
* @author Rainer Hermanns
*/
public class StreamResult extends StrutsResultSupport {
- protected static final Log log = LogFactory.getLog(StreamResult.class);
+
+ private static final long serialVersionUID = -1468409635999059850L;
+
+ protected static final Log log = LogFactory.getLog(StreamResult.class);
protected String contentType = "text/plain";
protected int contentLength;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsRequestWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsRequestWrapper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsRequestWrapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsRequestWrapper.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsResultSupport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsResultSupport.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsResultSupport.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/StrutsResultSupport.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.webwork.StrutsStatics;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
import com.opensymphony.xwork.util.TextParseUtil;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/VelocityResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/VelocityResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/VelocityResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/VelocityResult.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.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-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.JspSupportServlet;
-import org.apache.struts.action2.views.velocity.VelocityManager;
+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.JspSupportServlet;
+import org.apache.struts.webwork.views.velocity.VelocityManager;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -67,7 +67,9 @@
*/
public class VelocityResult extends StrutsResultSupport {
- private static final Log log = LogFactory.getLog(VelocityResult.class);
+ private static final long serialVersionUID = 7268830767762559424L;
+
+ private static final Log log = LogFactory.getLog(VelocityResult.class);
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapper.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapperFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapperFactory.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapperFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapperFactory.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.StrutsConstants;
import com.opensymphony.xwork.ObjectFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapping.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapping.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapping.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/ActionMapping.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
import com.opensymphony.xwork.Result;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapper.java Sun Apr 2 09:27:22 2006
@@ -1,10 +1,10 @@
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
-import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.ServletRedirectResult;
-import org.apache.struts.action2.util.PrefixTrie;
+import org.apache.struts.webwork.RequestUtils;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.dispatcher.ServletRedirectResult;
+import org.apache.struts.webwork.util.PrefixTrie;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapper.java Sun Apr 2 09:27:22 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.webwork.RequestUtils;
import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/JakartaMultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/JakartaMultiPartRequest.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/JakartaMultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/JakartaMultiPartRequest.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.dispatcher.multipart;
+package org.apache.struts.webwork.dispatcher.multipart;
import org.apache.commons.fileupload.*;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequest.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequest.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.dispatcher.multipart;
+package org.apache.struts.webwork.dispatcher.multipart;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequestWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequestWrapper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequestWrapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/MultiPartRequestWrapper.java Sun Apr 2 09:27:22 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher.multipart;
+package org.apache.struts.webwork.dispatcher.multipart;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.StrutsRequestWrapper;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.util.ClassLoaderUtils;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.dispatcher.StrutsRequestWrapper;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.util.ClassLoaderUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -21,12 +21,12 @@
/**
* Parses a multipart request and provides a wrapper around the request. The parsing implementation used
* depends on the <tt>struts.multipart.parser</tt> setting. It should be set to a class which
- * extends {@link org.apache.struts.action2.dispatcher.multipart.MultiPartRequest}. <p>
+ * extends {@link org.apache.struts.webwork.dispatcher.multipart.MultiPartRequest}. <p>
* <p/>
* Webwork ships with three implementations,
- * {@link org.apache.struts.action2.dispatcher.multipart.PellMultiPartRequest}, and
- * {@link org.apache.struts.action2.dispatcher.multipart.CosMultiPartRequest} and
- * {@link org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest}. The Jakarta implementation
+ * {@link org.apache.struts.webwork.dispatcher.multipart.PellMultiPartRequest}, and
+ * {@link org.apache.struts.webwork.dispatcher.multipart.CosMultiPartRequest} and
+ * {@link org.apache.struts.webwork.dispatcher.multipart.JakartaMultiPartRequest}. The Jakarta implementation
* is the default. The <tt>struts.multipart.parser</tt> property should be set to <tt>jakarta</tt> for the
* Jakarta implementation, <tt>pell</tt> for the Pell implementation and <tt>cos</tt> for the Jason Hunter
* implementation. <p>
@@ -61,20 +61,20 @@
// If it's not set, use Jakarta
if (parser.equals("")) {
log.warn("Property struts.multipart.parser not set." +
- " Using org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest");
- parser = "org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest";
+ " Using org.apache.struts.webwork.dispatcher.multipart.JakartaMultiPartRequest");
+ parser = "org.apache.struts.webwork.dispatcher.multipart.JakartaMultiPartRequest";
}
// legacy support for old style property values
else if (parser.equals("pell")) {
- parser = "org.apache.struts.action2.dispatcher.multipart.PellMultiPartRequest";
+ parser = "org.apache.struts.webwork.dispatcher.multipart.PellMultiPartRequest";
} else if (parser.equals("cos")) {
- parser = "org.apache.struts.action2.dispatcher.multipart.CosMultiPartRequest";
+ parser = "org.apache.struts.webwork.dispatcher.multipart.CosMultiPartRequest";
} else if (parser.equals("jakarta")) {
- parser = "org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest";
+ parser = "org.apache.struts.webwork.dispatcher.multipart.JakartaMultiPartRequest";
}
try {
- Class baseClazz = org.apache.struts.action2.dispatcher.multipart.MultiPartRequest.class;
+ Class baseClazz = org.apache.struts.webwork.dispatcher.multipart.MultiPartRequest.class;
Class clazz = ClassLoaderUtils.loadClass(parser, MultiPartRequestWrapper.class);
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/PellMultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/PellMultiPartRequest.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/PellMultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/multipart/PellMultiPartRequest.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.dispatcher.multipart;
+package org.apache.struts.webwork.dispatcher.multipart;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.StrutsConstants;
import http.utils.multipartrequest.ServletMultipartRequest;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ApplicationAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ApplicationAware.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ApplicationAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ApplicationAware.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.interceptor;
+package org.apache.struts.webwork.interceptor;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/BackgroundProcess.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/BackgroundProcess.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/BackgroundProcess.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/BackgroundProcess.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.xwork.ActionInvocation;
@@ -11,7 +11,10 @@
* @author <a href="jim@jimvanfleet.com">Jim Van Fleet</a>
*/
public class BackgroundProcess implements Serializable {
- protected Object action;
+
+ private static final long serialVersionUID = 3884464776311686443L;
+
+ protected Object action;
protected ActionInvocation invocation;
protected String result;
protected Exception exception;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/CreateSessionInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/CreateSessionInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/CreateSessionInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/CreateSessionInterceptor.java Sun Apr 2 09:27:22 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.AroundInterceptor;
@@ -62,6 +62,8 @@
* @version $Date: 2006/03/19 07:40:59 $ $Id: CreateSessionInterceptor.java,v 1.4 2006/03/19 07:40:59 davsclaus Exp $
*/
public class CreateSessionInterceptor extends AroundInterceptor {
+
+ private static final long serialVersionUID = -4590322556118858869L;
private static final Log _log = LogFactory.getLog(CreateSessionInterceptor.class);
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptor.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.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
@@ -148,7 +148,10 @@
* @author Claus Ibsen
*/
public class ExecuteAndWaitInterceptor implements Interceptor {
- private static final Log LOG = LogFactory.getLog(ExecuteAndWaitInterceptor.class);
+
+ private static final long serialVersionUID = -2754639196749652512L;
+
+ private static final Log LOG = LogFactory.getLog(ExecuteAndWaitInterceptor.class);
public static final String KEY = "__execWait";
public static final String WAIT = "wait";
@@ -188,8 +191,8 @@
"provide an action-specific or global result named '" + WAIT +
"'! This requires FreeMarker support and won't work if you don't have it installed");
// no wait result? hmm -- let's try to do dynamically put it in for you!
- ResultConfig rc = new ResultConfig(WAIT, "org.apache.struts.action2.views.freemarker.FreemarkerResult",
- Collections.singletonMap("location", "org/apache/struts/action2/interceptor/wait.ftl"));
+ ResultConfig rc = new ResultConfig(WAIT, "org.apache.struts.webwork.views.freemarker.FreemarkerResult",
+ Collections.singletonMap("location", "org/apache/struts/webwork/interceptor/wait.ftl"));
results.put(WAIT, rc);
}
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/FileUploadInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/FileUploadInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/FileUploadInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/FileUploadInterceptor.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.interceptor;
+package org.apache.struts.webwork.interceptor;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.dispatcher.multipart.MultiPartRequestWrapper;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
@@ -133,7 +133,10 @@
*
*/
public class FileUploadInterceptor implements Interceptor {
- protected static final Log log = LogFactory.getLog(FileUploadInterceptor.class);
+
+ private static final long serialVersionUID = -4764627478894962478L;
+
+ protected static final Log log = LogFactory.getLog(FileUploadInterceptor.class);
private static final String DEFAULT_DELIMITER = ",";
private static final String DEFAULT_MESSAGE = "no.message.found";
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/NoParameters.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/NoParameters.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/NoParameters.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/NoParameters.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.interceptor;
+package org.apache.struts.webwork.interceptor;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ParameterAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ParameterAware.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ParameterAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ParameterAware.java Sun Apr 2 09:27:22 2006
@@ -8,7 +8,7 @@
* Distributable under Apache license.
* See terms of license at opensource.org
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalAware.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalAware.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
/**
* Actions that want access to the Principal information from HttpServletRequest object
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalProxy.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalProxy.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalProxy.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/PrincipalProxy.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ScopeInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ScopeInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ScopeInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ScopeInterceptor.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
@@ -6,8 +6,8 @@
import com.opensymphony.xwork.interceptor.Interceptor;
import com.opensymphony.xwork.interceptor.PreResultListener;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.dispatcher.SessionMap;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.dispatcher.SessionMap;
+import org.apache.struts.webwork.ServletActionContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -118,7 +118,9 @@
*/
public class ScopeInterceptor implements Interceptor, PreResultListener {
- private static final Log LOG = LogFactory.getLog(ScopeInterceptor.class);
+ private static final long serialVersionUID = 9120762699600054395L;
+
+ private static final Log LOG = LogFactory.getLog(ScopeInterceptor.class);
String[] application = null;
String[] session = null;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletConfigInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletConfigInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletConfigInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletConfigInterceptor.java Sun Apr 2 09:27:22 2006
@@ -2,11 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.util.ServletContextAware;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.util.ServletContextAware;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.AroundInterceptor;
@@ -90,7 +89,10 @@
* @see PrincipalAware
*/
public class ServletConfigInterceptor extends AroundInterceptor implements StrutsStatics {
- protected void after(ActionInvocation dispatcher, String result) throws Exception {
+
+ private static final long serialVersionUID = 605261777858676638L;
+
+ protected void after(ActionInvocation dispatcher, String result) throws Exception {
}
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletRequestAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletRequestAware.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletRequestAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletRequestAware.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.interceptor;
+package org.apache.struts.webwork.interceptor;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletResponseAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletResponseAware.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletResponseAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/ServletResponseAware.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.interceptor;
+package org.apache.struts.webwork.interceptor;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/SessionAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/SessionAware.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/SessionAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/SessionAware.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.interceptor;
+package org.apache.struts.webwork.interceptor;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptor.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.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.ConversionErrorInterceptor;
@@ -55,7 +55,10 @@
* @see ConversionErrorInterceptor
*/
public class StrutsConversionErrorInterceptor extends ConversionErrorInterceptor {
- protected Object getOverrideExpr(ActionInvocation invocation, Object value) {
+
+ private static final long serialVersionUID = 2759744840082921602L;
+
+ protected Object getOverrideExpr(ActionInvocation invocation, Object value) {
OgnlValueStack stack = invocation.getStack();
try {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenInterceptor.java Sun Apr 2 09:27:22 2006
@@ -2,19 +2,16 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import java.util.Map;
-import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts.webwork.util.TokenHelper;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ValidationAware;
-import com.opensymphony.xwork.interceptor.Interceptor;
import com.opensymphony.xwork.interceptor.MethodFilterInterceptor;
import com.opensymphony.xwork.util.LocalizedTextUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* <!-- START SNIPPET: description -->
@@ -107,7 +104,10 @@
* @version $Date: 2006/03/18 04:45:13 $ $Id: TokenInterceptor.java,v 1.20 2006/03/18 04:45:13 tmjee Exp $
*/
public class TokenInterceptor extends MethodFilterInterceptor {
- public static final String INVALID_TOKEN_CODE = "invalid.token";
+
+ private static final long serialVersionUID = -6680894220590585506L;
+
+ public static final String INVALID_TOKEN_CODE = "invalid.token";
/**
* @see com.opensymphony.xwork.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork.ActionInvocation)
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptor.java Sun Apr 2 09:27:22 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.util.InvocationSessionStore;
-import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.util.InvocationSessionStore;
+import org.apache.struts.webwork.util.TokenHelper;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
@@ -87,7 +87,10 @@
* @version $Date: 2006/03/18 04:45:13 $ $Id: TokenSessionStoreInterceptor.java,v 1.17 2006/03/18 04:45:13 tmjee Exp $
*/
public class TokenSessionStoreInterceptor extends TokenInterceptor {
- protected String handleInvalidToken(ActionInvocation invocation) throws Exception {
+
+ private static final long serialVersionUID = -9032347965469098195L;
+
+ protected String handleInvalidToken(ActionInvocation invocation) throws Exception {
ActionContext ac = invocation.getInvocationContext();
HttpServletRequest request = (HttpServletRequest) ac.get(ServletActionContext.HTTP_REQUEST);
@@ -124,8 +127,6 @@
protected String handleValidToken(ActionInvocation invocation) throws Exception {
// we know the token name and token must be there
- ActionContext ac = invocation.getInvocationContext();
- HttpServletRequest request = (HttpServletRequest) ac.get(ServletActionContext.HTTP_REQUEST);
String key = TokenHelper.getTokenName();
String token = TokenHelper.getToken(key);
InvocationSessionStore.storeInvocation(key, token, invocation);
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/DebuggingInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/DebuggingInterceptor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/DebuggingInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/DebuggingInterceptor.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.interceptor.debugging;
+package org.apache.struts.webwork.interceptor.debugging;
import java.beans.BeanInfo;
import java.beans.Introspector;
@@ -33,8 +33,8 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.freemarker.FreemarkerResult;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.views.freemarker.FreemarkerResult;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -67,7 +67,9 @@
*/
public class DebuggingInterceptor implements Interceptor {
- private final static Log log = LogFactory.getLog(DebuggingInterceptor.class);
+ private static final long serialVersionUID = -3097324155953078783L;
+
+ private final static Log log = LogFactory.getLog(DebuggingInterceptor.class);
private String[] ignorePrefixes = new String[]{"org.apache.struts.",
"com.opensymphony.xwork.", "xwork."};
@@ -79,7 +81,7 @@
private final static String CONSOLE_MODE = "console";
private final static String COMMAND_MODE = "command";
- private final static String SESSION_KEY = "org.apache.struts.action2.interceptor.debugging.VALUE_STACK";
+ private final static String SESSION_KEY = "org.apache.struts.webwork.interceptor.debugging.VALUE_STACK";
private final static String DEBUG_PARAM = "debug";
private final static String EXPRESSION_PARAM = "expression";
@@ -126,11 +128,11 @@
xml = xml.replaceAll("<", "<");
ActionContext.getContext().put("debugXML", xml);
- ctx.getSession().put(SESSION_KEY, ctx.get(ctx.VALUE_STACK));
+ ctx.getSession().put(SESSION_KEY, ctx.get(ActionContext.VALUE_STACK));
FreemarkerResult result = new FreemarkerResult();
result.setContentType("text/html");
- result.setLocation("org/apache/struts/action2/interceptor/debugging/console.ftl");
+ result.setLocation("org/apache/struts/webwork/interceptor/debugging/console.ftl");
result.setParse(false);
try {
result.execute(inv);
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/PrettyPrintWriter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/PrettyPrintWriter.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/PrettyPrintWriter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/interceptor/debugging/PrettyPrintWriter.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.interceptor.debugging;
+package org.apache.struts.webwork.interceptor.debugging;
import com.thoughtworks.xstream.core.util.FastStack;
import com.thoughtworks.xstream.core.util.QuickWriter;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/ApplicationLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/ApplicationLifecycleListener.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/ApplicationLifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/ApplicationLifecycleListener.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.lifecycle;
+package org.apache.struts.webwork.lifecycle;
import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
import com.opensymphony.xwork.interceptor.component.ComponentManager;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/LifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/LifecycleListener.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/LifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/LifecycleListener.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.lifecycle;
+package org.apache.struts.webwork.lifecycle;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
@@ -12,7 +12,7 @@
* @author Patrick Lightbody
* @see ApplicationLifecycleListener
* @see SessionLifecycleListener
- * @see org.apache.struts.action2.dispatcher.FilterDispatcher
+ * @see org.apache.struts.webwork.dispatcher.FilterDispatcher
* @since 2.2
* @deprecated XWork IoC has been deprecated in favor of Spring.
* Please refer to the Spring-WebWork integration documentation for more info.
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListener.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListener.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.lifecycle;
+package org.apache.struts.webwork.lifecycle;
import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
import com.opensymphony.xwork.interceptor.component.ComponentManager;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListenerCompatWeblogic61.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListenerCompatWeblogic61.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/lifecycle/SessionLifecycleListenerCompatWeblogic61.java Sun Apr 2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.lifecycle;
+package org.apache.struts.webwork.lifecycle;
-import org.apache.struts.action2.config.ServletContextSingleton;
+import org.apache.struts.webwork.config.ServletContextSingleton;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionInvocation.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionInvocation.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionInvocation.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionInvocation.java Sun Apr 2 09:27:22 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionProxyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionProxyFactory.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionProxyFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoActionProxyFactory.java Sun Apr 2 09:27:22 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoFilterDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoFilterDispatcher.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoFilterDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoFilterDispatcher.java Sun Apr 2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
-import org.apache.struts.action2.dispatcher.FilterDispatcher;
+import org.apache.struts.webwork.dispatcher.FilterDispatcher;
import com.opensymphony.xwork.ObjectFactory;
import org.nanocontainer.nanowar.ServletRequestContainerLauncher;
import org.picocontainer.defaults.ObjectReference;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactory.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactory.java Sun Apr 2 09:27:22 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
import com.opensymphony.xwork.ObjectFactory;
import com.opensymphony.xwork.Result;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactoryFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactoryFilter.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactoryFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoObjectFactoryFilter.java Sun Apr 2 09:27:22 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
import com.opensymphony.xwork.ObjectFactory;
import org.picocontainer.defaults.ObjectReference;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoServletDispatcher.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoServletDispatcher.java Sun Apr 2 09:27:22 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoStrutsServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoStrutsServletDispatcher.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoStrutsServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/pico/PicoStrutsServletDispatcher.java Sun Apr 2 09:27:22 2006
@@ -6,9 +6,9 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package org.apache.struts.action2.pico;
+package org.apache.struts.webwork.pico;
-import org.apache.struts.action2.dispatcher.ServletDispatcher;
+import org.apache.struts.webwork.dispatcher.ServletDispatcher;
import com.opensymphony.xwork.ActionProxyFactory;
import org.nanocontainer.nanowar.ServletRequestContainerLauncher;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusFilter.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusFilter.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.plexus;
+package org.apache.struts.webwork.plexus;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusLifecycleListener.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusLifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusLifecycleListener.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.plexus;
+package org.apache.struts.webwork.plexus;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusObjectFactory.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusObjectFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusObjectFactory.java Sun Apr 2 09:27:22 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.plexus;
+package org.apache.struts.webwork.plexus;
-import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.webwork.util.ObjectFactoryInitializable;
import com.opensymphony.xwork.ObjectFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,7 @@
" <!-- this should be before the webwork filter -->\n" +
" <filter>\n" +
" <filter-name>plexus</filter-name>\n" +
- " <filter-class>org.apache.struts.action2.plexus.PlexusFilter</filter-class>\n" +
+ " <filter-class>org.apache.struts.webwork.plexus.PlexusFilter</filter-class>\n" +
" </filter>\n" +
"\n" +
"...\n" +
@@ -65,7 +65,7 @@
"...\n" +
"\n" +
" <listener>\n" +
- " <listener-class>org.apache.struts.action2.plexus.PlexusLifecycleListener</listener-class>\n" +
+ " <listener-class>org.apache.struts.webwork.plexus.PlexusLifecycleListener</listener-class>\n" +
" </listener>";
log.fatal(message);
return;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusThreadLocal.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusThreadLocal.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusThreadLocal.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusThreadLocal.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.plexus;
+package org.apache.struts.webwork.plexus;
import org.codehaus.plexus.PlexusContainer;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusUtils.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/plexus/PlexusUtils.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.plexus;
+package org.apache.struts.webwork.plexus;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletActionConstants.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletActionConstants.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletActionConstants.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletActionConstants.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.portlet;
+package org.apache.struts.webwork.portlet;
/**
* Interface defining some constants used in the WebWork2 portlet implementation
@@ -74,19 +74,19 @@
/**
* Key for the portlet namespace stored in the
- * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
+ * {@link org.apache.struts.webwork.portlet.context.PortletActionContext}.
*/
String PORTLET_NAMESPACE = "struts.portlet.portletNamespace";
/**
* Key for the mode-to-namespace map stored in the
- * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
+ * {@link org.apache.struts.webwork.portlet.context.PortletActionContext}.
*/
String MODE_NAMESPACE_MAP = "struts.portlet.modeNamespaceMap";
/**
* Key for the default action name for the portlet, stored in the
- * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
+ * {@link org.apache.struts.webwork.portlet.context.PortletActionContext}.
*/
String DEFAULT_ACTION_FOR_MODE = "struts.portlet.defaultActionForMode";
}
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletApplicationMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletApplicationMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletApplicationMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletApplicationMap.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.portlet;
+package org.apache.struts.webwork.portlet;
import java.io.Serializable;
import java.util.AbstractMap;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletRequestMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletRequestMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletRequestMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletRequestMap.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.portlet;
+package org.apache.struts.webwork.portlet;
import java.util.AbstractMap;
import java.util.Enumeration;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletSessionMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletSessionMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletSessionMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/PortletSessionMap.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.portlet;
+package org.apache.struts.webwork.portlet;
import java.util.AbstractMap;
import java.util.Enumeration;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PortletActionContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PortletActionContext.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PortletActionContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PortletActionContext.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.portlet.context;
+package org.apache.struts.webwork.portlet.context;
import java.util.Map;
@@ -14,7 +14,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PreparatorServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PreparatorServlet.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PreparatorServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/PreparatorServlet.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.portlet.context;
+package org.apache.struts.webwork.portlet.context;
import java.io.IOException;
@@ -15,24 +15,26 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.webwork.StrutsStatics;
import com.opensymphony.xwork.ActionContext;
/**
* Since a portlet is not dispatched the same way as a servlet, the
* {@link org.apache.struts.action2.ServletActionContext} is not immediately available, as it
* depends on objects from the servlet API. However, the WW2 view implementations require access
- * to the objects in the {@link org.apache.struts.action2.ServletActionContext}, and this servlet
+ * to the objects in the {@link org.apache.struts.webwork.ServletActionContext}, and this servlet
* makes sure that these are available when the portlet actions are executing the render results.
*
* @author Nils-Helge Garli
*/
public class PreparatorServlet extends HttpServlet implements StrutsStatics {
- private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
+ private static final long serialVersionUID = 1853399729352984089L;
+
+ private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
/**
- * Prepares the {@link org.apache.struts.action2.ServletActionContext} with the
+ * Prepares the {@link org.apache.struts.webwork.ServletActionContext} with the
* {@link ServletContext}, {@link HttpServletRequest} and {@link HttpServletResponse}.
*/
public void service(HttpServletRequest servletRequest,
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/ServletContextHolderListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/ServletContextHolderListener.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/ServletContextHolderListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/context/ServletContextHolderListener.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.portlet.context;
+package org.apache.struts.webwork.portlet.context;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -10,7 +10,7 @@
/**
* Some of the factory/managers (e.g. the ObjectFactory) need access to
- * the {@link org.apache.struts.action2.ServletActionContext} object when initializing.
+ * the {@link org.apache.struts.webwork.ServletActionContext} object when initializing.
* This {@link javax.servlet.ServletContextListener} keeps a reference to the
* {@link javax.servlet.ServletContext} and exposes it through a <code>public static</code>
* method.
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/DirectRenderFromEventAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/DirectRenderFromEventAction.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/DirectRenderFromEventAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/DirectRenderFromEventAction.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.portlet.dispatcher;
+package org.apache.struts.webwork.portlet.dispatcher;
import com.opensymphony.xwork.ActionSupport;
@@ -15,7 +15,7 @@
* immediately be executed. The portlet needs to "wait" to the render phase to do the
* rendering.
*
- * When the {@link org.apache.struts.action2.portlet.result.PortletResult} detects such a
+ * When the {@link org.apache.struts.webwork.portlet.result.PortletResult} detects such a
* scenario, instead of executing the actual view, it prepares a couple of render parameters
* specifying this action and the location of the view, which then will be executed in the
* following render request.
@@ -23,7 +23,10 @@
* @author Nils-Helge Garli
*/
public class DirectRenderFromEventAction extends ActionSupport {
- private String location = null;
+
+ private static final long serialVersionUID = -1814807772308405785L;
+
+ private String location = null;
/**
* Get the location of the view.
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/Jsr168Dispatcher.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/dispatcher/Jsr168Dispatcher.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.portlet.dispatcher;
+package org.apache.struts.webwork.portlet.dispatcher;
import java.io.IOException;
import java.util.HashMap;
@@ -26,21 +26,21 @@
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.util.FileManager;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.ApplicationMap;
-import org.apache.struts.action2.dispatcher.RequestMap;
-import org.apache.struts.action2.dispatcher.SessionMap;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
-import org.apache.struts.action2.portlet.PortletActionConstants;
-import org.apache.struts.action2.portlet.PortletApplicationMap;
-import org.apache.struts.action2.portlet.PortletRequestMap;
-import org.apache.struts.action2.portlet.PortletSessionMap;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
-import org.apache.struts.action2.portlet.context.ServletContextHolderListener;
-import org.apache.struts.action2.util.AttributeMap;
-import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.dispatcher.ApplicationMap;
+import org.apache.struts.webwork.dispatcher.RequestMap;
+import org.apache.struts.webwork.dispatcher.SessionMap;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
+import org.apache.struts.webwork.portlet.PortletApplicationMap;
+import org.apache.struts.webwork.portlet.PortletRequestMap;
+import org.apache.struts.webwork.portlet.PortletSessionMap;
+import org.apache.struts.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.webwork.portlet.context.ServletContextHolderListener;
+import org.apache.struts.webwork.util.AttributeMap;
+import org.apache.struts.webwork.util.ObjectFactoryInitializable;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
import com.opensymphony.xwork.ActionProxyFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/portlet/result/PortletResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/portlet/result/PortletResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/portlet/result/PortletResult.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.portlet.result;
+package org.apache.struts.webwork.portlet.result;
import java.io.IOException;
import java.util.StringTokenizer;
@@ -22,10 +22,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-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.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 com.opensymphony.xwork.ActionInvocation;
/**
@@ -37,7 +37,9 @@
*/
public class PortletResult extends StrutsResultSupport {
- /**
+ private static final long serialVersionUID = 434251393926178567L;
+
+ /**
* Logger instance.
*/
private static final Log LOG = LogFactory.getLog(PortletResult.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org