Author: lukaszlenart
Date: Thu Nov 5 12:39:41 2009
New Revision: 833041
URL:
http://svn.apache.org/viewvc?rev=833041&view=revLog:
Updated archetype to used 2.1.8 version of Struts 2
Modified:
struts/maven/trunk/struts2-archetype-dbportlet/pom.xml
struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp
struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: struts/maven/trunk/struts2-archetype-dbportlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/pom.xml?rev=833041&r1=833040&r2=833041&view=diff==============================================================================
--- struts/maven/trunk/struts2-archetype-dbportlet/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-dbportlet/pom.xml Thu Nov 5 12:39:41 2009
@@ -9,8 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.0.9-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <version>2.1.8</version>
<name>Struts 2 Archetypes - Database Portlet</name>
<scm>
Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml?rev=833041&r1=833040&r2=833041&view=diff==============================================================================
--- struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml (original)
+++ struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml Thu Nov 5 12:39:41 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
- <id>struts2-archetype-blank</id>
+ <id>struts2-archetype-dbblank</id>
<sources>
<source>src/main/java/view/IndexAction.java</source>
<source>src/main/java/edit/IndexAction.java</source>
Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml?rev=833041&r1=833040&r2=833041&view=diff==============================================================================
--- struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml Thu Nov 5 12:39:41 2009
@@ -9,8 +9,13 @@
<name>Struts 2 Database Portlet</name>
<url>
http://www.myComp.com</url>
<description>Struts 2 Database Portlet</description>
-
+
+ <properties>
+ <struts2.version>2.1.8</struts2.version>
+ </properties>
+
<dependencies>
+
<!-- Junit -->
<dependency>
<groupId>junit</groupId>
@@ -23,25 +28,38 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>2.0.9</version>
+ <version>${struts2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-portlet-plugin</artifactId>
+ <version>${struts2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-codebehind-plugin</artifactId>
- <version>2.0.9</version>
+ <artifactId>struts2-convention-plugin</artifactId>
+ <version>${struts2.version}</version>
</dependency>
- <!-- Spring -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.0.9</version>
+ <version>${struts2.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <version>${struts2.version}</version>
+ </dependency>
+
+ <!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.0.5</version>
+ <version>2.5.6</version>
</dependency>
<!-- Database driver (change for your specific database) -->
@@ -58,18 +76,21 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
+
</dependencies>
<build>
@@ -85,7 +106,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.1</version>
+ <version>6.1.21</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=833041&r1=833040&r2=833041&view=diff==============================================================================
--- struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml (original)
+++ struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml Thu Nov 5 12:39:41 2009
@@ -1,13 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!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//EN"
+ "
http://struts.apache.org/dtds/struts-2.1.7.dtd">
<struts>
- <constant name="struts.codebehind.defaultPackage" value="struts-portlet-default" />
- <constant name="struts.codebehind.pathPrefix" value="/WEB-INF/" />
+ <constant name="struts.convention.default.parent.package" value="struts-portlet-default" />
+ <constant name="struts.convention.result.path" value="/WEB-INF/" />
<constant name="struts.devMode" value="true" />
+ <constant name="struts.convention.package.locators.basePackage" value="${package}"/>
<include file="struts-portlet-default.xml" />
+
+ <package name="${artifactId}-package" extends="struts-portlet-default" namespace="/">
+ <action name="*">
+ <result type="redirectAction">
+ <param name="actionName">index</param>
+ <param name="namespace">/view</param>
+ </result>
+ </action>
+ </package>
</struts>
Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp?rev=833041&r1=833040&r2=833041&view=diff==============================================================================
--- struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp (original)
+++ struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp Thu Nov 5 12:39:41 2009
@@ -15,6 +15,6 @@
</s:iterator>
</table>
<ul>
-<li><a href="<s:url action="index" portletMode="edit"/>">Go to edit mode and see what's there</a></li>
-<li><a href="<s:url action="index" portletMode="help"/>">Go to help mode and see what's there</a></li>
+<li><a href="<s:url action="index" portletMode="edit" namespace="/edit"/>">Go to edit mode and see what's there</a></li>
+<li><a href="<s:url action="index" portletMode="help" namespace="/help"/>">Go to help mode and see what's there</a></li>
</ul>
Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=833041&r1=833040&r2=833041&view=diff==============================================================================
--- struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Thu Nov 5 12:39:41 2009
@@ -9,13 +9,7 @@
<filter id="filterdispatcher">
<filter-name>struts</filter-name>
- <filter-class>
- org.apache.struts2.dispatcher.FilterDispatcher
- </filter-class>
- <init-param>
- <param-name>actionPackages</param-name>
- <param-value>${package}</param-value>
- </init-param>
+ <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
<filter-mapping>
@@ -24,21 +18,20 @@
</filter-mapping>
<listener>
- <listener-class>
- org.springframework.web.context.ContextLoaderListener
- </listener-class>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
- <listener-class>
- org.apache.struts2.portlet.context.ServletContextHolderListener
- </listener-class>
+ <listener-class>org.apache.struts2.portlet.context.ServletContextHolderListener</listener-class>
</listener>
<servlet id="preparator">
<servlet-name>preparator</servlet-name>
- <servlet-class>
- org.apache.struts2.portlet.context.PreparatorServlet
- </servlet-class>
+ <servlet-class>org.apache.struts2.portlet.context.PreparatorServlet</servlet-class>
</servlet>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
</web-app>
