[maven-release-plugin] copy for tag STRUTS_2_2_0

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0@958825 13f79535-47bb-0310-9956-ffa450edef68

apps/blank/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.7</version>
+        <version>2.2.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
@@ -34,9 +34,9 @@
     <name>Blank Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/blank</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/blank</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/blank</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/blank</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/blank</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_0/apps/blank</url>
     </scm>
 
     <dependencies>

apps/mailreader/pom.xml

@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.1.7</version>
+      <version>2.2.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
@@ -34,9 +34,9 @@
     <name>Starter Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/mailreader</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/mailreader</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/mailreader</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_0/apps/mailreader</url>
     </scm>
 
     <dependencies>

apps/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.7</version>
+        <version>2.2.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -41,9 +41,9 @@
     </modules>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_0/apps</url>
     </scm>
 
      <distributionManagement>

apps/portlet/pom.xml

@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.1.7</version>
+      <version>2.2.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -34,9 +34,9 @@
     <name>Portlet Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/portlet</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/portlet</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/portlet</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_0/apps/portlet</url>
     </scm>
 
 	<profiles>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -130,6 +130,10 @@
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
 			<exclusions>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
 				<exclusion>
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>
@@ -166,14 +170,14 @@
       <artifactId>log4j</artifactId>
       <version>1.2.9</version>
     </dependency>
-		
+
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jetty</artifactId>
 			<version>6.1.4rc0</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
@@ -186,14 +190,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
-		
+
 		<dependency>
 			<groupId>com.bekk.boss</groupId>
 			<artifactId>maven-jetty-pluto-embedded</artifactId>
 			<version>1.0</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jsp-2.1</artifactId>

apps/rest-showcase/pom.xml

@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.7</version>
+        <version>2.2.0</version>
     </parent>
 
 	<groupId>org.apache.struts</groupId>
 	<artifactId>struts2-rest-showcase</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.7</version>
+	<version>2.2.0</version>
 	<name>Struts 2 Rest Showcase Example</name>
 	<description>Struts 2 Rest Showcase Example</description>
 

apps/showcase/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.7</version>
+        <version>2.2.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
@@ -34,9 +34,9 @@
     <name>Showcase Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/showcase</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/showcase</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/showcase</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/showcase</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/apps/showcase</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_0/apps/showcase</url>
     </scm>
 
 
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -133,6 +133,10 @@
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
             <exclusions>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>

apps/showcase/src/main/resources/struts.xml

@@ -19,6 +19,8 @@
     <constant name="struts.serve.static" value="true" />
     <constant name="struts.serve.static.browserCache" value="false" />
 
+    <constant name="actionPackages" value="org.apache.struts2.showcase.person"/>
+
     <include file="struts-chat.xml" />
     
     <include file="struts-interactive.xml" />

apps/showcase/src/main/webapp/WEB-INF/web.xml

@@ -20,10 +20,11 @@
         <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
     </filter>
 
-    <filter>
-        <filter-name>sitemesh</filter-name>
-        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-    </filter>
+
+   <filter>
+       <filter-name>sitemesh</filter-name>
+       <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+   </filter>
 
     <filter-mapping>
         <filter-name>struts-prepare</filter-name>
@@ -62,6 +63,10 @@
     	  org.apache.struts2.showcase.chat.ChatSessionListener
     	</listener-class>
     </listener>
+
+    <listener>
+        <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class>
+    </listener>
 	
     <!-- SNIPPET START: dwr -->
 
@@ -86,9 +91,30 @@
     	<load-on-startup>1</load-on-startup>
   	</servlet>
 
+      <!-- Sitemesh Freemarker and Velocity Decorator Servlets. Shares configuration with Struts.-->
+    <servlet>
+        <servlet-name>sitemesh-freemarker</servlet-name>
+        <servlet-class>org.apache.struts2.sitemesh.FreemarkerDecoratorServlet</servlet-class>
+        <init-param>
+            <param-name>default_encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>sitemesh-velocity</servlet-name>
+        <servlet-class>org.apache.struts2.sitemesh.VelocityDecoratorServlet</servlet-class>
+        <init-param>
+            <param-name>default_encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
 
   	<!-- JavaServer Faces Servlet Mapping, not called directly -->
-    	<servlet-mapping>
+    <servlet-mapping>
         <servlet-name>faces</servlet-name>
         <url-pattern>*.action</url-pattern>
   	</servlet-mapping>
@@ -98,6 +124,16 @@
         <url-pattern>/dwr/*</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>sitemesh-freemarker</servlet-name>
+        <url-pattern>*.ftl</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>sitemesh-velocity</servlet-name>
+        <url-pattern>*.vm</url-pattern>
+    </servlet-mapping>
+
     <!-- END SNIPPET: dwr -->
 
     <!-- SNIPPET START: example.velocity.filter.chain

archetypes/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * $Id: pom.xml 820737 2009-10-01 18:03:21Z musachy $
+ *
+ * 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-parent</artifactId>
+        <version>2.2.0</version>
+    </parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-archetypes</artifactId>
+    <packaging>pom</packaging>
+    <name>Struts 2 Maven Archetypes</name>
+
+   <scm>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes</url>
+   </scm>
+
+    <modules>
+        <module>struts2-archetype-blank</module>
+        <module>struts2-archetype-convention</module>
+        <module>struts2-archetype-dbportlet</module>
+        <module>struts2-archetype-plugin</module>
+        <module>struts2-archetype-portlet</module>
+        <module>struts2-archetype-starter</module>
+    </modules>
+
+</project>

archetypes/struts2-archetype-blank/README.txt

@@ -0,0 +1,48 @@
+INFORMATION
+===========
+- This is Struts 2's "Blank" Maven Archetype
+
+USAGE
+=====
+
+- change directory to where the web app template is to be created,
+  for example, a 'projects' directory (which you may need to create):
+  
+     cd /home/tmjee/projects
+  
+- run the following command to generate the sample web app template, assuming :-
+    - root java package -> com.myCompany.mySystem
+
+    - the webapp war name   ->  myWebApp
+
+
+  mvn archetype:create -DgroupId=com.myCompany.mySystem \
+                       -DartifactId=myWebApp \
+                       -DarchetypeGroupId=org.apache.struts \
+                       -DarchetypeArtifactId=struts2-archetype-blank \
+                       -DarchetypeVersion=2.0.9-SNAPSHOT \
+                       -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
+
+IMPORTANT:
+==========
+- The generated template uses the 'example' package, regardless of what you
+specify during mvn archetype:create.
+
+Unfortunately, the Maven Archetype plugin does not currently provide a way to
+move resource files into a package structure.
+
+- to compile, execute
+  mvn compile
+
+- to run test cases execute
+  mvn test
+
+- to clean execute
+  mvn clean
+
+- to package execute 
+  mvn package
+
+- to start it with jetty6 execute
+  mvn jetty:run
+

archetypes/struts2-archetype-blank/pom.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-archetypes</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-archetype-blank</artifactId>
+    <version>2.2.0</version>
+    <name>Struts 2 Archetypes - Blank</name>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-blank</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-blank</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-blank</url>
+    </scm>
+    
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype>
+  <id>struts2-archetype-blank</id>
+
+<!--  
+  <sources>
+    <source>src/main/java/example/ExampleSupport.java</source>
+    <source>src/main/java/example/HelloWorld.java</source>
+    <source>src/main/java/example/Login.java</source>
+  </sources>
+  
+  <resources>
+  	<resource>src/main/resources/example/Login-validation.xml</resource>
+  	<resource filtered="false">src/main/resources/example/package.properties</resource>
+  	<resource filtered="false">src/main/resources/example/package_es.properties</resource>
+  
+  	<resource>src/main/resources/example.xml</resource>
+  	<resource>src/main/resources/struts.xml</resource>
+
+    <resource>src/main/webapp/index.html</resource>
+    <resource>src/main/webapp/example/HelloWorld.jsp</resource>
+    <resource>src/main/webapp/example/Login.jsp</resource>
+    <resource>src/main/webapp/example/Menu.jsp</resource>
+    <resource>src/main/webapp/example/Missing.jsp</resource>
+    <resource>src/main/webapp/example/Register.jsp</resource>
+    <resource>src/main/webapp/example/Welcome.jsp</resource>
+    <resource>src/main/webapp/WEB-INF/web.xml</resource>
+  </resources>
+  
+  <testSources>
+    <source>src/test/java/example/ConfigTest.java</source>
+    <source>src/test/java/example/HelloWorldTest.java</source>
+    <source>src/test/java/example/LoginTest.java</source>
+  </testSources>
+-->
+</archetype>

archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor name="struts2-archetype-blank">
+  <fileSets>
+    <fileSet filtered="true" packaged="true">
+      <directory>src/main/java</directory>
+      <includes>
+        <include>**/*.java</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet filtered="true" packaged="true">
+      <directory>src/test/java</directory>
+      <includes>
+        <include>**/*.java</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet filtered="false" packaged="true">
+      <directory>src/main/resources</directory>
+      <includes>
+        <include>**/*package*.properties</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet filtered="false" packaged="true">
+      <directory>src/main/resources</directory>
+      <includes>
+        <include>**/*-validation.xml</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet filtered="true" packaged="false">
+      <directory>src/main/resources</directory>
+      <includes>
+        <include>**/struts.xml</include>
+        <include>**/example.xml</include>
+      </includes>
+    </fileSet>
+
+    <fileSet filtered="false" packaged="false">
+      <directory>src/main/webapp/example</directory>
+      <includes>
+        <include>**/*.jsp</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet filtered="false" packaged="false">
+      <directory>src/main/webapp</directory>
+      <includes>
+        <include>**/index.html</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet filtered="false" packaged="false">
+      <directory>src/main/webapp/WEB-INF</directory>
+      <includes>
+        <include>**/web.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</archetype-descriptor>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt

@@ -0,0 +1,6 @@
+Apache Struts
+
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/README.txt

@@ -0,0 +1,10 @@
+README.txt - blank
+
+This is an "empty" application that you can deploy as the basis of your own 
+application. 
+
+For more on getting started with Struts, see 
+
+* http://cwiki.apache.org/WW/home.html
+
+----------------------------------------------------------------------------

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <packaging>war</packaging>
+    <name>Struts 2 Blank Webapp</name>
+
+    <properties>
+        <struts2.version>2.1.8.1</struts2.version>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-config-browser-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-junit-plugin</artifactId>
+            <version>${struts2.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>2.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <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>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.21</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java

@@ -18,15 +18,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.convention.classloader;
+
+package ${package}.example;
+
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
- * *interface taken from Apache JCI
+ * Base Action class for the Tutorial package.
  */
-public interface ResourceStore {
-
-    void write(final String pResourceName, final byte[] pResourceData);
-
-    byte[] read(final String pResourceName);
+public class ExampleSupport extends ActionSupport {
 }
-

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java

@@ -0,0 +1,61 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+
+package ${package}.example;
+
+/**
+ * <code>Set welcome message.</code>
+ */
+public class HelloWorld extends ExampleSupport {
+
+    public String execute() throws Exception {
+        setMessage(getText(MESSAGE));
+        return SUCCESS;
+    }
+
+    /**
+     * Provide default valuie for Message property.
+     */
+    public static final String MESSAGE = "HelloWorld.message";
+
+    /**
+     * Field for Message property.
+     */
+    private String message;
+
+    /**
+     * Return Message property.
+     *
+     * @return Message property
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Set Message property.
+     *
+     * @param message Text to display on HelloWorld page.
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java

@@ -0,0 +1,59 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+
+package ${package}.example;
+
+public class Login extends ExampleSupport {
+
+    public String execute() throws Exception {
+
+        if (isInvalid(getUsername())) return INPUT;
+
+        if (isInvalid(getPassword())) return INPUT;
+
+        return SUCCESS;
+    }
+
+    private boolean isInvalid(String value) {
+        return (value == null || value.length() == 0);
+    }
+
+    private String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+}

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"       
+          "http://struts.apache.org/dtds/struts-2.0.dtd">
+<!-- 
+  - This file is included by the struts.xml file as an example
+  - of how to break up the configuration file into multiple files.
+-->
+<struts>
+  <package name="example" namespace="/example" extends="struts-default">
+    <action name="HelloWorld" class="${package}.example.HelloWorld">
+      <result>/example/HelloWorld.jsp</result>
+    </action>
+
+    <action name="Login_*" method="{1}" class="${package}.example.Login">
+      <result name="input">/example/Login.jsp</result>
+      <result type="redirectAction">Menu</result>
+    </action>
+
+    <action name="*" class="${package}.example.ExampleSupport">
+      <result>/example/{1}.jsp</result>
+    </action>
+    
+    <!-- Add additional "example" package actions here. -->
+    
+  </package>
+</struts>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE validators PUBLIC
+          "-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
+          "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+  <field name="username">
+    <field-validator type="requiredstring">
+      <message key="requiredstring"/>
+    </field-validator>
+  </field>
+  
+  <field name="password">
+    <field-validator type="requiredstring">
+      <message key="requiredstring"/>
+    </field-validator>
+  </field>
+</validators>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties

@@ -0,0 +1,5 @@
+HelloWorld.message = Struts is up and running...
+requiredstring=  ${getText(fieldName)} is required.
+password = Password
+username = User Name
+Missing.message =  This feature is under construction. Please try again in the next iteration.

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties

@@ -0,0 +1,5 @@
+HelloWorld.message = ¡Struts está bien!...
+requiredstring = ${getText(fieldName)} es requerido.
+password = Contraseña
+username = Nombre de Usuario
+Missing.message = Página bajo construcción, trate de nuevo en la proxima versión

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"       
+          "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+  <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+  <constant name="struts.devMode" value="true"/>
+  
+  <include file="example.xml"/>
+  
+  <!-- Add addition packages and configuration here. -->
+</struts>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="struts_blank" version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+  <display-name>Struts Blank</display-name>
+
+  <filter>
+    <filter-name>struts2</filter-name>
+    <filter-class>
+      org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
+    </filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>struts2</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+</web-app>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp

@@ -0,0 +1,28 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title><s:text name="HelloWorld.message"/></title>
+</head>
+
+<body>
+<h2><s:property value="message"/></h2>
+
+<h3>Languages</h3>
+<ul>
+    <li>
+        <s:url id="url" action="HelloWorld">
+            <s:param name="request_locale">en</s:param>
+        </s:url>
+        <s:a href="%{url}">English</s:a>
+    </li>
+    <li>
+        <s:url id="url" action="HelloWorld">
+            <s:param name="request_locale">es</s:param>
+        </s:url>
+        <s:a href="%{url}">Espanol</s:a>
+    </li>
+</ul>
+
+</body>
+</html>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Login.jsp

@@ -0,0 +1,15 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title>Sign On</title>
+</head>
+
+<body>
+<s:form action="Login">
+    <s:textfield key="username"/>
+    <s:password key="password" />
+    <s:submit/>
+</s:form>
+</body>
+</html>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Menu.jsp

@@ -0,0 +1,3 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<s:include value="Missing.jsp"/>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Missing.jsp

@@ -0,0 +1,11 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head><title>Missing Feature</title></head>
+
+<body>
+<p>
+    <s:text name="Missing.message"/>
+</p>
+</body>
+</html>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Register.jsp

@@ -0,0 +1,3 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<s:include value="Missing.jsp"/>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Welcome.jsp

@@ -0,0 +1,18 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title>Welcome</title>
+    <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
+          type="text/css"/>
+</head>
+
+<body>
+<h3>Commands</h3>
+<ul>
+    <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
+    <li><a href="<s:url action="Register"/>">Register</a></li>
+</ul>
+
+</body>
+</html>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=example/HelloWorld.action">
+</head>
+
+<body>
+<p>Loading ...</p>
+</body>
+</html>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java

@@ -0,0 +1,97 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+
+package ${package}.example;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.RuntimeConfiguration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+
+import java.util.Map;
+import java.util.List;
+
+import org.apache.struts2.StrutsTestCase;
+
+public class ConfigTest extends StrutsTestCase {
+
+    protected void assertSuccess(String result) throws Exception {
+        assertTrue("Expected a success result!",
+                ActionSupport.SUCCESS.equals(result));
+    }
+
+    protected void assertInput(String result) throws Exception {
+        assertTrue("Expected an input result!",
+                ActionSupport.INPUT.equals(result));
+    }
+
+    protected Map assertFieldErrors(ActionSupport action) throws Exception {
+        assertTrue(action.hasFieldErrors());
+        return action.getFieldErrors();
+    }
+
+    protected void assertFieldError(Map field_errors, String field_name, String error_message) {
+
+        List errors = (List) field_errors.get(field_name);
+        assertNotNull("Expected errors for " + field_name, errors);
+        assertTrue("Expected errors for " + field_name, errors.size()>0);
+        // TODO: Should be a loop
+        assertEquals(error_message,errors.get(0));
+
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        XmlConfigurationProvider c = new XmlConfigurationProvider("struts.xml");
+        configurationManager.addConfigurationProvider(c);
+        configurationManager.reload();
+    }
+
+    protected ActionConfig assertClass(String namespace, String action_name, String class_name) {
+        RuntimeConfiguration configuration = configurationManager.getConfiguration().getRuntimeConfiguration();
+        ActionConfig config = configuration.getActionConfig(namespace, action_name);
+        assertNotNull("Mssing action", config);
+        assertTrue("Wrong class name: [" + config.getClassName() + "]",
+                class_name.equals(config.getClassName()));
+        return config;
+    }
+
+    protected ActionConfig assertClass(String action_name, String class_name) {
+        return assertClass("", action_name, class_name);
+    }
+
+    protected void assertResult(ActionConfig config, String result_name, String result_value) {
+        Map results = config.getResults();
+        ResultConfig result = (ResultConfig) results.get(result_name);
+        Map params = result.getParams();
+        String value = (String) params.get("actionName");
+        if (value == null)
+            value = (String) params.get("location");
+        assertTrue("Wrong result value: [" + value + "]",
+                result_value.equals(value));
+    }
+
+    public void testConfig() throws Exception {
+        assertNotNull(configurationManager);
+    }
+
+}

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java

@@ -0,0 +1,37 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+
+package ${package}.example;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.StrutsTestCase;
+
+public class HelloWorldTest extends StrutsTestCase {
+
+    public void testHelloWorld() throws Exception {
+        HelloWorld hello_world = new HelloWorld();
+        String result = hello_world.execute();
+        assertTrue("Expected a success result!",
+                ActionSupport.SUCCESS.equals(result));
+        assertTrue("Expected the default message!",
+                hello_world.getText(HelloWorld.MESSAGE).equals(hello_world.getMessage()));
+    }
+}

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java

@@ -0,0 +1,55 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+
+package ${package}.example;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+
+import java.util.Map;
+
+public class LoginTest extends ConfigTest {
+
+    public void FIXME_testLoginConfig() throws Exception {
+        ActionConfig config = assertClass("example", "Login_input", "example.Login");
+        assertResult(config, ActionSupport.SUCCESS, "Menu");
+        assertResult(config, ActionSupport.INPUT, "/example/Login.jsp");
+    }
+
+    public void testLoginSubmit() throws Exception {
+        Login login = new Login();
+        login.setUsername("username");
+        login.setPassword("password");
+        String result = login.execute();
+        assertSuccess(result);
+    }
+
+    // Needs access to an envinronment that includes validators
+    public void FIXME_testLoginSubmitInput() throws Exception {
+        Login login = new Login();
+        String result = login.execute();
+        assertInput(result);
+        Map errors = assertFieldErrors(login);
+        assertFieldError(errors,"username","Username is required.");
+        assertFieldError(errors,"password","Password is required.");
+    }
+
+}

archetypes/struts2-archetype-convention/README.txt

@@ -0,0 +1,48 @@
+INFORMATION
+===========
+- This is Struts 2's "Blank Convetion" Maven Archetype
+
+USAGE
+=====
+
+- change directory to where the web app template is to be created,
+  for example, a 'projects' directory (which you may need to create):
+  
+     cd /home/tmjee/projects
+  
+- run the following command to generate the sample web app template, assuming :-
+    - root java package -> com.mycompany.mysystem
+
+    - the webapp war name   ->  myWebApp
+
+
+  mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
+							-DartifactId=myWebApp \
+							-DarchetypeGroupId=org.apache.struts \
+							-DarchetypeArtifactId=struts2-archetype-convention \
+							-DarchetypeVersion=2.1.8 \
+							-DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
+
+IMPORTANT:
+==========
+- The generated template uses the 'example' package, regardless of what you
+specify during mvn archetype:create.
+
+Unfortunately, the Maven Archetype plugin does not currently provide a way to
+move resource files into a package structure.
+
+- to compile, execute
+  mvn compile
+
+- to run test cases execute
+  mvn test
+
+- to clean execute
+  mvn clean
+
+- to package execute 
+  mvn package
+
+- to start it with jetty6 execute
+  mvn jetty:run
+

archetypes/struts2-archetype-convention/pom.xml

@@ -0,0 +1,46 @@
+<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">
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-archetypes</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-archetype-convention</artifactId>
+    <version>2.2.0</version>
+    <name>Struts 2 Archetypes - Blank Convention</name>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-convention</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-convention</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-convention</url>
+    </scm>
+
+    <properties>
+       <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype>
+  <id>struts2-archetype-convention</id>
+</archetype>

archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor name="struts2-archetype-convention">
+
+    <fileSets>
+        <fileSet filtered="true" packaged="true">
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </fileSet>
+
+        <fileSet filtered="true" packaged="true">
+            <directory>src/test/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </fileSet>
+
+        <fileSet filtered="false" packaged="true">
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**/*package*.properties</include>
+            </includes>
+        </fileSet>
+
+        <fileSet filtered="false" packaged="false">
+            <directory>src/main/webapp</directory>
+            <includes>
+                <include>**/*.jsp</include>
+            </includes>
+        </fileSet>
+
+        <fileSet filtered="true" packaged="false">
+            <directory>src/main/webapp/WEB-INF</directory>
+            <includes>
+                <include>**/*.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+</archetype-descriptor>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt

@@ -0,0 +1,6 @@
+Apache Struts
+
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/README.txt

@@ -0,0 +1,10 @@
+README.txt - blank convention
+
+This is an "empty" Google App Engine aware application that you can deploy as the basis of your own
+application. 
+
+For more on getting started with Struts, see 
+
+* http://cwiki.apache.org/WW/home.html
+
+----------------------------------------------------------------------------

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <packaging>war</packaging>
+    <name>Struts 2 Blank Convention Webapp</name>
+
+    <properties>
+        <struts2.version>2.1.8.1</struts2.version>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-convention-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-junit-plugin</artifactId>
+            <version>${struts2.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.struts</groupId>
+          <artifactId>struts2-config-browser-plugin</artifactId>
+          <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <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>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.21</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/InitListener.java

@@ -0,0 +1,25 @@
+package ${package};
+
+import ognl.OgnlRuntime;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.logging.Logger;
+
+
+/**
+ * To allow works Struts 2 with Google App Engine
+ */
+public class InitListener implements ServletContextListener {
+
+    public InitListener() {
+    }
+
+    public void contextInitialized(ServletContextEvent sce) {
+        OgnlRuntime.setSecurityManager(null);
+    }
+
+    public void contextDestroyed(ServletContextEvent sce) {
+    }
+
+}

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java

@@ -0,0 +1,42 @@
+package ${package}.actions;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * <code>Set welcome message.</code>
+ */
+public class HelloAction extends ActionSupport {
+
+    public String execute() throws Exception {
+        setMessage(getText(MESSAGE));
+        return SUCCESS;
+    }
+
+    /**
+     * Provide default valuie for Message property.
+     */
+    public static final String MESSAGE = "hello.message";
+
+    /**
+     * Field for Message property.
+     */
+    private String message;
+
+    /**
+     * Return Message property.
+     *
+     * @return Message property
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Set Message property.
+     *
+     * @param message Text to display on HelloWorld page.
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/Index.java

@@ -0,0 +1,24 @@
+package ${package}.actions;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+
+@Results({
+        @Result(name = Action.SUCCESS, location = "${redirectName}", type = "redirectAction")
+})
+public class Index extends ActionSupport {
+
+    private String redirectName;
+
+    public String execute() {
+        redirectName = "hello";
+        return Action.SUCCESS;
+    }
+
+    public String getRedirectName() {
+        return redirectName;
+    }
+
+}

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package.properties

@@ -0,0 +1,2 @@
+hello.message = Struts is up and running...
+requiredstring=  ${getText(fieldName)} is required.

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package_es.properties

@@ -0,0 +1,2 @@
+hello.message = ¡Struts está bien!...
+requiredstring = ${getText(fieldName)} es requerido.

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+    <application>${artifactId}</application>
+    <version>1</version>
+    <sessions-enabled>true</sessions-enabled>
+</appengine-web-app>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp

@@ -0,0 +1,28 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title><s:text name="hello.message"/></title>
+</head>
+
+<body>
+<h2><s:property value="message"/></h2>
+
+<h3>Languages</h3>
+<ul>
+    <li>
+        <s:url id="url" action="hello">
+            <s:param name="request_locale">en</s:param>
+        </s:url>
+        <s:a href="%{url}">English</s:a>
+    </li>
+    <li>
+        <s:url id="url" action="hello">
+            <s:param name="request_locale">es</s:param>
+        </s:url>
+        <s:a href="%{url}">Espanol</s:a>
+    </li>
+</ul>
+
+</body>
+</html>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="struts_blank" version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    <display-name>Struts Blank Convention</display-name>
+
+    <listener>
+        <listener-class>${package}.InitListener</listener-class>
+    </listener>
+
+    <filter>
+        <filter-name>struts2</filter-name>
+        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>struts2</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+</web-app>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/index.jsp

@@ -0,0 +1 @@
+<% response.sendRedirect("hello"); %>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java

@@ -0,0 +1,16 @@
+package ${package}.actions;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.StrutsTestCase;
+
+public class HelloActionTest extends StrutsTestCase {
+
+    public void testHelloAction() throws Exception {
+        HelloAction hello = new HelloAction();
+        String result = hello.execute();
+        assertTrue("Expected a success result!",
+                ActionSupport.SUCCESS.equals(result));
+        assertTrue("Expected the default message!",
+                hello.getText(HelloAction.MESSAGE).equals(hello.getMessage()));
+    }
+}

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java

@@ -0,0 +1,14 @@
+package ${package}.actions;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.StrutsTestCase;
+
+public class IndexTest extends StrutsTestCase {
+
+    public void testIndex() throws Exception {
+        Index index = new Index();
+        String result = index.execute();
+        assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
+        assertTrue("Expected the 'hello' action name!!", "hello".equals(index.getRedirectName()));
+    }
+}

archetypes/struts2-archetype-dbportlet/README.txt

@@ -0,0 +1,42 @@
+INFORMATION
+===========
+- This is Struts 2's "Database Portlet" Maven Archetype
+- To be used to create a simple portlet that displays information in a database and can be deployed as a webapp or JSR168 portlet.
+ 
+
+USAGE
+=====
+
+- change directory to where the portlet template is to be created,
+  for example, a 'projects' directory (which you may need to create):
+  
+     cd /home/tmjee/projects
+  
+- run the following command to generate the sample portlet template, assuming :-
+    - root java package -> com.myCompany.myPortlet
+
+    - the portlet war name   ->  myWebApp
+
+
+  mvn archetype:create -DgroupId=com.myCompany.myPortlet \
+                       -DartifactId=myWebApp \
+                       -DarchetypeGroupId=org.apache.struts \
+                       -DarchetypeArtifactId=struts2-archetype-dbportlet \
+                       -DarchetypeVersion=2.0.9-SNAPSHOT \
+                       -DremoteRepositories=http://people.apache.org/maven-snapshot-repository
+
+- to compile, execute
+  mvn compile
+
+- to run test cases execute
+  mvn test
+
+- to clean execute
+  mvn clean
+
+- to package execute 
+  mvn package
+
+- to start it with jetty execute as a servlet
+  mvn jetty:run
+

archetypes/struts2-archetype-dbportlet/pom.xml

@@ -0,0 +1,46 @@
+<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">
+  <parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-archetypes</artifactId>
+    <version>2.2.0</version>
+  </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-archetype-dbportlet</artifactId>
+    <version>2.2.0</version>
+    <name>Struts 2 Archetypes - Database Portlet</name>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-dbportlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-dbportlet</developerConnection>
+        <url>svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-dbportlet</url>
+    </scm>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<archetype>
+  <id>struts2-archetype-dbblank</id>
+  <sources>
+    <source>src/main/java/view/IndexAction.java</source>
+    <source>src/main/java/edit/IndexAction.java</source>
+  </sources>
+  <resources>
+  	<resource>src/main/resources/struts.xml</resource>
+	<resource>src/main/webapp/index.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/web.xml</resource>
+	<resource>src/main/webapp/WEB-INF/portlet.xml</resource>
+	<resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>
+	<resource>src/main/webapp/WEB-INF/view/index.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/help/index.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/edit/index-input.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/edit/index-success.jsp</resource>
+  </resources>
+</archetype>
+

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>war</packaging>
+	<version>${version}</version>
+	<name>Struts 2 Database Portlet</name>
+	<url>http://www.myComp.com</url>
+	<description>Struts 2 Database Portlet</description>
+
+    <properties>
+        <struts2.version>2.1.8.1</struts2.version>
+    </properties>    
+
+	<dependencies>
+
+		<!-- Junit -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!--  Struts 2 -->
+		<dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <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-convention-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <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.5.6</version>
+        </dependency>
+
+        <!-- Database driver (change for your specific database) -->
+         <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.7</version>
+        </dependency>
+
+		<!-- Servlet, Jsp, and Portlet API's -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<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>
+      <finalName>${artifactId}</finalName>
+    	<plugins>
+    		<plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                   <source>1.5</source>
+                   <target>1.5</target>
+                </configuration>
+            </plugin>
+    		<plugin>
+    			<groupId>org.mortbay.jetty</groupId>
+    			<artifactId>maven-jetty-plugin</artifactId>
+    			<version>6.1.21</version>
+    			<configuration>
+    				<scanIntervalSeconds>10</scanIntervalSeconds>
+    			</configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>portlet-api</groupId>
+                        <artifactId>portlet-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+    		</plugin>
+    	</plugins>
+    </build>
+</project>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/java/edit/IndexAction.java

@@ -0,0 +1,46 @@
+package ${package}.edit;
+
+import org.apache.struts2.dispatcher.DefaultActionSupport;
+
+/**
+ *
+ */
+public class IndexAction extends DefaultActionSupport {
+    private String pref1;
+    private String pref2;
+    private boolean submit;
+
+    public String execute() {
+
+        if (submit) {
+
+            // Save the preferences somehow
+
+            return SUCCESS;
+        } else {    
+        
+            // Preform any logic here
+            
+            return INPUT;
+        }    
+    }
+
+    public void setSubmit(String val) {
+        this.submit = (val != null);
+    }
+
+    public String getPref1() {
+        return pref1;
+    }
+    public String getPref2() {
+        return pref2;
+    }
+
+    public void setPref1(String pref) {
+        this.pref1 = pref;
+    }     
+
+    public void setPref2(String pref) {
+        this.pref2 = pref;
+    }     
+}

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/java/view/IndexAction.java

@@ -0,0 +1,51 @@
+package ${package}.view;
+
+import org.apache.struts2.dispatcher.DefaultActionSupport;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.List;
+
+/**
+ * Loads and displays the contents of a database table
+ */
+public class IndexAction extends DefaultActionSupport {
+
+    private static boolean initialized = false;
+    private DataSource ds;
+    private static List<Map<String,Object>> data;
+    private static long lastLoaded;
+    private static long CACHE_TIME = 1000 * 60;
+
+    public void setDataSource(DataSource ds) {
+
+        // Initializes the in-memory database (not necessary in production)
+        if (!initialized) {
+            SimpleJdbcTemplate jt = new SimpleJdbcTemplate(ds);
+            jt.update("CREATE TABLE sample_table ( id INTEGER IDENTITY, str_col VARCHAR(256), num_col INTEGER)");
+            jt.update("INSERT INTO sample_table(str_col,num_col) VALUES('Ford', 100)");
+            jt.update("INSERT INTO sample_table(str_col,num_col) VALUES('Toyota', 200)");
+            jt.update("INSERT INTO sample_table(str_col,num_col) VALUES('Mazda', 300)");
+            initialized = true;
+        }
+        this.ds = ds;
+    }
+
+    public String execute() {
+
+        // Only refresh the data every minute as needed
+        long now = System.currentTimeMillis();
+        if (lastLoaded + CACHE_TIME < now) {
+            SimpleJdbcTemplate jt = new SimpleJdbcTemplate(ds);
+            data = jt.queryForList("SELECT * FROM sample_table");
+            lastLoaded = now;
+        }
+        return SUCCESS;
+    }
+
+    public List<Map<String,Object>> getData() {
+        return data;
+    }
+}
+

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/struts.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.1//EN"
+    "http://struts.apache.org/dtds/struts-2.1.7.dtd">
+ 
+<struts>
+    <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>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+    Defines the datasource that will be injected into your Actions
+-->
+
+<beans default-autowire="byName">
+
+    <!-- Change for your database -->
+    <bean id="dataSource"
+        class="org.springframework.jdbc.datasource.DriverManagerDataSource"
+        destroy-method="close">
+        <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+        <property name="url" value="jdbc:hsqldb:mem:example"/>
+        <property name="username" value="sa"/>
+        <property name="password" value=""/>
+    </bean>
+
+</beans>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/edit/index-input.jsp

@@ -0,0 +1,10 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<h1>StrutsPortlet</h1>
+This is the default edit page!
+<p />
+
+<s:form action="index" method="POST">
+    <s:textfield label="Preference one" name="preferenceOne" value="%{preferenceOne}"/>
+    <s:textfield label="Preference two" name="preferenceTwo" value="%{preferenceTwo}"/>
+    <s:submit name="submit" value="Save prefs"/>
+</s:form>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/edit/index-success.jsp

@@ -0,0 +1,22 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+The preferences has been saved:
+
+<p />
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Value</th>
+  </tr>
+  <tr>
+    <td>Preference 1</td>
+    <td><s:property value="%{pref1}" /></td>
+  </tr>
+  <tr>
+    <td>Preference 2</td>
+    <td><s:property value="%{pref2}" /></td>
+  </tr>
+</table>  
+
+<a href="<s:url action="index"/>">Back</a>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/help/index.jsp

@@ -0,0 +1 @@
+This is the default help page!

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml

@@ -0,0 +1,63 @@
+<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" id="struts-portlet">
+  <portlet id="StrutsDBPortlet">
+    <description xml:lang="EN">Struts Database Portlet</description>
+    <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>
+
+    <init-param>
+        <name>actionPackages</name>
+        <value>${package}</value>
+    </init-param>
+    <init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>viewNamespace</name>
+		<value>/view</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultViewAction</name>
+		<value>index</value>
+	</init-param>
+	<init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>editNamespace</name>
+		<value>/edit</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultEditAction</name>
+		<value>index</value>
+	</init-param>
+	<init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>helpNamespace</name>
+		<value>/help</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultHelpAction</name>
+		<value>index</value>
+	</init-param>
+    
+    <expiration-cache>0</expiration-cache>
+
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>edit</portlet-mode>
+      <portlet-mode>help</portlet-mode>
+    </supports>
+
+    <supported-locale>en</supported-locale>
+
+    <portlet-info>
+      <title>Struts Database Porlet</title>
+      <short-title>DB</short-title>
+      <keywords>struts,portlet,database</keywords>
+    </portlet-info>
+  </portlet>
+  
+</portlet-app>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp

@@ -0,0 +1,20 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<H2>Welcome to the Struts data table portlet</H2>
+<p/>
+This a simple table showing the database data:
+<table>
+ <tr>
+  <th>Name</th>
+  <th>Value</th>
+ </tr>
+ <s:iterator id="row" value="%{data}">
+ <tr>
+  <td><s:property value="%{STR_COL}" /></td>
+  <td><s:property value="%{NUM_COL}" /></td>
+ </tr>
+ </s:iterator>
+</table>
+<ul>
+<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>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+    <context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext*.xml</param-value>
+	</context-param>
+
+    <filter id="filterdispatcher">
+		<filter-name>struts</filter-name>
+		<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+    </filter>
+
+	<filter-mapping>
+		<filter-name>struts</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+ 
+    <listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+    
+    <listener>
+		<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>
+
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+    
+</web-app>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/index.jsp

@@ -0,0 +1,4 @@
+<%
+    String redirectURL = "view/index.action";
+    response.sendRedirect(redirectURL);
+%>

archetypes/struts2-archetype-plugin/pom.xml

@@ -0,0 +1,46 @@
+<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">
+  <parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-archetypes</artifactId>
+    <version>2.2.0</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>struts2-archetype-plugin</artifactId>
+  <version>2.2.0</version>
+  <packaging>jar</packaging>
+  <name>Struts 2 Archetypes - Plugin</name>
+
+    <scm>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-plugin</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-plugin</developerConnection>
+       <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-plugin</url>
+    </scm>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+  <profiles>
+  <profile>
+   <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<archetype>
+  <id>struts2-archetype-plugin</id>
+  <sources>
+  	<source>src/main/java/MyResult.java</source>
+  </sources>
+  <resources>
+  	<resource>src/main/resources/struts-plugin.xml</resource>
+  	<resource>LICENSE.txt</resource>
+  	<resource>NOTICE.txt</resource>
+  	<resource>README.txt</resource>
+  </resources>
+</archetype>
+

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/NOTICE.txt

@@ -0,0 +1,6 @@
+Apache Struts
+
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/README.txt

@@ -0,0 +1,10 @@
+README.txt - plugin
+
+This is an "empty" Struts 2 plugin that you can use as the basis for a new
+plugin.
+
+For more on Struts plugins, see 
+
+* http://struts.apache.org/2.x/docs/plugins.html
+
+----------------------------------------------------------------------------

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+   <groupId>${groupId}</groupId>
+   <artifactId>${artifactId}</artifactId>
+   <version>${version}</version>
+   <name>Struts 2 Plugin</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>2.1.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+ 
+    </dependencies>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+    </build>
+
+</project>

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java

@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package $package;
+
+import org.apache.struts2.ServletActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.Writer;
+
+
+/**
+ * An example result that simply returns "hello".
+ *
+ */
+public class MyResult implements Result {
+
+    /**
+     * Executes the result. 
+     *
+     * @param invocation an encapsulation of the action execution state.
+     * @throws Exception if an error occurs when writing the text to the servlet output stream.
+     */
+    public void execute(ActionInvocation invocation) throws Exception {
+
+        HttpServletResponse response = ServletActionContext.getResponse();
+        Writer writer = response.getWriter();
+        writer.write("Hello");
+        writer.flush();
+    }
+}

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.1//EN"
+    "http://struts.apache.org/dtds/struts-2.1.7.dtd">
+    
+<struts>
+
+    <!-- 
+       Define new Struts beans that implement key interfaces or extend existing objects.
+       
+       This is an example of a bean that provides a new ObjectFactory:
+    
+    <bean type="com.opensymphony.xwork2.ObjectFactory" name="myObjectFactory" class="com.mycompany.myapp.MyObjectFactory" />
+
+       This example adds a new template engine for the Struts UI tags:
+
+    <bean type="org.apache.struts2.components.template.TemplateEngine" name="myEngine" class="com.mycompany.myapp.MyTemplateEngine" />
+    
+    -->
+
+    <!-- 
+       You can also define or override constants to plug in your custom beans into the Struts framework or provide customization
+       options for plugin users.
+
+       This is an example of making your new ObjectFactory, defined above, the default ObjectFactory for the framework:
+
+    <constant name="struts.objectFactory" value="myObjectFactory" />
+
+       Or perhaps you want to provide a configuration option for the plugin user.  Define a constant here, then have it injected
+       into your bean:
+
+    <constant name="my.configuration.option" value="myValue" />
+
+    -->
+
+    <!--
+       Finally, you can define your own interceptors, results, and action packages.
+
+       In this example, we create a package that defines a result: -->
+
+    <package name="myPlugin-default">
+        <result-types>
+            <result-type name="myResult" class="${package}.MyResult"/>
+        </result-types>
+    </package>    
+
+</struts>

archetypes/struts2-archetype-portlet/README.txt

@@ -0,0 +1,42 @@
+INFORMATION
+===========
+- This is Struts 2's "Portlet" Maven Archetype
+- To be used to create a simple portlet that can be deployed as a webapp or JSR168 portlet.
+ 
+
+USAGE
+=====
+
+- change directory to where the portlet template is to be created,
+  for example, a 'projects' directory (which you may need to create):
+  
+     cd /home/tmjee/projects
+  
+- run the following command to generate the sample portlet template, assuming :-
+    - root java package -> com.myCompany.myPortlet
+
+    - the portlet war name   ->  myWebApp
+
+
+  mvn archetype:create -DgroupId=com.myCompany.myPortlet \
+                       -DartifactId=myWebApp \
+                       -DarchetypeGroupId=org.apache.struts \
+                       -DarchetypeArtifactId=struts2-archetype-portlet \
+                       -DarchetypeVersion=2.0.9-SNAPSHOT \
+                       -DremoteRepositories=http://people.apache.org/maven-snapshot-repository
+
+- to compile, execute
+  mvn compile
+
+- to run test cases execute
+  mvn test
+
+- to clean execute
+  mvn clean
+
+- to package execute 
+  mvn package
+
+- to start it with jetty execute as a servlet
+  mvn jetty:run
+

archetypes/struts2-archetype-portlet/pom.xml

@@ -0,0 +1,47 @@
+<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">
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-archetypes</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-archetype-portlet</artifactId>
+    <version>2.2.0</version>
+    <packaging>jar</packaging>
+    <name>Struts 2 Archetypes - Portlet</name>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-portlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-portlet</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-portlet</url>
+    </scm>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<archetype>
+  <id>struts2-archetype-portlet</id>
+  <sources>
+    <source>src/main/java/HelloAction.java</source>
+    <source>src/main/java/UpdateNameAction.java</source>
+  </sources>
+  <testSources>
+	  <source>src/test/java/JettyPlutoLauncher.java</source>
+  </testSources>
+  <resources>
+  	<resource>src/main/resources/struts.xml</resource>
+	<resource>src/main/webapp/WEB-INF/jsp/view/index.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/jsp/edit/index.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/web.xml</resource>
+	<resource>src/main/webapp/WEB-INF/portlet.xml</resource>
+  </resources>
+</archetype>
+

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <packaging>war</packaging>
+    <name>My Portlet Application</name>
+    <version>${version}</version>
+
+    <properties>
+        <struts2.version>2.1.8.1</struts2.version>
+    </properties>
+
+    <dependencies>
+
+        <!--  Struts 2 -->
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <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-config-browser-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.bekk.boss</groupId>
+            <artifactId>maven-jetty-pluto-embedded</artifactId>
+            <version>1.0.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.21</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jsp-2.1</artifactId>
+            <version>6.1.14</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>pluto-embedded</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.pluto</groupId>
+                        <artifactId>maven-pluto-plugin</artifactId>
+                        <version>1.1.6</version>
+                        <executions>
+                            <execution>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>assemble</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <version>6.1.21</version>
+                        <configuration>
+                            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+                            <webAppConfig>
+                                <contextPath>/${project.artifactId}</contextPath>
+                                <defaultsDescriptor>/WEB-INF/jetty-pluto-web-default.xml</defaultsDescriptor>
+                            </webAppConfig>
+                            <systemProperties>
+                                <systemProperty>
+                                    <name>org.apache.pluto.embedded.portletIds</name>
+                                    <value>HelloPortlet</value>
+                                </systemProperty>
+                            </systemProperties>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.bekk.boss</groupId>
+                                <artifactId>maven-jetty-pluto-embedded</artifactId>
+                                <version>1.0.1</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/java/HelloAction.java

@@ -0,0 +1,38 @@
+package ${packageName};
+
+import javax.portlet.PortletPreferences;
+
+import org.apache.struts2.dispatcher.DefaultActionSupport;
+import org.apache.struts2.portlet.interceptor.PortletPreferencesAware;
+
+import com.opensymphony.xwork2.Preparable;
+
+public class HelloAction extends DefaultActionSupport implements PortletPreferencesAware {
+
+	private static final long serialVersionUID = 1L;
+
+	private String firstName;
+
+	private String lastName;
+
+	private PortletPreferences preferences;
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setPortletPreferences(PortletPreferences preferences) {
+		this.preferences = preferences;
+	}
+
+	@Override
+	public String execute() throws Exception {
+		firstName = preferences.getValue("firstName", "");
+		lastName = preferences.getValue("lastName", "");
+		return SUCCESS;
+	}
+}

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/java/UpdateNameAction.java

@@ -0,0 +1,54 @@
+package ${packageName};
+
+import javax.portlet.PortletPreferences;
+
+import org.apache.struts2.dispatcher.DefaultActionSupport;
+import org.apache.struts2.portlet.interceptor.PortletPreferencesAware;
+
+public class UpdateNameAction extends DefaultActionSupport implements PortletPreferencesAware {
+
+	private static final long serialVersionUID = 1L;
+
+	private String firstName;
+
+	private String lastName;
+
+	private PortletPreferences preferences;
+
+	@Override
+	public String execute() throws Exception {
+		preferences.setValue("firstName", firstName);
+		preferences.setValue("lastName", lastName);
+		preferences.store();
+		getActionMessages().add("Name updated");
+		return SUCCESS;
+	}
+	
+	@Override
+	public String input() throws Exception {
+		firstName = preferences.getValue("firstName", "");
+		lastName = preferences.getValue("lastName", "");
+		return INPUT;
+	}
+
+	public void setPortletPreferences(PortletPreferences preferences) {
+		this.preferences = preferences;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	
+	public String getLastName() {
+		return lastName;
+	}
+
+}

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/resources/struts.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.1//EN"
+    "http://struts.apache.org/dtds/struts-2.1.7.dtd">
+
+<struts>
+   <package name="default" extends="struts-portlet-default" namespace="/view">
+	   <action name="index" class="${packageName}.HelloAction">
+		   <result>/WEB-INF/jsp/view/index.jsp</result>
+	   </action>
+   </package>
+	
+	<package name="edit" extends="struts-portlet-default" namespace="/edit">
+	
+		<action name="index" class="${packageName}.UpdateNameAction">
+			<result type="redirectAction">
+				<param name="actionName">index</param>
+				<param name="portletMode">view</param>
+			</result>
+			<result name="input">/WEB-INF/jsp/edit/index.jsp</result>
+		</action>
+	</package>
+</struts>

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/edit/index.jsp

@@ -0,0 +1,13 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<h2>Your name:</h2>
+
+<s:form action="index">
+	<table>
+		<s:textfield name="firstName" label="First name"/>
+		<s:textfield name="lastName" label="Last name"/>
+		<s:submit value="Update"/>
+	</table>
+</s:form>
+
+<s:actionmessage/>

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/view/index.jsp

@@ -0,0 +1,9 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<s:if test='%{firstName != "" || lastName != ""}'>
+	<h2>Hello, <s:property value="firstName"/> <s:property value="lastName"/>
+</s:if>
+<s:else>
+    <b>No name set. Go to <a href="<s:url action="index" method="input" portletMode="edit"/>">edit mode</a> to set your name</b>
+</s:else>
+

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<portlet-app
+    version="1.0"
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+    id="${artifactId}">
+
+    <portlet id="HelloPortlet">
+        <description xml:lang="EN">Simple hello world portlet</description>
+        <portlet-name>HelloPortlet</portlet-name>
+        <display-name xml:lang="EN">${artifactId}</display-name>
+    
+        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+
+		<!-- The namespace for the actions configured for view mode -->
+		<init-param>
+			<name>viewNamespace</name>
+			<value>/view</value>
+		</init-param>
+		
+         <!-- The default action to invoke in view mode. -->
+        <init-param>
+            <name>defaultViewAction</name>
+            <value>index</value>
+        </init-param>
+
+		<!-- The namespace for the actions configured for edit mode -->
+		<init-param>
+			<name>editNamespace</name>
+			<value>/edit</value>
+		</init-param>
+		
+         <!-- The default action to invoke in edit mode. -->
+        <init-param>
+            <name>defaultEditAction</name>
+            <value>index!input</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+			<portlet-mode>view</portlet-mode>
+            <portlet-mode>edit</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>HelloPortlet</title>
+            <short-title>HelloPortlet</short-title>
+            <keywords>struts 2,portlet,hello,world</keywords>
+        </portlet-info>
+    </portlet>
+  
+</portlet-app>

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app id="${artifactId}">
+	<!-- Empty -->
+</web-app>

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/test/java/JettyPlutoLauncher.java

@@ -0,0 +1,21 @@
+package ${packageName};
+
+import org.apache.pluto.core.PortletServlet;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+public class JettyPlutoLauncher {
+ public static void main(String[] args) throws Exception {
+     System.setProperty("org.apache.pluto.embedded.portletIds", "HelloPortlet");
+     Server server = new Server(8080);
+     WebAppContext webapp = new WebAppContext("src/main/webapp", "/${artifactId}");
+     webapp.setDefaultsDescriptor("/WEB-INF/jetty-pluto-web-default.xml");
+     ServletHolder portletServlet = new ServletHolder(new PortletServlet());
+     portletServlet.setInitParameter("portlet-name", "HelloPortlet");
+     portletServlet.setInitOrder(1);
+     webapp.addServlet(portletServlet, "/PlutoInvoker/HelloPortlet");
+     server.addHandler(webapp);
+     server.start();
+ }
+}

archetypes/struts2-archetype-starter/README.txt

@@ -0,0 +1,53 @@
+INFORMATION
+===========
+- This is Struts 2's "Starter" Maven Archetype
+- To be used to create a simple webapp template that one could alter to meet his/her needs.
+- The created template contains
+  - sitemesh integration
+  - a simple Struts action
+  - a simple Struts action level validation
+  - a simple Struts action alias level validation
+  - a simple Struts global conversion
+  - a simple Struts action level conversion
+  - a simple Struts global resource bundle
+  - a simple Struts action level resource bundle
+  
+
+USAGE
+=====
+
+- change directory to where the web app template is to be created,
+  for example, a 'projects' directory (which you may need to create):
+  
+     cd /home/tmjee/projects
+  
+- run the following command to generate the sample web app template, assuming :-
+    - root java package -> com.myCompany.mySystem
+
+    - the webapp war name   ->  myWebApp
+
+
+  mvn archetype:create -DgroupId=com.myCompany.mySystem \
+                       -DartifactId=myWebApp \
+                       -DarchetypeGroupId=org.apache.struts \
+                       -DarchetypeArtifactId=struts2-archetype-starter \
+                       -DarchetypeVersion=2.0.11
+
+
+COMMON TASKS
+==========
+
+- to compile, execute
+  mvn compile
+
+- to run test cases execute
+  mvn test
+
+- to clean execute
+  mvn clean
+
+- to package execute 
+  mvn package
+
+- to start it with jetty6 execute
+  mvn jetty:run

archetypes/struts2-archetype-starter/pom.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+  <parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-archetypes</artifactId>
+    <version>2.2.0</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>struts2-archetype-starter</artifactId>
+  <version>2.2.0</version>
+  <packaging>jar</packaging>
+  <name>Struts 2 Archetypes - Starter</name>
+
+    <scm>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-starter</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-starter</developerConnection>
+       <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_0/archetypes/struts2-archetype-starter</url>
+    </scm>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+  <profiles>
+  <profile>
+   <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>

archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<archetype>
+  <id>struts2-archetype-starter</id>
+  <sources>
+    <source>src/main/java/HelloWorldAction.java</source>
+    <source>src/main/java/IndexAction.java</source>
+    <source>src/main/java/DateConverter.java</source>
+  </sources>
+  <resources>
+  	<resource>src/main/resources/struts.xml</resource>
+  	<resource>src/main/resources/xwork-conversion.properties</resource>
+  	<resource>src/main/resources/struts.properties</resource>
+  	<resource>src/main/resources/applicationContext.xml</resource>
+  	<resource>src/main/resources/log4j.properties</resource>
+  	<resource>src/main/webapp/jsp/index.jsp</resource>
+	<resource>src/main/webapp/jsp/helloWorld.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/decorators/main.jsp</resource>
+	<resource>src/main/webapp/WEB-INF/decorators.xml</resource>
+	<resource>src/main/webapp/styles/main.css</resource>
+	<resource>src/main/webapp/styles/forms.css</resource>
+	<resource>src/main/webapp/styles/layout.css</resource>
+	<resource>src/main/webapp/styles/layout-1col.css</resource>
+	<resource>src/main/webapp/styles/layout-navleft-1col.css</resource>
+	<resource>src/main/webapp/styles/layout-navleft-2col.css</resource>
+	<resource>src/main/webapp/styles/layout-navtop-1col.css</resource>
+	<resource>src/main/webapp/styles/layout-navtop-3col.css</resource>
+	<resource>src/main/webapp/styles/layout-navtop-localleft.css</resource>
+	<resource>src/main/webapp/styles/layout-navtop-subright.css</resource>
+	<resource>src/main/webapp/styles/nav-horizontal.css</resource>
+	<resource>src/main/webapp/styles/nav-vertical.css</resource>
+	<resource>src/main/webapp/styles/tools.css</resource>
+	<resource>src/main/webapp/styles/typo.css</resource>
+	<resource>src/main/webapp/WEB-INF/dwr.xml</resource>
+	<resource>src/main/webapp/WEB-INF/sitemesh.xml</resource>
+	<resource>src/main/webapp/WEB-INF/web.xml</resource>
+	<resource>src/main/webapp/index.jsp</resource>  	
+  </resources>
+  <testSources>
+    <source>src/test/java/HelloWorldActionTest.java</source>
+    <source>src/test/java/IndexActionTest.java</source>
+  </testSources>
+  <testResources>
+  	<resource>src/test/resources/test.properties</resource>
+  </testResources>
+</archetype>
+

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>war</packaging>
+	<version>${version}</version>
+	<name>Struts 2 Starter</name>
+	<url>http://www.myComp.com</url>
+	<description>Struts 2 Starter</description>
+
+    <properties>
+        <struts2.version>2.1.8.1</struts2.version>
+    </properties>
+
+	<dependencies>
+		<!-- Junit -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!--  Struts 2 -->
+		<dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-config-browser-plugin</artifactId>
+            <version>${struts2.version}</version>
+        </dependency>
+
+		<!-- Servlet & Jsp -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<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>
+
+		<!-- Jakarta Commons -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<!-- Dwr -->
+		<dependency>
+			<groupId>uk.ltd.getahead</groupId>
+			<artifactId>dwr</artifactId>
+			<version>1.1-beta-3</version>
+		</dependency>
+    </dependencies>
+	
+    <build>
+      <finalName>${artifactId}</finalName>
+    	<plugins>
+    		<plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                   <source>1.5</source>
+                   <target>1.5</target>
+                </configuration>
+            </plugin>
+    		<plugin>
+    			<groupId>org.mortbay.jetty</groupId>
+    			<artifactId>maven-jetty-plugin</artifactId>
+    			<version>6.1.21</version>
+    			<configuration>
+    				<scanIntervalSeconds>10</scanIntervalSeconds>
+    			</configuration>
+    		</plugin>
+    	</plugins>
+    </build>
+</project>

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package ${package};
+
+import org.apache.struts2.util.StrutsTypeConverter;
+
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.Map;
+import java.util.Date;
+import com.opensymphony.xwork2.conversion.TypeConversionException;
+
+/**
+ * 
+ */
+public class DateConverter extends StrutsTypeConverter {
+    public Object convertFromString(Map context, String[] values, Class toClass) {
+        if (values != null && values.length > 0 && values[0] != null && values[0].length() > 0) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+            try {
+                return sdf.parse(values[0]);
+            }
+            catch(ParseException e) {
+                throw new TypeConversionException(e);
+            }
+        }
+        return null;
+    }
+    public String convertToString(Map context, Object o) {
+        if (o instanceof Date) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+            return sdf.format((Date)o);
+        }
+        return "";
+    }
+}
+

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package ${package};
+
+import java.util.Date;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.validator.annotations.Validation;
+import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
+import com.opensymphony.xwork2.conversion.annotations.Conversion;
+import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
+
+@Validation()
+@Conversion()
+public class HelloWorldAction extends ActionSupport {
+    
+    private Date now;
+    private String name;
+    
+    @TypeConversion(converter = "${package}.DateConverter")
+    @RequiredFieldValidator(message = "Please enter the date")
+    public void setDateNow(Date now) { this.now = now; }
+    public Date getDateNow() { return now; }
+   
+    @RequiredStringValidator(message = "Please enter a name", trim = true)
+    public void setName(String name) { this.name = name; }
+    public String getName() { return this.name; }
+    
+    public String execute() throws Exception {
+        return SUCCESS;
+    }
+}

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package ${package};
+
+import com.opensymphony.xwork2.ActionSupport;
+import java.util.Date;
+import com.opensymphony.xwork2.conversion.annotations.Conversion;
+import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
+
+/**
+ * 
+ */
+@Conversion()
+public class IndexAction extends ActionSupport {
+    
+    private Date now = new Date(System.currentTimeMillis());
+    
+    @TypeConversion(converter = "${package}.DateConverter")
+    public Date getDateNow() { return now; }
+    
+    public String execute() throws Exception {
+        now = new Date(System.currentTimeMillis());
+        return SUCCESS;
+    }
+}

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/applicationContext.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC 
+	"-//SPRING//DTD BEAN//EN" 
+	"http://www.springframework.org/dtd/spring-beans.dtd">
+	
+<beans>
+	<!-- Example of SAF2 action instantiated by Spring -->
+    <bean id="helloWorldAction" class="${package}.HelloWorldAction" singleton="false" />
+</beans>
+

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/globalmessages.properties

@@ -0,0 +1,5 @@
+#
+# Here is where the global I18n messages goes
+#
+
+some.key=Some Messages

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j.properties

@@ -0,0 +1,20 @@
+
+log4j.rootLogger = DEBUG, stdout
+
+
+log4j.category.com.opensymphony.sitemesh=DEBUG
+log4j.category.org.apache.struts2=INFO
+log4j.category.org.apache=INFO
+log4j.category.catalia=INFO
+
+
+
+
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold = DEBUG
+log4j.appender.stdout.Target   = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] : %m%n
+
+
+