struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tm...@apache.org
Subject svn commit: r391069 [4/9] - in /incubator/webwork2/src: java/org/apache/struts/action2/ java/org/apache/struts/action2/components/ java/org/apache/struts/action2/components/table/ java/org/apache/struts/action2/components/table/renderer/ java/org/apach...
Date Mon, 03 Apr 2006 15:30:10 GMT
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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import java.util.Map;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.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/interceptor/TokenInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java?rev=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import java.util.Map;
 
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.util.InvocationSessionStore;
-import org.apache.struts.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/debugging/DebuggingInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java Mon Apr  3 08:28:51 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.webwork.interceptor.debugging;
+package org.apache.struts.action2.interceptor.debugging;
 
 import java.beans.BeanInfo;
 import java.beans.Introspector;
@@ -33,8 +33,8 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.views.freemarker.FreemarkerResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.freemarker.FreemarkerResult;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -81,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.webwork.interceptor.debugging.VALUE_STACK";
+    private final static String SESSION_KEY = "org.apache.struts.action2.interceptor.debugging.VALUE_STACK";
 
     private final static String DEBUG_PARAM = "debug";
     private final static String EXPRESSION_PARAM = "expression";
@@ -132,7 +132,7 @@
 
                             FreemarkerResult result = new FreemarkerResult();
                             result.setContentType("text/html");
-                            result.setLocation("org/apache/struts/webwork/interceptor/debugging/console.ftl");
+                            result.setLocation("org/apache/struts/action2/interceptor/debugging/console.ftl");
                             result.setParse(false);
                             try {
                                 result.execute(inv);

Modified: incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.interceptor.debugging;
+package org.apache.struts.action2.interceptor.debugging;
 
 import com.thoughtworks.xstream.core.util.FastStack;
 import com.thoughtworks.xstream.core.util.QuickWriter;

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
 import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
@@ -26,7 +26,7 @@
  * @author Patrick Lightbody
  * @author Bill Lynch (docs)
  * @deprecated XWork IoC has been deprecated in favor of Spring.
- *             Please refer to the Spring-WebWork integration documentation for more info.
+ *             Please refer to the Spring-Struts integration documentation for more info.
  */
 public class ApplicationLifecycleListener implements ServletContextListener {
 

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
@@ -12,10 +12,10 @@
  * @author Patrick Lightbody
  * @see ApplicationLifecycleListener
  * @see SessionLifecycleListener
- * @see org.apache.struts.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.
+ *             Please refer to the Spring-Struts integration documentation for more info.
  */
 public class LifecycleListener extends ApplicationLifecycleListener implements HttpSessionListener {
     SessionLifecycleListener session = new SessionLifecycleListener();

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
 import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
@@ -22,7 +22,7 @@
  * @author Cameron Braid
  * @author Bill Lynch (docs)
  * @deprecated XWork IoC has been deprecated in favor of Spring.
- *             Please refer to the Spring-WebWork integration documentation for more info.
+ *             Please refer to the Spring-Struts integration documentation for more info.
  */
 public class SessionLifecycleListener implements HttpSessionListener, Serializable {
 
@@ -86,7 +86,7 @@
 
     /**
      * @deprecated XWork IoC has been deprecated in favor of Spring.
-     *             Please refer to the Spring-WebWork integration documentation for more info.
+     *             Please refer to the Spring-Struts integration documentation for more info.
      */
     class SessionComponentManager extends DefaultComponentManager implements HttpSessionBindingListener {
         public void valueBound(HttpSessionBindingEvent event) {

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
-import org.apache.struts.webwork.config.ServletContextSingleton;
+import org.apache.struts.action2.config.ServletContextSingleton;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
@@ -9,7 +9,7 @@
  * @author Scott N. Smith scottnelsonsmith@yahoo.com
  * @version $Id: SessionLifecycleListenerCompatWeblogic61.java,v 1.2 2005/09/21 03:04:53 plightbo Exp $
  * @deprecated XWork IoC has been deprecated in favor of Spring.
- *             Please refer to the Spring-WebWork integration documentation for more info.
+ *             Please refer to the Spring-Struts integration documentation for more info.
  */
 public class SessionLifecycleListenerCompatWeblogic61
         extends SessionLifecycleListener {

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.webwork.pico;
+package org.apache.struts.action2.pico;
 
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package org.apache.struts.webwork.pico;
+package org.apache.struts.action2.pico;
 
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.Result;
@@ -53,21 +53,21 @@
     }
 
     /**
-     * Webwork-2.2 / XWork-1.1 method. ExtraContext can be ignored.
+     * Struts / XWork-1.1 method. ExtraContext can be ignored.
      */
     public Object buildBean(Class clazz, Map extraContext) throws Exception {
         return buildBean(clazz);
     }
 
     /**
-     * Webwork-2.2 / XWork-1.1 method. ExtraContext can be ignored.
+     * Struts / XWork-1.1 method. ExtraContext can be ignored.
      */
     public Object buildBean(String className, Map extraContext) throws Exception {
         return buildBean(className);
     }
 
     /**
-     * Webwork-2.2 / XWork-1.1 method. Used to validate a class be loaded.
+     * Struts / XWork-1.1 method. Used to validate a class be loaded.
      * Using actionsContainerFactory for consistency with build methods.
      */
     public Class getClassInstance(String className) throws ClassNotFoundException {

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package org.apache.struts.webwork.pico;
+package org.apache.struts.action2.pico;
 
 
 /**

Modified: incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java Mon Apr  3 08:28:51 2006
@@ -6,9 +6,9 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package org.apache.struts.webwork.pico;
+package org.apache.struts.action2.pico;
 
-import org.apache.struts.webwork.dispatcher.ServletDispatcher;
+import org.apache.struts.action2.dispatcher.ServletDispatcher;
 import com.opensymphony.xwork.ActionProxyFactory;
 import org.nanocontainer.nanowar.ServletRequestContainerLauncher;
 
@@ -17,11 +17,11 @@
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Extension to the standard WebWork2 ServletDispatcher that instantiates 
+ * Extension to the standard Struts ServletDispatcher that instantiates 
  * a new container in the request scope for each request and disposes of it 
  * correctly at the end of the request.
  * <p/>
- * To use, replace the WebWork ServletDispatcher in web.xml with this.
+ * To use, replace the Struts ServletDispatcher in web.xml with this.
  *
  * @deprecated Use {@link PicoFilterDispatcher}
  * @author <a href="mailto:joe@thoughtworks.net">Joe Walnes</a>
@@ -37,7 +37,7 @@
         ServletRequestContainerLauncher containerLauncher = new ServletRequestContainerLauncher(getServletContext(), request);
         try {
             containerLauncher.startContainer();
-            // process the servlet using webwork2
+            // process the servlet using Struts
             super.service(request, response);
         } finally {
             containerLauncher.killContainer();

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.webwork.plexus;
+package org.apache.struts.action2.plexus;
 
-import org.apache.struts.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;
@@ -48,15 +48,15 @@
                     "Looks like the Plexus listener was not configured for your web app! \n" +
                     "You need to add the following to web.xml: \n" +
                     "\n" +
-                    "    <!-- this should be before the webwork filter -->\n" +
+                    "    <!-- this should be before the Struts filter -->\n" +
                     "    <filter>\n" +
                     "        <filter-name>plexus</filter-name>\n" +
-                    "        <filter-class>org.apache.struts.webwork.plexus.PlexusFilter</filter-class>\n" +
+                    "        <filter-class>org.apache.struts.action2.plexus.PlexusFilter</filter-class>\n" +
                     "    </filter>\n" +
                     "\n" +
                     "...\n" +
                     "\n" +
-                    "    <!-- this should be before the webwork filter -->\n" +
+                    "    <!-- this should be before the Struts filter -->\n" +
                     "    <filter-mapping>\n" +
                     "        <filter-name>plexus</filter-name>\n" +
                     "        <url-pattern>/*</url-pattern>\n" +
@@ -65,7 +65,7 @@
                     "...\n" +
                     "\n" +
                     "    <listener>\n" +
-                    "        <listener-class>org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.portlet;
+package org.apache.struts.action2.portlet;
 
 /**
- * Interface defining some constants used in the WebWork2 portlet implementation
+ * Interface defining some constants used in the Struts portlet implementation
  * 
  * @author <a href="mailto:nils-helge.garli@bekk.no">Nils-Helge Garli</a>
  *  
@@ -74,19 +74,19 @@
 
     /**
      * Key for the portlet namespace stored in the 
-     * {@link org.apache.struts.webwork.portlet.context.PortletActionContext}.
+     * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
      */
     String PORTLET_NAMESPACE = "struts.portlet.portletNamespace";
     
     /**
      * Key for the mode-to-namespace map stored in the 
-     * {@link org.apache.struts.webwork.portlet.context.PortletActionContext}.
+     * {@link org.apache.struts.action2.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.webwork.portlet.context.PortletActionContext}.
+     * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
      */
     String DEFAULT_ACTION_FOR_MODE = "struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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 org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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 org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.action2.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.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
@@ -34,7 +34,7 @@
 	private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
 
     /**
-     * Prepares the {@link org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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 org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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 org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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 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 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 com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.ActionProxyFactory;
@@ -51,7 +51,7 @@
 /**
  * <!-- START SNIPPET: javadoc -->
  * <p>
- * WebWork2 JSR-168 portlet dispatcher. Similar to the WW2 Servlet dispatcher,
+ * Struts JSR-168 portlet dispatcher. Similar to the WW2 Servlet dispatcher,
  * but adjusted to a portal environment. The portlet is configured through the <tt>portlet.xml</tt>
  * descriptor. Examples and descriptions follow below:
  * </p>
@@ -183,7 +183,7 @@
             portletNamespace = "";
         }
         LocalizedTextUtil
-                .addDefaultResourceBundle("org/apache/struts/action2/webwork-messages");
+                .addDefaultResourceBundle("org/apache/struts/action2/struts-messages");
 
         //check for configuration reloading
         if ("true".equalsIgnoreCase(Configuration
@@ -197,7 +197,7 @@
             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 = "org.apache.struts.action2.spring.WebWorkSpringObjectFactory";
+                className = "org.apache.struts.action2.spring.StrutsSpringObjectFactory";
             } 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.

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.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 org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
-import org.apache.struts.webwork.portlet.PortletActionConstants;
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.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 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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,16 +2,16 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.portlet.result;
+package org.apache.struts.action2.portlet.result;
 
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
-import org.apache.struts.webwork.portlet.PortletActionConstants;
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
-import org.apache.struts.webwork.views.JspSupportServlet;
-import org.apache.struts.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.StrutsResultSupport;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.views.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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 org.apache.struts.webwork.portlet.PortletActionConstants;
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
 
 /**
  * Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular
@@ -176,11 +176,11 @@
     }
 
     /**
-     * Encode an url to a non webwork action resource, like stylesheet, image or
+     * Encode an url to a non Struts action resource, like stylesheet, image or
      * servlet.
      * 
      * @param value
-     * @return encoded url to non webwork action resources.
+     * @return encoded url to non Struts action resources.
      */
     public static String buildResourceUrl(String value, Map params) {
         StringBuffer sb = new StringBuffer();

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -2,9 +2,9 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package org.apache.struts.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
-import org.apache.struts.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("org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,9 +1,9 @@
 /*
  * Created on Aug 12, 2004 by mgreer
  */
-package org.apache.struts.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
 
-import org.apache.struts.webwork.sitegraph.renderers.DOTRenderer;
+import org.apache.struts.action2.sitegraph.renderers.DOTRenderer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -12,7 +12,7 @@
 /**
  * // START SNIPPET: javadocs-intro
  * SiteGraph is a tool that renders out GraphViz-generated images depicting your
- * WebWork-powered web application's flow. SiteGraph requires GraphViz be installed
+ * Struts-powered web application's flow. SiteGraph requires GraphViz be installed
  * and that the "dot" executable be in your command path. You can find GraphViz
  * at http://www.graphviz.org.
  * // END SNIPPET: javadocs-intro

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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,13 +1,13 @@
 /*
  * Created on Aug 14, 2004 by mgreer
  */
-package org.apache.struts.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
 
-import org.apache.struts.webwork.sitegraph.collectors.ArbitraryXMLConfigurationProvider;
-import org.apache.struts.webwork.sitegraph.entities.FreeMarkerView;
-import org.apache.struts.webwork.sitegraph.entities.JspView;
-import org.apache.struts.webwork.sitegraph.entities.VelocityView;
-import org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Created on Aug 12, 2004 by mgreer
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 import com.opensymphony.util.FileUtils;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.sitegraph.model.Link;
-import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.sitegraph.model.Link;
+import org.apache.struts.action2.StrutsConstants;
 
 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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Created on Aug 13, 2004 by mgreer
  */
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.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=391069&r1=390927&r2=391069&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 Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 import java.io.Writer;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Link.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Link.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Link.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Link.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Render.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Render.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Render.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/Render.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 import java.util.ArrayList;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java Mon Apr  3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 /**
  * User: plightbo

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java Mon Apr  3 08:28:51 2006
@@ -1,14 +1,14 @@
 /*
  * Created on Aug 12, 2004 by mgreer
  */
-package org.apache.struts.webwork.sitegraph.renderers;
+package org.apache.struts.action2.sitegraph.renderers;
 
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.sitegraph.XWorkConfigRetriever;
-import org.apache.struts.webwork.sitegraph.entities.Target;
-import org.apache.struts.webwork.sitegraph.entities.View;
-import org.apache.struts.webwork.sitegraph.model.*;
-import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.sitegraph.XWorkConfigRetriever;
+import org.apache.struts.action2.sitegraph.entities.Target;
+import org.apache.struts.action2.sitegraph.entities.View;
+import org.apache.struts.action2.sitegraph.model.*;
+import org.apache.struts.action2.StrutsConstants;
 import com.opensymphony.xwork.ActionChainResult;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.config.entities.ResultConfig;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java Mon Apr  3 08:28:51 2006
@@ -3,12 +3,12 @@
  * All rights reserved.
  */
 
-package org.apache.struts.webwork.sitemesh;
+package org.apache.struts.action2.sitemesh;
 
 import com.opensymphony.module.sitemesh.Decorator;
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.HTMLPage;
-import org.apache.struts.webwork.views.freemarker.FreemarkerManager;
+import org.apache.struts.action2.views.freemarker.FreemarkerManager;
 import com.opensymphony.xwork.*;
 import freemarker.template.Configuration;
 import freemarker.template.SimpleHash;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java Mon Apr  3 08:28:51 2006
@@ -3,15 +3,15 @@
  * All rights reserved.
  */
 
-package org.apache.struts.webwork.sitemesh;
+package org.apache.struts.action2.sitemesh;
 
 import com.opensymphony.module.sitemesh.Decorator;
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.filter.PageFilter;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.dispatcher.DispatcherUtils;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
 
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.interceptor.PreResultListener;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java Mon Apr  3 08:28:51 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.webwork.sitemesh;
+package org.apache.struts.action2.sitemesh;
 
 import com.opensymphony.module.sitemesh.Decorator;
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.HTMLPage;
-import org.apache.struts.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import com.opensymphony.xwork.ActionContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java Mon Apr  3 08:28:51 2006
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.webwork.spring;
+package org.apache.struts.action2.spring;
 
-import org.apache.struts.webwork.spring.lifecycle.ApplicationContextSessionListener;
+import org.apache.struts.action2.spring.lifecycle.ApplicationContextSessionListener;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.spring.SpringProxyableObjectFactory;
 import org.apache.commons.logging.Log;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java Mon Apr  3 08:28:51 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.spring;
+package org.apache.struts.action2.spring;
 
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.util.ObjectFactoryInitializable;
-import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.StrutsConstants;
 import com.opensymphony.xwork.spring.SpringObjectFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java Mon Apr  3 08:28:51 2006
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2005 ePlus Corporation. All Rights Reserved.
  */
-package org.apache.struts.webwork.spring.interceptor;
+package org.apache.struts.action2.spring.interceptor;
 
 import com.opensymphony.xwork.interceptor.AroundInterceptor;
 import com.opensymphony.xwork.ActionInvocation;
-import org.apache.struts.webwork.spring.lifecycle.ApplicationContextSessionListener;
+import org.apache.struts.action2.spring.lifecycle.ApplicationContextSessionListener;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.webwork.spring.lifecycle;
+package org.apache.struts.action2.spring.lifecycle;
 
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -50,7 +50,7 @@
     /**
      * Key to map the session-scoped application context into the session attributes.
      */
-    public static final String APP_CONTEXT_SESSION_KEY = "org.apache.struts.webwork.spring.ApplicationContextSessionListener_APP_CONTEXT";
+    public static final String APP_CONTEXT_SESSION_KEY = "org.apache.struts.action2.spring.ApplicationContextSessionListener_APP_CONTEXT";
 
     /**
      * The default session context configuration string:"classpath:session.xml"

Modified: incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Created on Jun 14, 2004
  */
-package org.apache.struts.webwork.spring.lifecycle;
+package org.apache.struts.action2.spring.lifecycle;
 
 import com.opensymphony.xwork.config.Configuration;
 import com.opensymphony.xwork.config.ConfigurationManager;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java Mon Apr  3 08:28:51 2006
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package org.apache.struts.webwork.spring.lifecycle;
+package org.apache.struts.action2.spring.lifecycle;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -11,19 +11,19 @@
 
 /**
  * ApplicationContextListener that sets up the environment so that XWork and
- * Webwork can load data and information from Spring. Relies on Spring's
+ * Struts can load data and information from Spring. Relies on Spring's
  * {@link org.springframework.web.context.ContextLoaderListener}having been
  * called first.
  *
  * @author sms
- * @deprecated Please configure struts.property to use {@link org.apache.struts.action2.spring.WebWorkSpringObjectFactory}
+ * @deprecated Please configure struts.property to use {@link org.apache.struts.action2.spring.StrutsSpringObjectFactory}
  */
 public class SpringObjectFactoryListener implements ServletContextListener {
     private static final Log log = LogFactory.getLog(SpringObjectFactoryListener.class);
 
     public void contextInitialized(ServletContextEvent event) {
         log.fatal("SpringObjectFactoryListener is deprecated and no longer does anything - you should remove it from web.xml\n" +
-                "Please set struts.objectFactory = spring to enable Spring-WebWork integration.");
+                "Please set struts.objectFactory = spring to enable Spring-Struts integration.");
     }
 
     public void contextDestroyed(ServletContextEvent arg0) {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import com.opensymphony.xwork.Action;
 
@@ -16,8 +16,8 @@
  *
  * @author Rickard Öberg (rickard@middleware-company.com)
  * @version $Revision: 1.7 $
- * @see org.apache.struts.webwork.components.AppendIterator
- * @see org.apache.struts.webwork.views.jsp.iterator.AppendIteratorTag
+ * @see org.apache.struts.action2.components.AppendIterator
+ * @see org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag
  */
 public class AppendIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/AttributeMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/AttributeMap.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/AttributeMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/AttributeMap.java Mon Apr  3 08:28:51 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
-import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 
 import javax.servlet.jsp.PageContext;
 import java.util.Collection;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ContainUtil.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ContainUtil.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ContainUtil.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ContainUtil.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.lang.reflect.Array;
 import java.util.Collection;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/Counter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/Counter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/Counter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/Counter.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.io.Serializable;
 

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/DateFormatter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/DateFormatter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/DateFormatter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/DateFormatter.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.text.DateFormat;
 import java.text.ParseException;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/InvocationSessionStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/InvocationSessionStore.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/InvocationSessionStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/InvocationSessionStore.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
@@ -21,7 +21,7 @@
  */
 public class InvocationSessionStore {
 
-    private static final String INVOCATION_MAP_KEY = "org.apache.struts.webwork.util.InvocationSessionStore.invocationMap";
+    private static final String INVOCATION_MAP_KEY = "org.apache.struts.action2.util.InvocationSessionStore.invocationMap";
 
 
     private InvocationSessionStore() {

Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java Mon Apr  3 08:28:51 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.util.Enumeration;
 import java.util.Iterator;



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


Mime
View raw message