Author: jogep
Date: Mon May 16 18:29:42 2011
New Revision: 1103822
URL: http://svn.apache.org/viewvc?rev=1103822&view=rev
Log:
Bring Portlet 2.0 (JSR286) plugin from sandbox to trunk
sync changes from trunk plugin
Modified:
struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/NOTICE.txt
Modified: struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml?rev=1103822&r1=1103821&r2=1103822&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml Mon May 16 18:29:42
2011
@@ -62,20 +62,35 @@
<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>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <!-- Velocity -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.3</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- Portlet -->
<dependency>
Modified:
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=1103822&r1=1103821&r2=1103822&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
(original)
+++
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Mon May 16 18:29:42 2011
@@ -50,7 +50,7 @@ import freemarker.template.TemplateModel
/**
*/
-public class PortletFreemarkerResult extends StrutsResultSupport {
+public class PortletFreemarkerResult extends StrutsResultSupport implements
PortletActionConstants {
private static final long serialVersionUID = -5570612389289887543L;
@@ -119,6 +119,7 @@ public class PortletFreemarkerResult ext
ActionInvocation invocation) {
ActionResponse res = PortletActionContext.getActionResponse();
// View is rendered outside an action...uh oh...
+
invocation.getInvocationContext().getSession().put(RENDER_DIRECT_LOCATION,
location);
res.setRenderParameter(PortletActionConstants.ACTION_PARAM,
"freemarkerDirect");
res.setRenderParameter("location", location);
res.setRenderParameter(PortletActionConstants.MODE_PARAM,
PortletActionContext
Modified:
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/NOTICE.txt?rev=1103822&r1=1103821&r2=1103822&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/NOTICE.txt
(original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/NOTICE.txt
Mon May 16 18:29:42 2011
@@ -1,5 +1,5 @@
Apache Struts
-Copyright 2000-2007 The Apache Software Foundation
+Copyright 2000-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
