Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 408DF965D for ; Fri, 2 Dec 2011 11:27:22 +0000 (UTC) Received: (qmail 69511 invoked by uid 500); 2 Dec 2011 11:27:22 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 69477 invoked by uid 500); 2 Dec 2011 11:27:22 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 69470 invoked by uid 99); 2 Dec 2011 11:27:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 11:27:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 11:27:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 89A142388BA6 for ; Fri, 2 Dec 2011 11:26:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209415 [11/19] - in /struts/struts2/branches/STRUTS_3_X: apps/blank/src/main/java/example/ apps/blank/src/test/java/example/ apps/jboss-blank/src/main/java/example/ apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mai... Date: Fri, 02 Dec 2011 11:25:26 -0000 To: commits@struts.apache.org From: lukaszlenart@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202112630.89A142388BA6@eris.apache.org> Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java Fri Dec 2 11:24:48 2011 @@ -20,8 +20,8 @@ */ package org.apache.struts2.oval.interceptor; -import org.apache.struts2.xwork2.Result; -import org.apache.struts2.xwork2.ActionInvocation; +import com.opensymphony.xwork2.Result; +import com.opensymphony.xwork2.ActionInvocation; public class VoidResult implements Result { public void execute(ActionInvocation invocation) throws Exception { Modified: struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java Fri Dec 2 11:24:48 2011 @@ -35,9 +35,9 @@ import javax.servlet.http.HttpServletReq import org.apache.struts2.StrutsConstants; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java Fri Dec 2 11:24:48 2011 @@ -36,8 +36,8 @@ import javax.servlet.http.HttpSession; import org.codehaus.plexus.PlexusContainer; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Creates a plexus container for the application, session, and request Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java Fri Dec 2 11:24:48 2011 @@ -33,8 +33,8 @@ import javax.servlet.http.HttpSessionLis import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusContainer; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Manages the Plexus lifecycle for the servlet and session contexts Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java Fri Dec 2 11:24:48 2011 @@ -28,18 +28,18 @@ import javax.servlet.ServletContext; import org.codehaus.plexus.PlexusContainer; -import org.apache.struts2.xwork2.Action; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.Result; -import org.apache.struts2.xwork2.config.ConfigurationException; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.config.entities.InterceptorConfig; -import org.apache.struts2.xwork2.config.entities.ResultConfig; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.interceptor.Interceptor; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.validator.Validator; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.Result; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.InterceptorConfig; +import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.validator.Validator; /** * Plexus integartion. You need three optional files: plexus-request.xml, plexus-session.xml, and Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java Fri Dec 2 11:24:48 2011 @@ -28,8 +28,8 @@ import java.io.InputStreamReader; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.configuration.PlexusConfigurationResourceException; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Utility methods for dealing with Plexus Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml Fri Dec 2 11:24:48 2011 @@ -26,7 +26,7 @@ "http://struts.apache.org/dtds/struts-2.0.dtd"> - + Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Fri Dec 2 11:24:48 2011 @@ -30,11 +30,11 @@ import org.apache.struts2.portlet.contex import org.apache.struts2.portlet.util.PortletUrlHelper; import org.apache.struts2.portlet.util.PortletUrlHelperJSR286; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Implementation of the {@link UrlRenderer} interface that renders URLs for portlet environments. Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java Fri Dec 2 11:24:48 2011 @@ -27,8 +27,8 @@ import java.util.Set; import javax.portlet.PortletRequest; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * A simple implementation of the {@link java.util.Map} interface to handle a collection of request attributes. Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java Fri Dec 2 11:24:48 2011 @@ -29,8 +29,8 @@ import java.util.Set; import javax.portlet.PortletRequest; import javax.portlet.PortletSession; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * A simple implementation of the {@link java.util.Map} interface to handle a collection of portlet session Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java Fri Dec 2 11:24:48 2011 @@ -34,7 +34,7 @@ import javax.portlet.RenderResponse; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.mapper.ActionMapping; -import org.apache.struts2.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionContext; import static org.apache.struts2.portlet.PortletConstants.*; Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java Fri Dec 2 11:24:48 2011 @@ -20,7 +20,7 @@ */ package org.apache.struts2.portlet.dispatcher; -import org.apache.struts2.xwork2.Action; +import com.opensymphony.xwork2.Action; import java.io.Serializable; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Fri Dec 2 11:24:48 2011 @@ -77,15 +77,15 @@ import org.apache.struts2.portlet.servle import org.apache.struts2.portlet.servlet.PortletServletResponse; import org.apache.struts2.util.AttributeMap; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionProxy; -import org.apache.struts2.xwork2.ActionProxyFactory; -import org.apache.struts2.xwork2.config.ConfigurationException; -import org.apache.struts2.xwork2.inject.Container; -import org.apache.struts2.xwork2.util.FileManager; -import org.apache.struts2.xwork2.util.LocalizedTextUtil; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ActionProxyFactory; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.util.FileManager; +import com.opensymphony.xwork2.util.LocalizedTextUtil; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java Fri Dec 2 11:24:48 2011 @@ -1,8 +1,8 @@ package org.apache.struts2.portlet.dispatcher; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.portlet.servlet.PortletServletResponse; import org.apache.struts2.portlet.servlet.PortletServletResponseJSR286; Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java Fri Dec 2 11:24:48 2011 @@ -28,11 +28,11 @@ import org.apache.struts2.StrutsStatics; import org.apache.struts2.interceptor.PrincipalAware; import org.apache.struts2.portlet.PortletActionConstants; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.interceptor.AbstractInterceptor; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; public class PortletAwareInterceptor extends AbstractInterceptor implements PortletActionConstants, StrutsStatics { Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java Fri Dec 2 11:24:48 2011 @@ -36,12 +36,12 @@ import javax.portlet.RenderRequest; import org.apache.commons.lang.StringUtils; import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.interceptor.AbstractInterceptor; -import org.apache.struts2.xwork2.util.CompoundRoot; -import org.apache.struts2.xwork2.util.ValueStack; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.CompoundRoot; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; public class PortletStateInterceptor extends AbstractInterceptor { Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java Fri Dec 2 11:24:48 2011 @@ -34,9 +34,9 @@ import org.apache.struts2.dispatcher.map import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.views.util.UrlHelper; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.config.entities.ResultConfig; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.inject.Inject; /** * @@ -170,7 +170,7 @@ public class PortletActionRedirectResult } /** - * @see org.apache.struts2.xwork2.Result#execute(org.apache.struts2.xwork2.ActionInvocation) + * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation) */ public void execute(ActionInvocation invocation) throws Exception { actionName = conditionalParse(actionName, invocation); Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Fri Dec 2 11:24:48 2011 @@ -42,10 +42,10 @@ import org.apache.struts2.dispatcher.Str import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.context.PortletActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Result type that includes a JSP to render. @@ -95,7 +95,7 @@ public class PortletResult extends Strut * {@link javax.portlet.PortletRequestDispatcher}from the * {@link PortletActionContext}and includes the JSP. * - * @see org.apache.struts2.xwork2.Result#execute(org.apache.struts2.xwork2.ActionInvocation) + * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation) */ public void doExecute(String finalLocation, ActionInvocation actionInvocation) throws Exception { Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java Fri Dec 2 11:24:48 2011 @@ -42,12 +42,12 @@ import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.ValueStack; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java Fri Dec 2 11:24:48 2011 @@ -9,8 +9,8 @@ import javax.portlet.PortletResponse; import javax.portlet.ResourceResponse; import javax.servlet.ServletOutputStream; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * PortletServletResponseJSR286. Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Fri Dec 2 11:24:48 2011 @@ -41,8 +41,8 @@ import org.apache.commons.lang.StringUti import org.apache.struts2.StrutsException; import org.apache.struts2.portlet.context.PortletActionContext; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java Fri Dec 2 11:24:48 2011 @@ -7,8 +7,8 @@ import javax.portlet.BaseURL; import javax.portlet.PortletSecurityException; import java.util.Map; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * PortletUrlJSR286Helper. Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java Fri Dec 2 11:24:48 2011 @@ -26,6 +26,7 @@ import java.util.Locale; import javax.portlet.ActionResponse; import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,9 +37,9 @@ import org.apache.struts2.portlet.Portle import org.apache.struts2.portlet.context.PortletActionContext; import org.apache.struts2.views.util.ResourceUtil; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.ValueStack; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.ValueStack; import freemarker.template.Configuration; import freemarker.template.ObjectWrapper; Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java Fri Dec 2 11:24:48 2011 @@ -36,7 +36,7 @@ import org.apache.struts2.dispatcher.map import org.jmock.Mock; import org.jmock.MockObjectTestCase; -import org.apache.struts2.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** */ Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java Fri Dec 2 11:24:48 2011 @@ -20,11 +20,11 @@ */ package org.apache.struts2.portlet.dispatcher; -import org.apache.struts2.xwork2.Action; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ActionProxy; -import org.apache.struts2.xwork2.ActionProxyFactory; -import org.apache.struts2.xwork2.util.ValueStack; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ActionProxyFactory; +import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.mapper.ActionMapping; import static org.apache.struts2.portlet.PortletConstants.*; Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java Fri Dec 2 11:24:48 2011 @@ -30,8 +30,8 @@ import junit.framework.TestCase; import org.apache.struts2.portlet.PortletActionConstants; import org.easymock.EasyMock; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; public class PortletAwareInterceptorTest extends TestCase implements PortletActionConstants { Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java Fri Dec 2 11:24:48 2011 @@ -31,10 +31,10 @@ import org.apache.struts2.dispatcher.Def import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction; import org.easymock.EasyMock; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.util.ValueStack; -import org.apache.struts2.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; import static org.apache.struts2.portlet.PortletConstants.*; Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java Fri Dec 2 11:24:48 2011 @@ -21,7 +21,7 @@ package org.apache.struts2.portlet.result; import static org.apache.struts2.portlet.PortletConstants.*; -import static org.apache.struts2.xwork2.ActionContext.*; +import static com.opensymphony.xwork2.ActionContext.*; import java.util.HashMap; import java.util.Map; @@ -41,8 +41,8 @@ import org.jmock.Mock; import org.jmock.cglib.MockObjectTestCase; import org.jmock.core.Constraint; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; /** * PortletResultTest. Insert description. Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java Fri Dec 2 11:24:48 2011 @@ -40,7 +40,7 @@ import junit.framework.TestCase; import org.easymock.EasyMock; -import org.apache.struts2.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** */ Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Fri Dec 2 11:24:48 2011 @@ -35,18 +35,20 @@ import junit.textui.TestRunner; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.util.PortletUrlHelper; - +import org.apache.struts2.StrutsStatics; import static org.apache.struts2.StrutsStatics.*; import org.jmock.Mock; import org.jmock.cglib.MockObjectTestCase; import org.jmock.core.Constraint; import com.mockobjects.servlet.MockJspWriter; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ActionProxy; -import org.apache.struts2.xwork2.util.ValueStack; -import org.apache.struts2.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import static com.opensymphony.xwork2.ActionContext.SESSION; +import static com.opensymphony.xwork2.ActionContext.PARAMETERS; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; /** */ Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java Fri Dec 2 11:24:48 2011 @@ -26,7 +26,7 @@ import org.apache.struts2.rest.handler.C import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts2.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.ActionConfig; import java.io.IOException; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java Fri Dec 2 11:24:48 2011 @@ -21,10 +21,10 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ModelDriven; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ModelDriven; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.interceptor.Interceptor; import org.apache.struts2.ServletActionContext; import org.apache.struts2.rest.handler.ContentTypeHandler; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java Fri Dec 2 11:24:48 2011 @@ -21,6 +21,9 @@ package org.apache.struts2.rest; +import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; +import static javax.servlet.http.HttpServletResponse.SC_OK; + import java.io.IOException; import java.io.StringWriter; import java.util.HashMap; @@ -33,9 +36,10 @@ import javax.servlet.http.HttpServletRes import org.apache.struts2.ServletActionContext; import org.apache.struts2.rest.handler.ContentTypeHandler; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.inject.Container; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.ModelDriven; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Inject; /** * Manages {@link ContentTypeHandler} instances and uses them to Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java Fri Dec 2 11:24:48 2011 @@ -21,19 +21,19 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.Action; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.DefaultActionInvocation; -import org.apache.struts2.xwork2.ModelDriven; -import org.apache.struts2.xwork2.Result; -import org.apache.struts2.xwork2.ValidationAware; -import org.apache.struts2.xwork2.config.ConfigurationException; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.config.entities.ResultConfig; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.util.profiling.UtilTimerStack; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.DefaultActionInvocation; +import com.opensymphony.xwork2.ModelDriven; +import com.opensymphony.xwork2.Result; +import com.opensymphony.xwork2.ValidationAware; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.profiling.UtilTimerStack; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.HttpHeaderResult; import org.apache.struts2.rest.handler.ContentTypeHandler; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java Fri Dec 2 11:24:48 2011 @@ -21,12 +21,12 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.config.Configuration; -import org.apache.struts2.xwork2.config.ConfigurationManager; -import org.apache.struts2.xwork2.config.entities.PackageConfig; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.config.entities.PackageConfig; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java Fri Dec 2 11:24:48 2011 @@ -21,10 +21,10 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ActionProxy; -import org.apache.struts2.xwork2.DefaultActionProxyFactory; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.DefaultActionProxyFactory; +import com.opensymphony.xwork2.inject.Inject; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java Fri Dec 2 11:24:48 2011 @@ -28,11 +28,11 @@ import javax.servlet.http.HttpServletRes import org.apache.struts2.ServletActionContext; -import org.apache.struts2.xwork2.ActionSupport; +import com.opensymphony.xwork2.ActionSupport; /** * Extends {@link ActionSupport} to provides a default implementation of the index method that can be invoked for - * unknown actions by the {@link org.apache.struts2.xwork2.UnknownHandler}. + * unknown actions by the {@link com.opensymphony.xwork2.UnknownHandler}. */ public class RestActionSupport extends ActionSupport { Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java Fri Dec 2 11:24:48 2011 @@ -21,14 +21,14 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.Action; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ValidationAware; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.interceptor.MethodFilterInterceptor; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ValidationAware; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.mapper.ActionMapping; @@ -42,7 +42,7 @@ import java.util.Map; * An interceptor that makes sure there are not validation errors before allowing the interceptor chain to continue. * This interceptor does not perform any validation. * - *

Copied from the {@link org.apache.struts2.xwork2.interceptor.DefaultWorkflowInterceptor}, this interceptor adds support for error handling of Restful + *

Copied from the {@link com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor}, this interceptor adds support for error handling of Restful * operations. For example, if an validation error is discovered, a map of errors is created and processed to be * returned, using the appropriate content handler for rendering the body.

* Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java Fri Dec 2 11:24:48 2011 @@ -21,7 +21,7 @@ package org.apache.struts2.rest.handler; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.inject.Inject; import org.apache.struts2.StrutsConstants; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectReader; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java Fri Dec 2 11:24:48 2011 @@ -32,7 +32,7 @@ import net.sf.json.JsonConfig; import org.apache.struts2.StrutsConstants; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.inject.Inject; /** * Handles JSON content using json-lib Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/resources/struts-plugin.xml?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/resources/struts-plugin.xml Fri Dec 2 11:24:48 2011 @@ -27,7 +27,7 @@ - + Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java Fri Dec 2 11:24:48 2011 @@ -23,9 +23,9 @@ package org.apache.struts2.rest; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.inject.Container; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.inject.Container; import junit.framework.TestCase; import org.apache.struts2.ServletActionContext; import org.apache.struts2.rest.handler.ContentTypeHandler; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java Fri Dec 2 11:24:48 2011 @@ -1,16 +1,16 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.DefaultUnknownHandlerManager; -import org.apache.struts2.xwork2.ModelDriven; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.config.ConfigurationException; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.config.entities.InterceptorMapping; -import org.apache.struts2.xwork2.config.entities.ResultConfig; -import org.apache.struts2.xwork2.mock.MockActionProxy; -import org.apache.struts2.xwork2.mock.MockInterceptor; -import org.apache.struts2.xwork2.util.XWorkTestCaseHelper; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.DefaultUnknownHandlerManager; +import com.opensymphony.xwork2.ModelDriven; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.InterceptorMapping; +import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.mock.MockActionProxy; +import com.opensymphony.xwork2.mock.MockInterceptor; +import com.opensymphony.xwork2.util.XWorkTestCaseHelper; import junit.framework.TestCase; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.HttpHeaderResult; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java Fri Dec 2 11:24:48 2011 @@ -21,10 +21,10 @@ package org.apache.struts2.rest; -import org.apache.struts2.xwork2.config.Configuration; -import org.apache.struts2.xwork2.config.ConfigurationManager; -import org.apache.struts2.xwork2.config.entities.PackageConfig; -import org.apache.struts2.xwork2.config.impl.DefaultConfiguration; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.config.entities.PackageConfig; +import com.opensymphony.xwork2.config.impl.DefaultConfiguration; import junit.framework.TestCase; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.springframework.mock.web.MockHttpServletRequest; Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestWorkflowInterceptorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestWorkflowInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestWorkflowInterceptorTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/test/java/org/apache/struts2/rest/RestWorkflowInterceptorTest.java Fri Dec 2 11:24:48 2011 @@ -22,10 +22,10 @@ package org.apache.struts2.rest; import com.mockobjects.dynamic.AnyConstraintMatcher; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ActionProxy; -import org.apache.struts2.xwork2.ActionSupport; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ActionSupport; import junit.framework.TestCase; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.mapper.ActionMapping; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java Fri Dec 2 11:24:48 2011 @@ -21,8 +21,8 @@ package org.apache.struts2.sitegraph; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.StrutsException; import org.apache.struts2.sitegraph.renderers.DOTRenderer; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java Fri Dec 2 11:24:48 2011 @@ -21,12 +21,12 @@ package org.apache.struts2.sitegraph; -import org.apache.struts2.xwork2.config.ConfigurationManager; -import org.apache.struts2.xwork2.config.ConfigurationProvider; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.config.entities.ResultConfig; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.config.ConfigurationProvider; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.config.BeanSelectionProvider; import org.apache.struts2.config.DefaultPropertiesProvider; import org.apache.struts2.config.LegacyPropertiesConfigurationProvider; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java Fri Dec 2 11:24:48 2011 @@ -21,8 +21,8 @@ package org.apache.struts2.sitegraph.entities; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.sitegraph.model.Link; import java.io.*; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java Fri Dec 2 11:24:48 2011 @@ -21,9 +21,9 @@ package org.apache.struts2.sitegraph.renderers; -import org.apache.struts2.xwork2.ActionChainResult; -import org.apache.struts2.xwork2.config.entities.ActionConfig; -import org.apache.struts2.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.ActionChainResult; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.ResultConfig; import org.apache.struts2.sitegraph.StrutsConfigRetriever; import org.apache.struts2.sitegraph.entities.Target; import org.apache.struts2.sitegraph.entities.View; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java Fri Dec 2 11:24:48 2011 @@ -21,7 +21,7 @@ package org.apache.struts2.sitegraph; -import org.apache.struts2.xwork2.util.ClassLoaderUtil; +import com.opensymphony.xwork2.util.ClassLoaderUtil; import org.apache.struts2.StrutsTestCase; import java.io.File; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml Fri Dec 2 11:24:48 2011 @@ -26,7 +26,7 @@ - + hello.jsp /tutorial/test.action /tutorial/test.action @@ -39,7 +39,7 @@ class="org.apache.struts2.views.freemarker.FreemarkerResult"/> - + sitegraph/guess-input.ftl @@ -50,7 +50,7 @@ class="org.apache.struts2.views.freemarker.FreemarkerResult"/> - + guess-success.jsp guess-input.ftl guess-error.ftl Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java Fri Dec 2 11:24:48 2011 @@ -22,8 +22,8 @@ package org.apache.struts2.sitemesh; import com.opensymphony.module.sitemesh.HTMLPage; import com.opensymphony.module.sitemesh.RequestConstants; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import freemarker.core.InvalidReferenceException; import freemarker.template.Configuration; import freemarker.template.ObjectWrapper; @@ -57,7 +57,7 @@ import java.util.Locale; * own manager

*/ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.FreemarkerServlet { - private static final org.apache.struts2.xwork2.util.logging.Logger LOG = LoggerFactory.getLogger(FreemarkerDecoratorServlet.class); + private static final com.opensymphony.xwork2.util.logging.Logger LOG = LoggerFactory.getLogger(FreemarkerDecoratorServlet.class); protected FreemarkerManager freemarkerManager; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java Fri Dec 2 11:24:48 2011 @@ -26,7 +26,7 @@ import com.opensymphony.module.sitemesh. import com.opensymphony.sitemesh.DecoratorSelector; import com.opensymphony.sitemesh.webapp.SiteMeshFilter; import com.opensymphony.sitemesh.webapp.SiteMeshWebAppContext; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.inject.Inject; import org.apache.struts2.views.freemarker.FreemarkerManager; import javax.servlet.FilterConfig; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java Fri Dec 2 11:24:48 2011 @@ -25,10 +25,10 @@ import com.opensymphony.module.sitemesh. import com.opensymphony.sitemesh.Content; import com.opensymphony.sitemesh.webapp.SiteMeshWebAppContext; import com.opensymphony.sitemesh.webapp.decorator.BaseWebAppDecorator; -import org.apache.struts2.xwork2.*; -import org.apache.struts2.xwork2.interceptor.PreResultListener; -import org.apache.struts2.xwork2.util.ValueStack; -import org.apache.struts2.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.*; +import com.opensymphony.xwork2.interceptor.PreResultListener; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; import freemarker.template.Configuration; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.Dispatcher; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java Fri Dec 2 11:24:48 2011 @@ -25,10 +25,10 @@ package org.apache.struts2.sitemesh; import com.opensymphony.module.sitemesh.HTMLPage; import com.opensymphony.sitemesh.Content; import com.opensymphony.sitemesh.compatability.Content2HTMLPage; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.util.profiling.UtilTimerStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.profiling.UtilTimerStack; import freemarker.template.Configuration; import freemarker.template.SimpleHash; import freemarker.template.Template; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java Fri Dec 2 11:24:48 2011 @@ -27,10 +27,10 @@ package org.apache.struts2.sitemesh; import com.opensymphony.module.sitemesh.HTMLPage; import com.opensymphony.sitemesh.Content; import com.opensymphony.sitemesh.compatability.Content2HTMLPage; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.views.velocity.VelocityManager; import org.apache.velocity.context.Context; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java Fri Dec 2 11:24:48 2011 @@ -27,7 +27,7 @@ package org.apache.struts2.sitemesh; import com.opensymphony.module.sitemesh.*; import com.opensymphony.module.sitemesh.util.OutputConverter; -import org.apache.struts2.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.Dispatcher; Modified: struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java Fri Dec 2 11:24:48 2011 @@ -25,7 +25,7 @@ import com.opensymphony.sitemesh.webapp. import com.opensymphony.sitemesh.DecoratorSelector; import com.opensymphony.module.sitemesh.Factory; import com.opensymphony.module.sitemesh.Config; -import org.apache.struts2.xwork2.inject.Inject; +import com.opensymphony.xwork2.inject.Inject; import javax.servlet.*; Modified: struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java Fri Dec 2 11:24:48 2011 @@ -20,11 +20,11 @@ */ package org.apache.struts2.spring; -import org.apache.struts2.xwork2.util.classloader.FileResourceStore; -import org.apache.struts2.xwork2.util.classloader.JarResourceStore; -import org.apache.struts2.xwork2.util.classloader.ReloadingClassLoader; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.classloader.FileResourceStore; +import com.opensymphony.xwork2.util.classloader.JarResourceStore; +import com.opensymphony.xwork2.util.classloader.ReloadingClassLoader; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.commons.jci.monitor.FilesystemAlterationListener; import org.apache.commons.jci.monitor.FilesystemAlterationMonitor; import org.apache.commons.jci.monitor.FilesystemAlterationObserver; Modified: struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java Fri Dec 2 11:24:48 2011 @@ -21,11 +21,11 @@ package org.apache.struts2.spring; -import org.apache.struts2.xwork2.inject.Container; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.spring.SpringObjectFactory; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.spring.SpringObjectFactory; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.StrutsConstants; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; Modified: struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/resources/struts-plugin.xml?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/spring/src/main/resources/struts-plugin.xml Fri Dec 2 11:24:48 2011 @@ -26,7 +26,7 @@ "http://struts.apache.org/dtds/struts-2.0.dtd"> - + @@ -37,7 +37,7 @@ - + Modified: struts/struts2/branches/STRUTS_3_X/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java Fri Dec 2 11:24:48 2011 @@ -24,6 +24,7 @@ package org.apache.struts2.spring; import javax.servlet.ServletContext; import junit.framework.TestCase; +import org.apache.struts2.StrutsConstants; import org.easymock.EasyMock; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.mock.web.MockServletContext; @@ -31,7 +32,7 @@ import org.springframework.web.context.C import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.XmlWebApplicationContext; -import org.apache.struts2.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Container; /** * Unit test for {@link StrutsSpringObjectFactory}. Modified: struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java Fri Dec 2 11:24:48 2011 @@ -26,12 +26,13 @@ import javax.servlet.http.HttpServletReq import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts2.ServletActionContext; +import org.apache.struts2.dispatcher.Dispatcher; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.config.Configuration; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.interceptor.AbstractInterceptor; -import org.apache.struts2.xwork2.interceptor.ScopedModelDriven; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.interceptor.ScopedModelDriven; /** * Calls the reset() method on the ActionForm, if it exists. Modified: struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java Fri Dec 2 11:24:48 2011 @@ -43,15 +43,15 @@ import org.apache.struts2.ServletActionC import org.apache.struts2.StrutsException; import org.xml.sax.SAXException; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.TextProvider; -import org.apache.struts2.xwork2.config.Configuration; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.interceptor.AbstractInterceptor; -import org.apache.struts2.xwork2.interceptor.ScopedModelDriven; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.TextProvider; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.interceptor.ScopedModelDriven; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; /** * Calls the validate() method on the ActionForm, if it exists. The errors are handled