Author: jogep Date: Tue Mar 29 12:36:34 2011 New Revision: 1086567 URL: http://svn.apache.org/viewvc?rev=1086567&view=rev Log: Make Portlet2 Plugin compatible to current Struts2 trunk
Modified: struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/struts-plugin.xml Modified: struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml Tue Mar 29 12:36:34 2011 @@ -1,181 +1,195 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- -/* - * $Id: pom.xml 601700 2007-12-06 11:05:08Z nilsga $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ ---> + <!-- + /* * $Id: pom.xml 601700 2007-12-06 11:05:08Z nilsga $ * * Licensed to + the Apache Software Foundation (ASF) under one * or more contributor + license agreements. See the NOTICE file * distributed with this work + for additional information * regarding copyright ownership. The ASF + licenses this file * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance * with + the License. You may obtain a copy of the License at * * + http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by + applicable law or agreed to in writing, * software distributed under + the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES + OR CONDITIONS OF ANY * KIND, either express or implied. See the + License for the * specific language governing permissions and + limitations * under the License. */ + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-plugins</artifactId> - <version>2.2.0-SNAPSHOT</version> - </parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-portlet2-plugin</artifactId> - <packaging>jar</packaging> - <name>Struts 2 Portlet 2.0 Plugin</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-plugins</artifactId> + <version>2.3-SNAPSHOT</version> + </parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-portlet2-plugin</artifactId> + <packaging>jar</packaging> + <name>Struts 2 Portlet 2.0 Plugin</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ </developerConnection> - <url>http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/</url> - </scm> + <url>http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/</url> + </scm> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - <version>3.8.1</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - - <!-- Velocity --> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.5</version> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-tools</artifactId> - <version>1.3</version> - <optional>true</optional> - </dependency> - - <!-- Portlet --> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>mockobjects</groupId> - <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId> - <version>0.09</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jmock</groupId> - <artifactId>jmock</artifactId> - <version>1.0.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>jmock</groupId> - <artifactId>jmock-cglib</artifactId> - <version>1.0.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>mockobjects</groupId> - <artifactId>mockobjects-core</artifactId> - <version>0.09</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.9</version> - <scope>test</scope> - </dependency> - - <!-- Mocks for unit testing (by Spring) --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>2.0.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-portlet</artifactId> - <version>2.0.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>2.0.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>struts2-junit-plugin</artifactId> - <version>${pom.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Maven Repository (Snapshots and Test Builds)</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>exo</id> - <name>Exlolab repository</name> - <url>http://maven2.exoplatform.org/maven/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> + <dependencies> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>3.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-commons</artifactId> + <version>3.3</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + <version>4.8.2</version> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>test</scope> + </dependency> + + <!-- Velocity --> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.5</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-tools</artifactId> + <version>1.3</version> + <optional>true</optional> + </dependency> + + <!-- Portlet --> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>mockobjects</groupId> + <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId> + <version>0.09</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <version>1.2.0</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock-cglib</artifactId> + <version>1.2.0</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>mockobjects</groupId> + <artifactId>mockobjects-core</artifactId> + <version>0.09</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.9</version> + <scope>test</scope> + </dependency> + + <!-- Mocks for unit testing (by Spring) --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-mock</artifactId> + <version>2.0.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-portlet</artifactId> + <version>2.0.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>2.5.6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>struts2-junit-plugin</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Maven Repository (Snapshots and Test Builds)</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>exo</id> + <name>Exlolab repository</name> + <url>http://maven2.exoplatform.org/maven/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> - </repositories> + </repositories> </project> Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Tue Mar 29 12:36:34 2011 @@ -20,20 +20,21 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.util.logging.Logger; -import com.opensymphony.xwork2.util.logging.LoggerFactory; -import com.opensymphony.xwork2.inject.Inject; +import java.io.IOException; +import java.io.Writer; + +import org.apache.commons.lang.StringUtils; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.mapper.ActionMapper; +import org.apache.struts2.portlet.context.PortletActionContext; import org.apache.struts2.portlet.util.PortletUrlHelper; import org.apache.struts2.portlet.util.PortletUrlHelperJSR286; -import org.apache.struts2.portlet.context.PortletActionContext; -import org.apache.commons.lang.xwork.StringUtils; -import java.io.IOException; -import java.io.Writer; +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/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java Tue Mar 29 12:36:34 2011 @@ -27,9 +27,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.dispatcher.StrutsRequestWrapper; import org.apache.struts2.portlet.PortletActionConstants; -import org.apache.commons.lang.xwork.StringUtils; public class DispatcherServlet extends HttpServlet implements PortletActionConstants { Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Tue Mar 29 12:36:34 2011 @@ -21,16 +21,42 @@ package org.apache.struts2.portlet.dispatcher; -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; -import org.apache.commons.lang.xwork.StringUtils; +import static org.apache.struts2.portlet.PortletConstants.ACTION_PARAM; +import static org.apache.struts2.portlet.PortletConstants.ACTION_PHASE; +import static org.apache.struts2.portlet.PortletConstants.ACTION_RESET; +import static org.apache.struts2.portlet.PortletConstants.DEFAULT_ACTION_FOR_MODE; +import static org.apache.struts2.portlet.PortletConstants.DEFAULT_ACTION_NAME; +import static org.apache.struts2.portlet.PortletConstants.MODE_NAMESPACE_MAP; +import static org.apache.struts2.portlet.PortletConstants.MODE_PARAM; +import static org.apache.struts2.portlet.PortletConstants.PHASE; +import static org.apache.struts2.portlet.PortletConstants.PORTLET_CONFIG; +import static org.apache.struts2.portlet.PortletConstants.PORTLET_NAMESPACE; +import static org.apache.struts2.portlet.PortletConstants.RENDER_PHASE; +import static org.apache.struts2.portlet.PortletConstants.REQUEST; +import static org.apache.struts2.portlet.PortletConstants.RESPONSE; + +import java.io.IOException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletConfig; +import javax.portlet.PortletException; +import javax.portlet.PortletMode; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.WindowState; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsException; import org.apache.struts2.StrutsStatics; @@ -41,24 +67,25 @@ import org.apache.struts2.dispatcher.Ses import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; -import org.apache.struts2.portlet.*; +import org.apache.struts2.portlet.PortletActionConstants; +import org.apache.struts2.portlet.PortletApplicationMap; +import org.apache.struts2.portlet.PortletRequestMap; +import org.apache.struts2.portlet.PortletSessionMap; import org.apache.struts2.portlet.context.PortletActionContext; import org.apache.struts2.portlet.servlet.PortletServletContext; import org.apache.struts2.portlet.servlet.PortletServletRequest; import org.apache.struts2.portlet.servlet.PortletServletResponse; import org.apache.struts2.util.AttributeMap; -import javax.portlet.*; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import static org.apache.struts2.portlet.PortletConstants.*; +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; /** * <!-- START SNIPPET: javadoc --> Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java Tue Mar 29 12:36:34 2011 @@ -20,11 +20,20 @@ */ package org.apache.struts2.portlet.interceptor; +import static org.apache.struts2.portlet.PortletConstants.ACTION_PHASE; +import static org.apache.struts2.portlet.PortletConstants.EVENT_ACTION; +import static org.apache.struts2.portlet.PortletConstants.PHASE; +import static org.apache.struts2.portlet.PortletConstants.RENDER_PHASE; +import static org.apache.struts2.portlet.PortletConstants.REQUEST; +import static org.apache.struts2.portlet.PortletConstants.RESPONSE; +import static org.apache.struts2.portlet.PortletConstants.STACK_FROM_EVENT_PHASE; + import java.util.Map; import javax.portlet.ActionResponse; import javax.portlet.RenderRequest; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction; import com.opensymphony.xwork2.ActionInvocation; @@ -34,9 +43,6 @@ import com.opensymphony.xwork2.util.Valu import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; -import static org.apache.struts2.portlet.PortletConstants.*; -import org.apache.commons.lang.xwork.StringUtils; - public class PortletStateInterceptor extends AbstractInterceptor { private final static Logger LOG = LoggerFactory.getLogger(PortletStateInterceptor.class); Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Tue Mar 29 12:36:34 2011 @@ -24,17 +24,23 @@ import java.io.IOException; import java.util.Map; import java.util.StringTokenizer; -import javax.portlet.*; +import javax.portlet.PortletContext; +import javax.portlet.PortletException; +import javax.portlet.PortletMode; +import javax.portlet.PortletRequest; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletResponse; +import javax.portlet.RenderResponse; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.StrutsResultSupport; import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.context.PortletActionContext; -import org.apache.commons.lang.xwork.StringUtils; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.inject.Inject; Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Tue Mar 29 12:36:34 2011 @@ -20,7 +20,8 @@ */ package org.apache.struts2.portlet.util; -import static org.apache.struts2.portlet.PortletConstants.*; +import static org.apache.struts2.portlet.PortletConstants.ACTION_PARAM; +import static org.apache.struts2.portlet.PortletConstants.MODE_PARAM; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -29,11 +30,16 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.StringTokenizer; -import javax.portlet.*; +import javax.portlet.PortletMode; +import javax.portlet.PortletRequest; +import javax.portlet.PortletSecurityException; +import javax.portlet.PortletURL; +import javax.portlet.RenderResponse; +import javax.portlet.WindowState; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.StrutsException; import org.apache.struts2.portlet.context.PortletActionContext; -import org.apache.commons.lang.xwork.StringUtils; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/struts-plugin.xml?rev=1086567&r1=1086566&r2=1086567&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/struts-plugin.xml (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/struts-plugin.xml Tue Mar 29 12:36:34 2011 @@ -23,8 +23,8 @@ --> <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" - "http://struts.apache.org/dtds/struts-2.0.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> <struts>