WW-3620: Bring Portlet 2.0 (JSR286) plugin from sandbox to trunk

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1139753 13f79535-47bb-0310-9956-ffa450edef68
wdev · Jun 26, 2011 · 48c14f4 · 48c14f4
1 parent 664378b
commit 48c14f4
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 214 deletions.
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
@@ -93,8 +93,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
+            <groupId>javax.portlet</groupId>
+             <artifactId>portlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/apps/portlet/src/main/webapp/WEB-INF/portlet.xml b/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
@@ -73,7 +73,7 @@
         <portlet-name>StrutsPortlet2</portlet-name>
         <display-name xml:lang="EN">Struts Test Portlet2</display-name>
 
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
 
         <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
         <init-param>

diff --git a/apps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml
@@ -8,11 +8,8 @@
 			/WEB-INF/applicationContext*.xml
 		</param-value>
 	</context-param>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<!-- Uncomment to use the dispatcher servlet -->
-	<!--<servlet id="Struts2PortletDispatcherServlet">
-		<servlet-name>Struts2PortletDispatcherServlet</servlet-name>
-		<servlet-class>org.apache.struts2.portlet.dispatcher.DispatcherServlet</servlet-class>
-	</servlet>-->
-
 </web-app>
diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -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>

diff --git a/...type-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml b/...type-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http:
     <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>

diff --git a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -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>
 

diff --git a/...hetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml b/...hetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
@@ -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>