You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/03/24 05:13:13 UTC
svn commit: r388357 [3/7] - in
/incubator/webwork2/src/java/org/apache/struts/action2: ./ components/
components/table/ components/table/renderer/ components/template/ config/
config_browser/ dispatcher/ dispatcher/mapper/ dispatcher/multipart/
interce...
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java Thu Mar 23 20:12:49 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import org.apache.commons.logging.Log;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/SessionMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/SessionMap.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/SessionMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/SessionMap.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StreamResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StreamResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StreamResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StreamResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.opensymphony.xwork.ActionInvocation;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java Thu Mar 23 20:12:49 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.JspSupportServlet;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.JspSupportServlet;
+import org.apache.struts.action2.views.velocity.VelocityManager;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java Thu Mar 23 20:12:49 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
-import com.opensymphony.webwork.WebWorkStatics;
+import org.apache.struts.action2.WebWorkStatics;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
import com.opensymphony.xwork.util.TextParseUtil;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.WebWorkConstants;
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/action2/dispatcher/mapper/ActionMapping.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
import com.opensymphony.xwork.Result;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java Thu Mar 23 20:12:49 2006
@@ -1,10 +1,10 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.ServletRedirectResult;
-import com.opensymphony.webwork.util.PrefixTrie;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.ServletRedirectResult;
+import org.apache.struts.action2.util.PrefixTrie;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java Thu Mar 23 20:12:49 2006
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.webwork.RequestUtils;
+import org.apache.struts.action2.RequestUtils;
import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
import com.oreilly.servlet.MultipartRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
import org.apache.commons.fileupload.*;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java Thu Mar 23 20:12:49 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.WebWorkRequestWrapper;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.util.ClassLoaderUtils;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.WebWorkRequestWrapper;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.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>webwork.multipart.parser</tt> setting. It should be set to a class which
- * extends {@link com.opensymphony.webwork.dispatcher.multipart.MultiPartRequest}. <p>
+ * extends {@link org.apache.struts.action2.dispatcher.multipart.MultiPartRequest}. <p>
* <p/>
* Webwork ships with three implementations,
- * {@link com.opensymphony.webwork.dispatcher.multipart.PellMultiPartRequest}, and
- * {@link com.opensymphony.webwork.dispatcher.multipart.CosMultiPartRequest} and
- * {@link com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest}. The Jakarta implementation
+ * {@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
* is the default. The <tt>webwork.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 webwork.multipart.parser not set." +
- " Using com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest");
- parser = "com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest";
+ " Using org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest");
+ parser = "org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest";
}
// legacy support for old style property values
else if (parser.equals("pell")) {
- parser = "com.opensymphony.webwork.dispatcher.multipart.PellMultiPartRequest";
+ parser = "org.apache.struts.action2.dispatcher.multipart.PellMultiPartRequest";
} else if (parser.equals("cos")) {
- parser = "com.opensymphony.webwork.dispatcher.multipart.CosMultiPartRequest";
+ parser = "org.apache.struts.action2.dispatcher.multipart.CosMultiPartRequest";
} else if (parser.equals("jakarta")) {
- parser = "com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest";
+ parser = "org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest";
}
try {
- Class baseClazz = com.opensymphony.webwork.dispatcher.multipart.MultiPartRequest.class;
+ Class baseClazz = org.apache.struts.action2.dispatcher.multipart.MultiPartRequest.class;
Class clazz = ClassLoaderUtils.loadClass(parser, MultiPartRequestWrapper.class);
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.WebWorkConstants;
import http.utils.multipartrequest.ServletMultipartRequest;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import java.util.Map;
@@ -14,7 +14,7 @@
* <p/>
* Typical uses are configuration objects and caches.
*
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
*/
public interface ApplicationAware {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.ActionInvocation;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.AroundInterceptor;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
@@ -188,7 +188,7 @@
"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, "com.opensymphony.webwork.views.freemarker.FreemarkerResult",
+ ResultConfig rc = new ResultConfig(WAIT, "org.apache.struts.action2.views.freemarker.FreemarkerResult",
Collections.singletonMap("location", "com/opensymphony/webwork/interceptor/wait.ftl"));
results.put(WAIT, rc);
}
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/NoParameters.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/NoParameters.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/NoParameters.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/NoParameters.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ParameterAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ParameterAware.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ParameterAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ParameterAware.java Thu Mar 23 20:12:49 2006
@@ -8,7 +8,7 @@
* Distributable under Apache license.
* See terms of license at opensource.org
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import java.util.Map;
@@ -23,7 +23,7 @@
* Note that all parameter values for a given name will be returned, so the type of the objects in
* the map is <tt>java.lang.String[]</tt>.
*
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
*/
public interface ParameterAware {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
/**
* Actions that want access to the Principal information from HttpServletRequest object
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.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 com.opensymphony.webwork.dispatcher.SessionMap;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts.action2.ServletActionContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.util.ServletContextAware;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.util.ServletContextAware;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.AroundInterceptor;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import javax.servlet.http.HttpServletRequest;
@@ -15,7 +15,7 @@
* Note that using this interface makes the Action tied to a servlet environment, so it should be
* avoided if possible since things like unit testing will become more difficult.
*
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
*/
public interface ServletRequestAware {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import javax.servlet.http.HttpServletResponse;
@@ -15,7 +15,7 @@
* Note that using this interface makes the Action tied to a servlet environment, so it should be
* avoided if possible since things like unit testing will become more difficult.
*
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
*/
public interface ServletResponseAware {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/SessionAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/SessionAware.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/SessionAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/SessionAware.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import java.util.Map;
@@ -15,7 +15,7 @@
* Note that using this interface makes the Action tied to a servlet environment, so it should be
* avoided if possible since things like unit testing will become more difficult.
*
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
*/
public interface SessionAware {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import java.util.Map;
-import com.opensymphony.webwork.util.TokenHelper;
+import org.apache.struts.action2.util.TokenHelper;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ValidationAware;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.util.InvocationSessionStore;
-import com.opensymphony.webwork.util.TokenHelper;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.util.InvocationSessionStore;
+import org.apache.struts.action2.util.TokenHelper;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.ConversionErrorInterceptor;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
import com.opensymphony.xwork.interceptor.component.ComponentManager;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
@@ -12,7 +12,7 @@
* @author Patrick Lightbody
* @see ApplicationLifecycleListener
* @see SessionLifecycleListener
- * @see com.opensymphony.webwork.dispatcher.FilterDispatcher
+ * @see org.apache.struts.action2.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/action2/lifecycle/SessionLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
import com.opensymphony.xwork.interceptor.component.ComponentManager;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java Thu Mar 23 20:12:49 2006
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
-import com.opensymphony.webwork.config.ServletContextSingleton;
+import org.apache.struts.action2.config.ServletContextSingleton;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java Thu Mar 23 20:12:49 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java Thu Mar 23 20:12:49 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java Thu Mar 23 20:12:49 2006
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
-import com.opensymphony.webwork.dispatcher.FilterDispatcher;
+import org.apache.struts.action2.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/action2/pico/PicoObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java Thu Mar 23 20:12:49 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
import com.opensymphony.xwork.ObjectFactory;
import com.opensymphony.xwork.Result;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java Thu Mar 23 20:12:49 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
import com.opensymphony.xwork.ObjectFactory;
import org.picocontainer.defaults.ObjectReference;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java Thu Mar 23 20:12:49 2006
@@ -6,7 +6,7 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java Thu Mar 23 20:12:49 2006
@@ -6,9 +6,9 @@
* the LICENSE.txt file. *
* *
*****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
-import com.opensymphony.webwork.dispatcher.ServletDispatcher;
+import org.apache.struts.action2.dispatcher.ServletDispatcher;
import com.opensymphony.xwork.ActionProxyFactory;
import org.nanocontainer.nanowar.ServletRequestContainerLauncher;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusFilter.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusFilter.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java Thu Mar 23 20:12:49 2006
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.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>com.opensymphony.webwork.plexus.PlexusFilter</filter-class>\n" +
+ " <filter-class>org.apache.struts.action2.plexus.PlexusFilter</filter-class>\n" +
" </filter>\n" +
"\n" +
"...\n" +
@@ -65,7 +65,7 @@
"...\n" +
"\n" +
" <listener>\n" +
- " <listener-class>com.opensymphony.webwork.plexus.PlexusLifecycleListener</listener-class>\n" +
+ " <listener-class>org.apache.struts.action2.plexus.PlexusLifecycleListener</listener-class>\n" +
" </listener>";
log.fatal(message);
return;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
import org.codehaus.plexus.PlexusContainer;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusUtils.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusUtils.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
/**
* Interface defining some constants used in the WebWork2 portlet implementation
@@ -74,19 +74,19 @@
/**
* Key for the portlet namespace stored in the
- * {@link com.opensymphony.webwork.portlet.context.PortletActionContext}.
+ * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
*/
String PORTLET_NAMESPACE = "webwork.portlet.portletNamespace";
/**
* Key for the mode-to-namespace map stored in the
- * {@link com.opensymphony.webwork.portlet.context.PortletActionContext}.
+ * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
*/
String MODE_NAMESPACE_MAP = "webwork.portlet.modeNamespaceMap";
/**
* Key for the default action name for the portlet, stored in the
- * {@link com.opensymphony.webwork.portlet.context.PortletActionContext}.
+ * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
*/
String DEFAULT_ACTION_FOR_MODE = "webwork.portlet.defaultActionForMode";
}
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
import java.io.Serializable;
import java.util.AbstractMap;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
import java.util.AbstractMap;
import java.util.Enumeration;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
import java.util.AbstractMap;
import java.util.Enumeration;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
import java.util.Map;
@@ -14,7 +14,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
import java.io.IOException;
@@ -15,14 +15,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.webwork.WebWorkStatics;
+import org.apache.struts.action2.WebWorkStatics;
import com.opensymphony.xwork.ActionContext;
/**
* Since a portlet is not dispatched the same way as a servlet, the
- * {@link com.opensymphony.webwork.ServletActionContext} is not immediately available, as it
+ * {@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 com.opensymphony.webwork.ServletActionContext}, and this servlet
+ * to the objects in the {@link org.apache.struts.action2.ServletActionContext}, and this servlet
* makes sure that these are available when the portlet actions are executing the render results.
*
* @author Nils-Helge Garli
@@ -32,7 +32,7 @@
private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
/**
- * Prepares the {@link com.opensymphony.webwork.ServletActionContext} with the
+ * Prepares the {@link org.apache.struts.action2.ServletActionContext} with the
* {@link ServletContext}, {@link HttpServletRequest} and {@link HttpServletResponse}.
*/
public void service(HttpServletRequest servletRequest,
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.context;
+package org.apache.struts.action2.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 com.opensymphony.webwork.ServletActionContext} object when initializing.
+ * the {@link org.apache.struts.action2.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/action2/portlet/dispatcher/DirectRenderFromEventAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.dispatcher;
+package org.apache.struts.action2.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 com.opensymphony.webwork.portlet.result.PortletResult} detects such a
+ * When the {@link org.apache.struts.action2.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.
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.dispatcher;
+package org.apache.struts.action2.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 com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.ApplicationMap;
-import com.opensymphony.webwork.dispatcher.RequestMap;
-import com.opensymphony.webwork.dispatcher.SessionMap;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.PortletApplicationMap;
-import com.opensymphony.webwork.portlet.PortletRequestMap;
-import com.opensymphony.webwork.portlet.PortletSessionMap;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.portlet.context.ServletContextHolderListener;
-import com.opensymphony.webwork.util.AttributeMap;
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.WebWorkConstants;
+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 com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
import com.opensymphony.xwork.ActionProxyFactory;
@@ -197,11 +197,11 @@
if (className.equals("spring")) {
// note: this class name needs to be in string form so we don't put hard
// dependencies on spring, since it isn't technically required.
- className = "com.opensymphony.webwork.spring.WebWorkSpringObjectFactory";
+ className = "org.apache.struts.action2.spring.WebWorkSpringObjectFactory";
} else if (className.equals("plexus")) {
// note: this class name needs to be in string form so we don't put hard
// dependencies on spring, since it isn't technically required.
- className = "com.opensymphony.webwork.plexus.PlexusObjectFactory";
+ className = "org.apache.struts.action2.plexus.PlexusObjectFactory";
}
try {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletResult.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.result;
+package org.apache.struts.action2.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 com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionInvocation;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java Thu Mar 23 20:12:49 2006
@@ -2,16 +2,16 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.portlet.result;
+package org.apache.struts.action2.portlet.result;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.views.JspSupportServlet;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.views.JspSupportServlet;
+import org.apache.struts.action2.views.velocity.VelocityManager;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.portlet.util;
+package org.apache.struts.action2.portlet.util;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -19,8 +19,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.xwork.util.TextParseUtil;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Configuration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Configuration.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Configuration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Configuration.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
import com.thoughtworks.xstream.XStream;
import org.apache.commons.collections.MultiHashMap;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/JettyServer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/JettyServer.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/JettyServer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/JettyServer.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
import org.mortbay.http.SocketListener;
import org.mortbay.jetty.Server;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Mapping.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Mapping.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Mapping.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/Mapping.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
/**
* Used for mapping configuration for the QuickStart application.
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
import java.net.URLClassLoader;
import java.net.URL;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
import org.mortbay.util.Resource;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java Thu Mar 23 20:12:49 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.Resource;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/quickstart/QuickStart.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/quickstart/QuickStart.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/quickstart/QuickStart.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/quickstart/QuickStart.java Thu Mar 23 20:12:49 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
-import com.opensymphony.webwork.util.classloader.CompilingClassLoader;
+import org.apache.struts.action2.util.classloader.CompilingClassLoader;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -134,7 +134,7 @@
URLClassLoader url = new MyURLClassLoader(parent);
Thread.currentThread().setContextClassLoader(url);
- Class clazz = url.loadClass("com.opensymphony.webwork.quickstart.JettyServer");
+ Class clazz = url.loadClass("org.apache.struts.action2.quickstart.JettyServer");
Method method = clazz.getDeclaredMethod("startServer",
new Class[]{int.class, String.class, List.class, Map.class, String.class});
method.invoke(null, new Object[]{c.port, c.getContext(), c.getPathPriority(), c.getMappings(), c.getResolver()});
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java Thu Mar 23 20:12:49 2006
@@ -1,9 +1,9 @@
/*
* Created on Aug 12, 2004 by mgreer
*/
-package com.opensymphony.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
-import com.opensymphony.webwork.sitegraph.renderers.DOTRenderer;
+import org.apache.struts.action2.sitegraph.renderers.DOTRenderer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java Thu Mar 23 20:12:49 2006
@@ -1,13 +1,13 @@
/*
* Created on Aug 14, 2004 by mgreer
*/
-package com.opensymphony.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
-import com.opensymphony.webwork.sitegraph.collectors.ArbitraryXMLConfigurationProvider;
-import com.opensymphony.webwork.sitegraph.entities.FreeMarkerView;
-import com.opensymphony.webwork.sitegraph.entities.JspView;
-import com.opensymphony.webwork.sitegraph.entities.VelocityView;
-import com.opensymphony.webwork.sitegraph.entities.View;
+import org.apache.struts.action2.sitegraph.collectors.ArbitraryXMLConfigurationProvider;
+import org.apache.struts.action2.sitegraph.entities.FreeMarkerView;
+import org.apache.struts.action2.sitegraph.entities.JspView;
+import org.apache.struts.action2.sitegraph.entities.VelocityView;
+import org.apache.struts.action2.sitegraph.entities.View;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.config.ConfigurationProvider;
import com.opensymphony.xwork.config.entities.ActionConfig;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
/*
* Created on Aug 12, 2004 by mgreer
*/
-package com.opensymphony.webwork.sitegraph.collectors;
+package org.apache.struts.action2.sitegraph.collectors;
import com.opensymphony.util.FileManager;
import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java Thu Mar 23 20:12:49 2006
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
import com.opensymphony.util.FileUtils;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.sitegraph.model.Link;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.sitegraph.model.Link;
+import org.apache.struts.action2.WebWorkConstants;
import java.io.File;
import java.util.Set;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
import java.io.File;
import java.util.regex.Pattern;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
import java.io.File;
import java.util.regex.Pattern;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/Target.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/Target.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/Target.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/Target.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
import java.io.File;
import java.util.regex.Pattern;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/View.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/View.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/View.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/View.java Thu Mar 23 20:12:49 2006
@@ -1,7 +1,7 @@
/*
* Created on Aug 13, 2004 by mgreer
*/
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
import java.util.Set;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
/**
* User: plightbo
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Graph.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Graph.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Graph.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Graph.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
import java.io.IOException;
import java.util.*;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java?rev=388357&r1=388356&r2=388357&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java Thu Mar 23 20:12:49 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
import java.io.IOException;
import java.io.Writer;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org