Author: jogep
Date: Thu Jun 23 20:59:11 2011
New Revision: 1139070
URL: http://svn.apache.org/viewvc?rev=1139070&view=rev
Log:
WW-3620: Bring Portlet 2.0 (JSR286) plugin from sandbox to trunk
Adopt Portlet Plugin Changes to the Archetypes
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml?rev=1139070&r1=1139069&r2=1139070&view=diff
==============================================================================
---
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
Thu Jun 23 20:59:11 2011
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.6</version>
+ <version>3.0.5.RELEASE</version>
</dependency>
<!-- Database driver (change for your specific database) -->
@@ -85,9 +85,9 @@
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<scope>provided</scope>
</dependency>
@@ -117,9 +117,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
</dependency>
</dependencies>
</plugin>
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml?rev=1139070&r1=1139069&r2=1139070&view=diff
==============================================================================
---
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
Thu Jun 23 20:59:11 2011
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://java.sun.com/
<portlet-name>StrutsDBPortlet</portlet-name>
<display-name xml:lang="EN">Struts Database Portlet</display-name>
-
<portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+
<portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
<init-param>
<name>actionPackages</name>
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml?rev=1139070&r1=1139069&r2=1139070&view=diff
==============================================================================
---
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
Thu Jun 23 20:59:11 2011
@@ -37,7 +37,7 @@
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<scope>provided</scope>
</dependency>
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml?rev=1139070&r1=1139069&r2=1139070&view=diff
==============================================================================
---
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
Thu Jun 23 20:59:11 2011
@@ -12,7 +12,7 @@
<portlet-name>HelloPortlet</portlet-name>
<display-name xml:lang="EN">${artifactId}</display-name>
-
<portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+
<portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
<!-- The namespace for the actions configured for view mode -->
<init-param>
