From aae1fe00ed845db069fe9e09b8db171b80a53440 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 27 Feb 2004 06:22:27 +0000
Subject: [PATCH] MPGENAPP-6. Add struts, struts-jstl, web and web-jstl
 templates.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114759 13f79535-47bb-0310-9956-ffa450edef68
---
 .../struts-jstl/template-resources/.cvsignore |   6 +
 .../template-resources/build.properties.jboss | Bin 0 -> 490 bytes
 .../struts-jstl/template-resources/maven.xml  |   8 +
 .../template-resources/project.properties     |  20 ++
 .../template-resources/project.xml            | 253 ++++++++++++++++++
 .../src/conf/ApplicationResources.properties  |   1 +
 .../src/conf/cactus-web.xml                   |   5 +
 .../src/java/InputAction.java                 |  55 ++++
 .../src/merge/servlet-mappings.xml            |   4 +
 .../template-resources/src/merge/servlets.xml |   9 +
 .../src/merge/struts-forms.xml                |  13 +
 .../src/merge/struts-message-resources.xml    |   1 +
 .../src/test-cactus/HttpUnitTest.java         |  51 ++++
 .../src/test-cactus/StrutsTest.java           |  31 +++
 .../src/test/SanityTest.java                  |  15 ++
 .../src/webapp/WEB-INF/jsp/input.jsp          |  26 ++
 .../struts-jstl/template.properties           |   4 +
 .../struts/template-resources/.cvsignore      |   6 +
 .../template-resources/build.properties.jboss | Bin 0 -> 490 bytes
 .../struts/template-resources/maven.xml       |   8 +
 .../template-resources/project.properties     |  20 ++
 .../struts/template-resources/project.xml     | 236 ++++++++++++++++
 .../src/conf/ApplicationResources.properties  |   1 +
 .../src/conf/cactus-web.xml                   |   5 +
 .../src/java/InputAction.java                 |  55 ++++
 .../src/merge/servlet-mappings.xml            |   4 +
 .../template-resources/src/merge/servlets.xml |   9 +
 .../src/merge/struts-forms.xml                |  13 +
 .../src/merge/struts-message-resources.xml    |   1 +
 .../src/test-cactus/HttpUnitTest.java         |  51 ++++
 .../src/test-cactus/StrutsTest.java           |  31 +++
 .../src/test/SanityTest.java                  |  15 ++
 .../src/webapp/WEB-INF/jsp/input.jsp          |  21 ++
 .../struts/template.properties                |   4 +
 .../web-jstl/template-resources/.cvsignore    |   6 +
 .../template-resources/build.properties.jboss | Bin 0 -> 490 bytes
 .../web-jstl/template-resources/maven.xml     |   8 +
 .../template-resources/project.properties     |  10 +
 .../web-jstl/template-resources/project.xml   | 170 ++++++++++++
 .../src/conf/app.properties                   |   2 +
 .../src/conf/cactus-web.xml                   |   5 +
 .../src/java/HelloWorldServlet.java           |  35 +++
 .../test-cactus/HelloWorldServletTest.java    |  24 ++
 .../src/test-cactus/HttpUnitTest.java         |  52 ++++
 .../src/test/SanityTest.java                  |  15 ++
 .../template-resources/src/webapp/sample.jsp  |  10 +
 .../web-jstl/template.properties              |   4 +
 .../web/template-resources/.cvsignore         |   6 +
 .../template-resources/build.properties.jboss | Bin 0 -> 490 bytes
 .../web/template-resources/maven.xml          |   8 +
 .../web/template-resources/project.properties |   9 +
 .../web/template-resources/project.xml        | 153 +++++++++++
 .../src/conf/app.properties                   |   2 +
 .../src/conf/cactus-web.xml                   |   5 +
 .../src/java/HelloWorldServlet.java           |  35 +++
 .../test-cactus/HelloWorldServletTest.java    |  24 ++
 .../src/test-cactus/HttpUnitTest.java         |  52 ++++
 .../src/test/SanityTest.java                  |  15 ++
 .../template-resources/src/webapp/sample.jsp  |   1 +
 .../plugin-resources/web/template.properties  |   4 +
 60 files changed, 1637 insertions(+)
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/.cvsignore
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/project.properties
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/ApplicationResources.properties
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/cactus-web.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/java/InputAction.java
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlet-mappings.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlets.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-forms.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-message-resources.xml
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/HttpUnitTest.java
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/StrutsTest.java
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/test/SanityTest.java
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template-resources/src/webapp/WEB-INF/jsp/input.jsp
 create mode 100644 genapp/src/plugin-resources/struts-jstl/template.properties
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/.cvsignore
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/build.properties.jboss
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/maven.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/project.properties
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/project.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/conf/ApplicationResources.properties
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/conf/cactus-web.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/java/InputAction.java
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/merge/servlet-mappings.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/merge/servlets.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/merge/struts-forms.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/merge/struts-message-resources.xml
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/test-cactus/HttpUnitTest.java
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/test-cactus/StrutsTest.java
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/test/SanityTest.java
 create mode 100644 genapp/src/plugin-resources/struts/template-resources/src/webapp/WEB-INF/jsp/input.jsp
 create mode 100644 genapp/src/plugin-resources/struts/template.properties
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/.cvsignore
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/project.properties
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/project.xml
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/conf/app.properties
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/conf/cactus-web.xml
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/java/HelloWorldServlet.java
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HelloWorldServletTest.java
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HttpUnitTest.java
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/test/SanityTest.java
 create mode 100644 genapp/src/plugin-resources/web-jstl/template-resources/src/webapp/sample.jsp
 create mode 100644 genapp/src/plugin-resources/web-jstl/template.properties
 create mode 100644 genapp/src/plugin-resources/web/template-resources/.cvsignore
 create mode 100644 genapp/src/plugin-resources/web/template-resources/build.properties.jboss
 create mode 100644 genapp/src/plugin-resources/web/template-resources/maven.xml
 create mode 100644 genapp/src/plugin-resources/web/template-resources/project.properties
 create mode 100644 genapp/src/plugin-resources/web/template-resources/project.xml
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/conf/app.properties
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/conf/cactus-web.xml
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/java/HelloWorldServlet.java
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/test-cactus/HelloWorldServletTest.java
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/test-cactus/HttpUnitTest.java
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/test/SanityTest.java
 create mode 100644 genapp/src/plugin-resources/web/template-resources/src/webapp/sample.jsp
 create mode 100644 genapp/src/plugin-resources/web/template.properties

diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/.cvsignore b/genapp/src/plugin-resources/struts-jstl/template-resources/.cvsignore
new file mode 100644
index 00000000..0bc9c34e
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/.cvsignore
@@ -0,0 +1,6 @@
+target
+.classpath
+.project
+*.log
+build.xml
+build.properties
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss
new file mode 100644
index 0000000000000000000000000000000000000000..936f4802229bf4bf3a4fe4a368490a976e59b3b2
GIT binary patch
literal 490
zcma)2K~BRk5ab*wf3VVX9B6w&@}X)$;s8PdA#TWVCat5yw$>Ze{2n(dT*GZ=cXnoX
zR^lzd*me?H?6u)B3PxmMykl)0NamTD`|{)m$gcJ=Zq90dUv+DsnsK?2Yq|OAz&w@P
zRNrm$Z1tziCy393H$7Mc@&UvaQM8`KWz--VvVlG2*`UAS<hhy25?y_*W*d2{m_{tJ
z<Oe8P?^HT#nLL1wI9O7VOf`e$oj_<ogoe;-PF8~s!MdX=ej6q0x<|1rH99?}6dYTl
s8O<wMXKc{DDx9x<GyOv%1<02NSf@|8x~5m9^s48F_g(q)@|b5gKVAH;JOBUy

literal 0
HcmV?d00001

diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
new file mode 100644
index 00000000..ece109d8
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+  <preGoal name="java:compile">
+    <mkdir dir="target\xdoclet\webdoclet\WEB-INF" />
+  	<attainGoal name="xdoclet:webdoclet" />
+  </preGoal>
+</project>
+
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties b/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties
new file mode 100644
index 00000000..a0a92334
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties
@@ -0,0 +1,20 @@
+maven.xdoc.date=left
+maven.eclipse.classpath.include=src/test-cactus,src/conf
+maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
+maven.xdoclet.webdoclet.0=true
+maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.strutsconfigxml.0=true
+maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
+maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
+maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.strutsvalidationxml.0=true
+maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.jbosswebxml.0=true
+maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.fileset.0.include=**/*.java
+maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
+cactus.src.mergewebxml = src/conf/cactus-web.xml
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
new file mode 100644
index 00000000..a9f237f1
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+  <!-- the version of maven's project object model -->
+
+  <pomVersion>3</pomVersion>
+  <!-- a unique name for this project -->
+
+  <id>@ID@</id>
+  <groupId>@ID@</groupId>
+  <!-- a short but descriptive name for the project -->
+
+  <name>@NAME@</name>
+
+  <!-- The version of the project under development, e.g.
+       1.1, 1.2, 2.0-SNAPSHOT -->
+  <currentVersion>1.0</currentVersion>
+
+  <!-- details about the organization that 'owns' the project -->
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
+  </organization>
+  <!-- the year the project started -->
+
+  <inceptionYear>2004</inceptionYear>
+  <package>@PACKAGE@</package>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <description>A collection of example projects showing how to use maven in different situations</description>
+  <!-- a short description of what the project does -->
+
+  <shortDescription>How to use maven in different situations</shortDescription>
+  <!-- the project home page -->
+
+  <url>http://maven.apache.org/reference/plugins/examples/</url>
+  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+  <!-- the version control repository and http url for online access
+       the connection element has the form:
+       scm:<system>:<system specific connection string> -->
+
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
+  </repository>
+  <!-- any mailing lists for the project -->
+
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers>
+  </developers>
+  <!-- jar files the project is dependent on -->
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.8.1</version>
+    </dependency>
+    
+    <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <id>jstl</id>
+      <version>1.0.2</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>      
+    </dependency>
+    
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.0.4</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>      
+    </dependency>
+    
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus</artifactId>
+      <version>13-1.6dev-20040115</version>
+    </dependency>
+
+     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- Struts dependencies -->
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.1</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-bean</artifactId>
+      <version>1.1</version>
+      <type>tld</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-html</artifactId>
+      <version>1.1</version>
+      <type>tld</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-logic</artifactId>
+      <version>1.1</version>
+      <type>tld</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>strutstestcase</groupId>
+      <artifactId>strutstest</artifactId>
+      <version>2.1.0</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.5</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.0</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- XDoclet dependencies -->
+    <dependency>
+      <id>xdoclet</id>
+      <version>1.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-web-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+    
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-ejb-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-apache-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xjavadoc</artifactId>
+      <version>1.0.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <!-- HttpUnit dependencies -->
+   <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.5.4</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>jtidy</groupId>
+      <artifactId>jtidy</artifactId>
+      <version>4aug2000r7-dev</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+  </dependencies>
+
+  <build>
+    <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+      <excludes>
+        <exclude>**/NaughtyTest.java</exclude>
+      </excludes>
+    </unitTest>
+    <resources>
+      <resource>
+        <directory>src/conf</directory>
+        <includes>
+          <include>*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/ApplicationResources.properties b/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/ApplicationResources.properties
new file mode 100644
index 00000000..72b211cc
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/ApplicationResources.properties
@@ -0,0 +1 @@
+title.page=The title @PACKAGE@
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/cactus-web.xml
new file mode 100644
index 00000000..1300e433
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/cactus-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>
+</web-app>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/java/InputAction.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/java/InputAction.java
new file mode 100644
index 00000000..9743507f
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/java/InputAction.java
@@ -0,0 +1,55 @@
+package @PACKAGE@;
+
+import java.io.IOException;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
+
+/**
+ * This is a simple struts action that simply redirects the input back to itself.  It
+ * also sets a bean value to the current date.
+ * 
+ * @struts.action
+ * 	name="TestForm"
+ * 	 path="/TestInput"
+ * @struts.action-forward 
+ * 	name="success" 
+ * 	path="/WEB-INF/jsp/input.jsp"
+ * 
+ * @author <a href="mailto:trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: InputAction.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $ 
+ */
+public class InputAction extends Action {
+    /**
+     * Performs the simple action
+     * 
+     * @param mapping
+     *                   the action mappings where you find the return value of the
+     *                   forward
+     * @param actionForm
+     *                   the action form used, in this example it will be an instance
+     *                   of the DynaActionForm class
+     * @param request
+     *                   the HTTP servlet request
+     * @param response
+     *                   the HTTP servlet response
+     */
+    public ActionForward perform(ActionMapping mapping, ActionForm actionForm,
+            HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException {
+        if (actionForm != null) {
+            DynaActionForm form = (DynaActionForm) actionForm;
+            form.set("theDate", new Date());
+        }
+        return (mapping.findForward("success"));
+    }
+}
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlet-mappings.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlet-mappings.xml
new file mode 100644
index 00000000..37b247eb
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlet-mappings.xml
@@ -0,0 +1,4 @@
+<servlet-mapping>
+  <servlet-name>action</servlet-name>
+  <url-pattern>*.do</url-pattern>
+</servlet-mapping>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlets.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlets.xml
new file mode 100644
index 00000000..08d4e9b7
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlets.xml
@@ -0,0 +1,9 @@
+  <servlet>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts-config.xml</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-forms.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-forms.xml
new file mode 100644
index 00000000..41298607
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-forms.xml
@@ -0,0 +1,13 @@
+<form-bean 
+    name="TestForm" 
+    type="org.apache.struts.action.DynaActionForm">
+    <form-property 
+        name="givenName" 
+        type="java.lang.String" />
+    <form-property 
+        name="familyName" 
+        type="java.lang.String" />
+    <form-property 
+        name="theDate" 
+        type="java.util.Date" />
+</form-bean>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-message-resources.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-message-resources.xml
new file mode 100644
index 00000000..e53ea563
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-message-resources.xml
@@ -0,0 +1 @@
+<message-resources parameter="ApplicationResources"/>
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/HttpUnitTest.java
new file mode 100644
index 00000000..0c445fbd
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/HttpUnitTest.java
@@ -0,0 +1,51 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+
+/**
+ * This tests the site using HttpUnit
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id: HttpUnitTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $
+ */
+public class HttpUnitTest extends ServletTestCase {
+    /**
+     * This is a helper method to create the URL string for the initial web
+     * conversation request
+     * 
+     * @param relativeUrl
+     *                   the relative URL including the leading"/"
+     * @return the context url with the relative URL appended to it
+     */
+    private String requestUrl(String relativeUrl) {
+        StringBuffer url = request.getRequestURL();
+        url.delete(url.lastIndexOf("/"), url.length());
+        url.append(relativeUrl);
+        return url.toString();
+    }
+
+    /**
+     * This tests if the sample struts form works properly
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testStrutsPages() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/TestInput.do"));
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            form.setParameter("givenName", "Archie");
+            form.setParameter("familyName", "Trajano");
+            form.submit();
+        }
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            assertEquals("Archie", form.getParameterValue("givenName"));
+            assertEquals("Trajano", form.getParameterValue("familyName"));
+        }
+    }
+};
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/StrutsTest.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/StrutsTest.java
new file mode 100644
index 00000000..c55ad204
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/StrutsTest.java
@@ -0,0 +1,31 @@
+package @PACKAGE@;
+
+import servletunit.struts.CactusStrutsTestCase;
+
+/**
+ * This tests the functionality of the StrutsTestCase
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id: StrutsTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $
+ */
+public class StrutsTest extends CactusStrutsTestCase {
+
+    /**
+     * Required constructor for CactusStrutsTestCase
+     * 
+     * @param name
+     *                   name of the test
+     */
+    public StrutsTest(String name) {
+        super(name);
+    }
+
+    public void testInputForm() throws Exception {
+        setRequestPathInfo("/TestInput.do");
+        addRequestParameter("givenName", "Archie");
+        addRequestParameter("familyName", "Trajano");
+        actionPerform();
+        verifyForward("success");
+        verifyNoActionErrors();
+    }
+}
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test/SanityTest.java
new file mode 100644
index 00000000..e931ebe1
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test/SanityTest.java
@@ -0,0 +1,15 @@
+package @PACKAGE@;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a simple JUnit test case to ensure that the environment is okay.
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: SanityTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $
+ */
+public class SanityTest extends TestCase {
+  public void testSanity() {
+    assertEquals( "test", "test" );
+  }
+}
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/webapp/WEB-INF/jsp/input.jsp b/genapp/src/plugin-resources/struts-jstl/template-resources/src/webapp/WEB-INF/jsp/input.jsp
new file mode 100644
index 00000000..fff4fd8d
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/src/webapp/WEB-INF/jsp/input.jsp
@@ -0,0 +1,26 @@
+<%@ page contentType="text/html; charset=utf-8" %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jstl/xml" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jstl/sql" %>
+
+<%@ taglib uri="/WEB-INF/tld/struts-bean-1.1.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tld/struts-html-1.1.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tld/struts-logic-1.1.tld" prefix="logic" %>
+
+<html:html xhtml="true">
+<head>
+	<html:base/>
+	<title><bean:message key="title.page"/></title>
+</head>
+
+<body>
+	<p>The name is <bean:write name="TestForm"  property="familyName"/>, <bean:write name="TestForm"  property="givenName"/> on <bean:write name="TestForm"  property="theDate"/></p>
+	<html:form action="/TestInput">
+	 <html:text  property="givenName" size="16"/>
+	 <html:text  property="familyName" size="16"/>
+	 <html:submit/>
+	</html:form>
+</body>
+</html:html>
diff --git a/genapp/src/plugin-resources/struts-jstl/template.properties b/genapp/src/plugin-resources/struts-jstl/template.properties
new file mode 100644
index 00000000..17ccc68a
--- /dev/null
+++ b/genapp/src/plugin-resources/struts-jstl/template.properties
@@ -0,0 +1,4 @@
+maven.genapp.repackage=java,test,test-cactus
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**
+
+maven.genapp.default.package=example.web
diff --git a/genapp/src/plugin-resources/struts/template-resources/.cvsignore b/genapp/src/plugin-resources/struts/template-resources/.cvsignore
new file mode 100644
index 00000000..0bc9c34e
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/.cvsignore
@@ -0,0 +1,6 @@
+target
+.classpath
+.project
+*.log
+build.xml
+build.properties
diff --git a/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss
new file mode 100644
index 0000000000000000000000000000000000000000..936f4802229bf4bf3a4fe4a368490a976e59b3b2
GIT binary patch
literal 490
zcma)2K~BRk5ab*wf3VVX9B6w&@}X)$;s8PdA#TWVCat5yw$>Ze{2n(dT*GZ=cXnoX
zR^lzd*me?H?6u)B3PxmMykl)0NamTD`|{)m$gcJ=Zq90dUv+DsnsK?2Yq|OAz&w@P
zRNrm$Z1tziCy393H$7Mc@&UvaQM8`KWz--VvVlG2*`UAS<hhy25?y_*W*d2{m_{tJ
z<Oe8P?^HT#nLL1wI9O7VOf`e$oj_<ogoe;-PF8~s!MdX=ej6q0x<|1rH99?}6dYTl
s8O<wMXKc{DDx9x<GyOv%1<02NSf@|8x~5m9^s48F_g(q)@|b5gKVAH;JOBUy

literal 0
HcmV?d00001

diff --git a/genapp/src/plugin-resources/struts/template-resources/maven.xml b/genapp/src/plugin-resources/struts/template-resources/maven.xml
new file mode 100644
index 00000000..ece109d8
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/maven.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+  <preGoal name="java:compile">
+    <mkdir dir="target\xdoclet\webdoclet\WEB-INF" />
+  	<attainGoal name="xdoclet:webdoclet" />
+  </preGoal>
+</project>
+
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.properties b/genapp/src/plugin-resources/struts/template-resources/project.properties
new file mode 100644
index 00000000..65a1d505
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/project.properties
@@ -0,0 +1,20 @@
+maven.xdoc.date=left
+maven.eclipse.classpath.include=src/test-cactus,src/conf
+maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
+maven.xdoclet.webdoclet.0=true
+maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.strutsconfigxml.0=true
+maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
+maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
+maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+#maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=target
+maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.strutsvalidationxml.0=true
+maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.jbosswebxml.0=true
+maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.fileset.0.include=**/*.java
+cactus.src.mergewebxml = src/conf/cactus-web.xml
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml
new file mode 100644
index 00000000..cc0c25fe
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/project.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+  <!-- the version of maven's project object model -->
+
+  <pomVersion>3</pomVersion>
+  <!-- a unique name for this project -->
+
+  <id>@ID@</id>
+  <groupId>@ID@</groupId>
+  <!-- a short but descriptive name for the project -->
+
+  <name>@NAME@</name>
+
+  <!-- The version of the project under development, e.g.
+       1.1, 1.2, 2.0-SNAPSHOT -->
+  <currentVersion>1.0</currentVersion>
+
+  <!-- details about the organization that 'owns' the project -->
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
+  </organization>
+  <!-- the year the project started -->
+
+  <inceptionYear>2004</inceptionYear>
+  <package>@PACKAGE@</package>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <description>A collection of example projects showing how to use maven in different situations</description>
+  <!-- a short description of what the project does -->
+
+  <shortDescription>How to use maven in different situations</shortDescription>
+  <!-- the project home page -->
+
+  <url>http://maven.apache.org/reference/plugins/examples/</url>
+  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+  <!-- the version control repository and http url for online access
+       the connection element has the form:
+       scm:<system>:<system specific connection string> -->
+
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
+  </repository>
+  <!-- any mailing lists for the project -->
+
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers>
+  </developers>
+  <!-- jar files the project is dependent on -->
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.8.1</version>
+    </dependency>
+    
+    <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus</artifactId>
+      <version>13-1.6dev-20040115</version>
+    </dependency>
+
+     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- Struts dependencies -->
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.1</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-bean</artifactId>
+      <version>1.1</version>
+      <type>tld</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-html</artifactId>
+      <version>1.1</version>
+      <type>tld</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-logic</artifactId>
+      <version>1.1</version>
+      <type>tld</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>strutstestcase</groupId>
+      <artifactId>strutstest</artifactId>
+      <version>2.1.0</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.5</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.0</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- XDoclet dependencies -->
+    <dependency>
+      <id>xdoclet</id>
+      <version>1.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-web-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+    
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-ejb-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-apache-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xjavadoc</artifactId>
+      <version>1.0.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <!-- HttpUnit dependencies -->
+   <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.5.4</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>jtidy</groupId>
+      <artifactId>jtidy</artifactId>
+      <version>4aug2000r7-dev</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+  </dependencies>
+
+  <build>
+    <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+      <excludes>
+        <exclude>**/NaughtyTest.java</exclude>
+      </excludes>
+    </unitTest>
+    <resources>
+      <resource>
+        <directory>src/conf</directory>
+        <includes>
+          <include>*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/conf/ApplicationResources.properties b/genapp/src/plugin-resources/struts/template-resources/src/conf/ApplicationResources.properties
new file mode 100644
index 00000000..72b211cc
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/conf/ApplicationResources.properties
@@ -0,0 +1 @@
+title.page=The title @PACKAGE@
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/struts/template-resources/src/conf/cactus-web.xml
new file mode 100644
index 00000000..1300e433
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/conf/cactus-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>
+</web-app>
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/java/InputAction.java b/genapp/src/plugin-resources/struts/template-resources/src/java/InputAction.java
new file mode 100644
index 00000000..9743507f
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/java/InputAction.java
@@ -0,0 +1,55 @@
+package @PACKAGE@;
+
+import java.io.IOException;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
+
+/**
+ * This is a simple struts action that simply redirects the input back to itself.  It
+ * also sets a bean value to the current date.
+ * 
+ * @struts.action
+ * 	name="TestForm"
+ * 	 path="/TestInput"
+ * @struts.action-forward 
+ * 	name="success" 
+ * 	path="/WEB-INF/jsp/input.jsp"
+ * 
+ * @author <a href="mailto:trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: InputAction.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $ 
+ */
+public class InputAction extends Action {
+    /**
+     * Performs the simple action
+     * 
+     * @param mapping
+     *                   the action mappings where you find the return value of the
+     *                   forward
+     * @param actionForm
+     *                   the action form used, in this example it will be an instance
+     *                   of the DynaActionForm class
+     * @param request
+     *                   the HTTP servlet request
+     * @param response
+     *                   the HTTP servlet response
+     */
+    public ActionForward perform(ActionMapping mapping, ActionForm actionForm,
+            HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException {
+        if (actionForm != null) {
+            DynaActionForm form = (DynaActionForm) actionForm;
+            form.set("theDate", new Date());
+        }
+        return (mapping.findForward("success"));
+    }
+}
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/servlet-mappings.xml b/genapp/src/plugin-resources/struts/template-resources/src/merge/servlet-mappings.xml
new file mode 100644
index 00000000..37b247eb
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/merge/servlet-mappings.xml
@@ -0,0 +1,4 @@
+<servlet-mapping>
+  <servlet-name>action</servlet-name>
+  <url-pattern>*.do</url-pattern>
+</servlet-mapping>
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/servlets.xml b/genapp/src/plugin-resources/struts/template-resources/src/merge/servlets.xml
new file mode 100644
index 00000000..08d4e9b7
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/merge/servlets.xml
@@ -0,0 +1,9 @@
+  <servlet>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts-config.xml</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-forms.xml b/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-forms.xml
new file mode 100644
index 00000000..41298607
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-forms.xml
@@ -0,0 +1,13 @@
+<form-bean 
+    name="TestForm" 
+    type="org.apache.struts.action.DynaActionForm">
+    <form-property 
+        name="givenName" 
+        type="java.lang.String" />
+    <form-property 
+        name="familyName" 
+        type="java.lang.String" />
+    <form-property 
+        name="theDate" 
+        type="java.util.Date" />
+</form-bean>
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-message-resources.xml b/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-message-resources.xml
new file mode 100644
index 00000000..e53ea563
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-message-resources.xml
@@ -0,0 +1 @@
+<message-resources parameter="ApplicationResources"/>
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/HttpUnitTest.java
new file mode 100644
index 00000000..0c445fbd
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/HttpUnitTest.java
@@ -0,0 +1,51 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+
+/**
+ * This tests the site using HttpUnit
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id: HttpUnitTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $
+ */
+public class HttpUnitTest extends ServletTestCase {
+    /**
+     * This is a helper method to create the URL string for the initial web
+     * conversation request
+     * 
+     * @param relativeUrl
+     *                   the relative URL including the leading"/"
+     * @return the context url with the relative URL appended to it
+     */
+    private String requestUrl(String relativeUrl) {
+        StringBuffer url = request.getRequestURL();
+        url.delete(url.lastIndexOf("/"), url.length());
+        url.append(relativeUrl);
+        return url.toString();
+    }
+
+    /**
+     * This tests if the sample struts form works properly
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testStrutsPages() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/TestInput.do"));
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            form.setParameter("givenName", "Archie");
+            form.setParameter("familyName", "Trajano");
+            form.submit();
+        }
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            assertEquals("Archie", form.getParameterValue("givenName"));
+            assertEquals("Trajano", form.getParameterValue("familyName"));
+        }
+    }
+};
\ No newline at end of file
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/StrutsTest.java b/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/StrutsTest.java
new file mode 100644
index 00000000..c55ad204
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/StrutsTest.java
@@ -0,0 +1,31 @@
+package @PACKAGE@;
+
+import servletunit.struts.CactusStrutsTestCase;
+
+/**
+ * This tests the functionality of the StrutsTestCase
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id: StrutsTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $
+ */
+public class StrutsTest extends CactusStrutsTestCase {
+
+    /**
+     * Required constructor for CactusStrutsTestCase
+     * 
+     * @param name
+     *                   name of the test
+     */
+    public StrutsTest(String name) {
+        super(name);
+    }
+
+    public void testInputForm() throws Exception {
+        setRequestPathInfo("/TestInput.do");
+        addRequestParameter("givenName", "Archie");
+        addRequestParameter("familyName", "Trajano");
+        actionPerform();
+        verifyForward("success");
+        verifyNoActionErrors();
+    }
+}
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/struts/template-resources/src/test/SanityTest.java
new file mode 100644
index 00000000..e931ebe1
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/test/SanityTest.java
@@ -0,0 +1,15 @@
+package @PACKAGE@;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a simple JUnit test case to ensure that the environment is okay.
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: SanityTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $
+ */
+public class SanityTest extends TestCase {
+  public void testSanity() {
+    assertEquals( "test", "test" );
+  }
+}
diff --git a/genapp/src/plugin-resources/struts/template-resources/src/webapp/WEB-INF/jsp/input.jsp b/genapp/src/plugin-resources/struts/template-resources/src/webapp/WEB-INF/jsp/input.jsp
new file mode 100644
index 00000000..483a3b83
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template-resources/src/webapp/WEB-INF/jsp/input.jsp
@@ -0,0 +1,21 @@
+<%@ page contentType="text/html; charset=utf-8" %>
+
+<%@ taglib uri="/WEB-INF/tld/struts-bean-1.1.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tld/struts-html-1.1.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tld/struts-logic-1.1.tld" prefix="logic" %>
+
+<html:html xhtml="true">
+<head>
+	<html:base/>
+	<title><bean:message key="title.page"/></title>
+</head>
+
+<body>
+	<p>The name is <bean:write name="TestForm"  property="familyName"/>, <bean:write name="TestForm"  property="givenName"/> on <bean:write name="TestForm"  property="theDate"/></p>
+	<html:form action="/TestInput">
+	 <html:text  property="givenName" size="16"/>
+	 <html:text  property="familyName" size="16"/>
+	 <html:submit/>
+	</html:form>
+</body>
+</html:html>
diff --git a/genapp/src/plugin-resources/struts/template.properties b/genapp/src/plugin-resources/struts/template.properties
new file mode 100644
index 00000000..17ccc68a
--- /dev/null
+++ b/genapp/src/plugin-resources/struts/template.properties
@@ -0,0 +1,4 @@
+maven.genapp.repackage=java,test,test-cactus
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**
+
+maven.genapp.default.package=example.web
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/.cvsignore b/genapp/src/plugin-resources/web-jstl/template-resources/.cvsignore
new file mode 100644
index 00000000..0bc9c34e
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/.cvsignore
@@ -0,0 +1,6 @@
+target
+.classpath
+.project
+*.log
+build.xml
+build.properties
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss b/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss
new file mode 100644
index 0000000000000000000000000000000000000000..936f4802229bf4bf3a4fe4a368490a976e59b3b2
GIT binary patch
literal 490
zcma)2K~BRk5ab*wf3VVX9B6w&@}X)$;s8PdA#TWVCat5yw$>Ze{2n(dT*GZ=cXnoX
zR^lzd*me?H?6u)B3PxmMykl)0NamTD`|{)m$gcJ=Zq90dUv+DsnsK?2Yq|OAz&w@P
zRNrm$Z1tziCy393H$7Mc@&UvaQM8`KWz--VvVlG2*`UAS<hhy25?y_*W*d2{m_{tJ
z<Oe8P?^HT#nLL1wI9O7VOf`e$oj_<ogoe;-PF8~s!MdX=ej6q0x<|1rH99?}6dYTl
s8O<wMXKc{DDx9x<GyOv%1<02NSf@|8x~5m9^s48F_g(q)@|b5gKVAH;JOBUy

literal 0
HcmV?d00001

diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml b/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
new file mode 100644
index 00000000..ece109d8
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+  <preGoal name="java:compile">
+    <mkdir dir="target\xdoclet\webdoclet\WEB-INF" />
+  	<attainGoal name="xdoclet:webdoclet" />
+  </preGoal>
+</project>
+
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.properties b/genapp/src/plugin-resources/web-jstl/template-resources/project.properties
new file mode 100644
index 00000000..1f41da45
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.properties
@@ -0,0 +1,10 @@
+maven.xdoc.date=left
+maven.eclipse.classpath.include=src/test-cactus
+maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
+maven.xdoclet.webdoclet.0=true
+maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
+cactus.src.mergewebxml = src/conf/cactus-web.xml
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
new file mode 100644
index 00000000..d4b15220
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+  <!-- the version of maven's project object model -->
+
+  <pomVersion>3</pomVersion>
+  <!-- a unique name for this project -->
+
+  <id>@ID@</id>
+  <groupId>@ID@</groupId>
+  <!-- a short but descriptive name for the project -->
+
+  <name>@NAME@</name>
+
+  <!-- The version of the project under development, e.g.
+       1.1, 1.2, 2.0-SNAPSHOT -->
+  <currentVersion>1.0</currentVersion>
+
+  <!-- details about the organization that 'owns' the project -->
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
+  </organization>
+  <!-- the year the project started -->
+
+  <inceptionYear>2004</inceptionYear>
+  <package>@PACKAGE@</package>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <description>A collection of example projects showing how to use maven in different situations</description>
+  <!-- a short description of what the project does -->
+
+  <shortDescription>How to use maven in different situations</shortDescription>
+  <!-- the project home page -->
+
+  <url>http://maven.apache.org/reference/plugins/examples/</url>
+  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+  <!-- the version control repository and http url for online access
+       the connection element has the form:
+       scm:<system>:<system specific connection string> -->
+
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
+  </repository>
+  <!-- any mailing lists for the project -->
+
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers>
+  </developers>
+  <!-- jar files the project is dependent on -->
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.8.1</version>
+    </dependency>
+    
+    <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <id>jstl</id>
+      <version>1.0.2</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>      
+    </dependency>
+    
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.0.4</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>      
+    </dependency>
+    
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus</artifactId>
+      <version>13-1.6dev-20040115</version>
+    </dependency>
+
+     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- XDoclet dependencies -->
+    <dependency>
+      <id>xdoclet</id>
+      <version>1.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-web-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+    
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-ejb-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+    
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xjavadoc</artifactId>
+      <version>1.0.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <!-- HttpUnit dependencies -->
+   <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.5.4</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>jtidy</groupId>
+      <artifactId>jtidy</artifactId>
+      <version>4aug2000r7-dev</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+  </dependencies>
+
+  <build>
+    <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+      <excludes>
+        <exclude>**/NaughtyTest.java</exclude>
+      </excludes>
+    </unitTest>
+    <resources>
+      <resource>
+        <directory>src/conf</directory>
+        <includes>
+          <include>*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/app.properties
new file mode 100644
index 00000000..f2429655
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/app.properties
@@ -0,0 +1,2 @@
+# Sample app properties.
+foo=bar
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/cactus-web.xml
new file mode 100644
index 00000000..1300e433
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/cactus-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>
+</web-app>
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/java/HelloWorldServlet.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/java/HelloWorldServlet.java
new file mode 100644
index 00000000..f8aa393c
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/java/HelloWorldServlet.java
@@ -0,0 +1,35 @@
+package @PACKAGE@;
+
+import java.io.IOException;
+import java.util.Date;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * This is a sample servlet, typically you would not use this, but it is useful
+ * for testing the sanity of your web application configuration.
+ * 
+ * @web.servlet name="HelloWorld"
+ * @web.servlet-mapping url-pattern="/HelloWorld"
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: HelloWorldServlet.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class HelloWorldServlet extends HttpServlet {
+    /**
+     * This prints out the standard "Hello world" message with a date stamp.
+     * 
+     * @param request
+     *                   the HTTP request object
+     * @param response
+     *                   the HTTP response object
+     * @throws IOException
+     *                    thrown when there is a problem getting the writer
+     */
+    protected void doGet(HttpServletRequest request,
+            HttpServletResponse response) throws IOException {
+        response.getWriter().println("Hello world on " + new Date());
+    }
+}
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HelloWorldServletTest.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HelloWorldServletTest.java
new file mode 100644
index 00000000..5282547e
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HelloWorldServletTest.java
@@ -0,0 +1,24 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+import org.apache.cactus.WebResponse;
+
+import @PACKAGE@.HelloWorldServlet;
+
+/**
+ * This tests that the HelloWorld servlet is functioning
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: HelloWorldServletTest.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class HelloWorldServletTest extends ServletTestCase {
+
+    public void testHelloWorld() throws Exception {
+        HelloWorldServlet servlet = new HelloWorldServlet();        
+        servlet.doGet(request,response);
+    }
+    
+    public void endHelloWorld(WebResponse response) {
+        assertTrue(response.getText().startsWith("Hello world on"));
+    }
+}
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HttpUnitTest.java
new file mode 100644
index 00000000..eb637f9f
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HttpUnitTest.java
@@ -0,0 +1,52 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+
+import com.meterware.httpunit.WebConversation;
+
+/**
+ * This tests the system using the HttpUnit
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: HttpUnitTest.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class HttpUnitTest extends ServletTestCase {
+
+    /**
+     * This tests if the Hello World servlet provides the correct output
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testHelloWorldServlet() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/HelloWorld"));
+        assertTrue(wc.getCurrentPage().getText().startsWith("Hello world on"));
+    }
+
+    /**
+     * This tests if the Hello World JSP provides the correct output
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testHelloWorldJsp() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/sample.jsp"));
+        assertTrue(wc.getCurrentPage().getText().indexOf("Hello world JSP on") != -1);
+    }
+
+    /**
+     * This is a helper method to create the URL string for the initial web
+     * conversation request
+     * 
+     * @param relativeUrl
+     *                   the relative URL including the leading"/"
+     * @return the context url with the relative URL appended to it
+     */
+    private String requestUrl(String relativeUrl) {
+        StringBuffer url = request.getRequestURL();
+        url.delete(url.lastIndexOf("/"), url.length());
+        url.append(relativeUrl);
+        return url.toString();
+    }
+}
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/test/SanityTest.java
new file mode 100644
index 00000000..2a7fe06b
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/test/SanityTest.java
@@ -0,0 +1,15 @@
+package @PACKAGE@;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a simple JUnit test case to ensure that the environment is okay.
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: SanityTest.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class SanityTest extends TestCase {
+  public void testSanity() {
+    assertEquals( "test", "test" );
+  }
+}
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/webapp/sample.jsp b/genapp/src/plugin-resources/web-jstl/template-resources/src/webapp/sample.jsp
new file mode 100644
index 00000000..24de79b6
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/src/webapp/sample.jsp
@@ -0,0 +1,10 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jstl/xml" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jstl/sql" %>
+<jsp:useBean id="now" class="java.util.Date" />
+<html>
+<body>
+Hello world JSP on<fmt:formatDate value="${now}" dateStyle="full" />
+</body>
+</html>
diff --git a/genapp/src/plugin-resources/web-jstl/template.properties b/genapp/src/plugin-resources/web-jstl/template.properties
new file mode 100644
index 00000000..f05e75d2
--- /dev/null
+++ b/genapp/src/plugin-resources/web-jstl/template.properties
@@ -0,0 +1,4 @@
+maven.genapp.repackage=java,test,test-cactus
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml
+
+maven.genapp.default.package=example.web
diff --git a/genapp/src/plugin-resources/web/template-resources/.cvsignore b/genapp/src/plugin-resources/web/template-resources/.cvsignore
new file mode 100644
index 00000000..0bc9c34e
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/.cvsignore
@@ -0,0 +1,6 @@
+target
+.classpath
+.project
+*.log
+build.xml
+build.properties
diff --git a/genapp/src/plugin-resources/web/template-resources/build.properties.jboss b/genapp/src/plugin-resources/web/template-resources/build.properties.jboss
new file mode 100644
index 0000000000000000000000000000000000000000..936f4802229bf4bf3a4fe4a368490a976e59b3b2
GIT binary patch
literal 490
zcma)2K~BRk5ab*wf3VVX9B6w&@}X)$;s8PdA#TWVCat5yw$>Ze{2n(dT*GZ=cXnoX
zR^lzd*me?H?6u)B3PxmMykl)0NamTD`|{)m$gcJ=Zq90dUv+DsnsK?2Yq|OAz&w@P
zRNrm$Z1tziCy393H$7Mc@&UvaQM8`KWz--VvVlG2*`UAS<hhy25?y_*W*d2{m_{tJ
z<Oe8P?^HT#nLL1wI9O7VOf`e$oj_<ogoe;-PF8~s!MdX=ej6q0x<|1rH99?}6dYTl
s8O<wMXKc{DDx9x<GyOv%1<02NSf@|8x~5m9^s48F_g(q)@|b5gKVAH;JOBUy

literal 0
HcmV?d00001

diff --git a/genapp/src/plugin-resources/web/template-resources/maven.xml b/genapp/src/plugin-resources/web/template-resources/maven.xml
new file mode 100644
index 00000000..ece109d8
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/maven.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+  <preGoal name="java:compile">
+    <mkdir dir="target\xdoclet\webdoclet\WEB-INF" />
+  	<attainGoal name="xdoclet:webdoclet" />
+  </preGoal>
+</project>
+
diff --git a/genapp/src/plugin-resources/web/template-resources/project.properties b/genapp/src/plugin-resources/web/template-resources/project.properties
new file mode 100644
index 00000000..b457bc87
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/project.properties
@@ -0,0 +1,9 @@
+maven.xdoc.date=left
+maven.eclipse.classpath.include=src/test-cactus
+maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
+maven.xdoclet.webdoclet.0=true
+maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
+maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+cactus.src.mergewebxml = src/conf/cactus-web.xml
diff --git a/genapp/src/plugin-resources/web/template-resources/project.xml b/genapp/src/plugin-resources/web/template-resources/project.xml
new file mode 100644
index 00000000..d3cbf6f1
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/project.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+  <!-- the version of maven's project object model -->
+
+  <pomVersion>3</pomVersion>
+  <!-- a unique name for this project -->
+
+  <id>@ID@</id>
+  <groupId>@ID@</groupId>
+  <!-- a short but descriptive name for the project -->
+
+  <name>@NAME@</name>
+
+  <!-- The version of the project under development, e.g.
+       1.1, 1.2, 2.0-SNAPSHOT -->
+  <currentVersion>1.0</currentVersion>
+
+  <!-- details about the organization that 'owns' the project -->
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
+  </organization>
+  <!-- the year the project started -->
+
+  <inceptionYear>2004</inceptionYear>
+  <package>@PACKAGE@</package>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <description>A collection of example projects showing how to use maven in different situations</description>
+  <!-- a short description of what the project does -->
+
+  <shortDescription>How to use maven in different situations</shortDescription>
+  <!-- the project home page -->
+
+  <url>http://maven.apache.org/reference/plugins/examples/</url>
+  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+  <!-- the version control repository and http url for online access
+       the connection element has the form:
+       scm:<system>:<system specific connection string> -->
+
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
+  </repository>
+  <!-- any mailing lists for the project -->
+
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers>
+  </developers>
+  <!-- jar files the project is dependent on -->
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.8.1</version>
+    </dependency>
+    
+    <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus</artifactId>
+      <version>13-1.6dev-20040115</version>
+    </dependency>
+
+     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- XDoclet dependencies -->
+    <dependency>
+      <id>xdoclet</id>
+      <version>1.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-web-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+    
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet-ejb-module</artifactId>
+      <version>1.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+    
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>xjavadoc</artifactId>
+      <version>1.0.2</version>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency>
+
+    <!-- HttpUnit dependencies -->
+   <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.5.4</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>jtidy</groupId>
+      <artifactId>jtidy</artifactId>
+      <version>4aug2000r7-dev</version>
+      <properties>
+        <cactus.bundle>true</cactus.bundle>
+      </properties>
+    </dependency>
+    
+  </dependencies>
+
+  <build>
+    <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+      <excludes>
+        <exclude>**/NaughtyTest.java</exclude>
+      </excludes>
+    </unitTest>
+    <resources>
+      <resource>
+        <directory>src/conf</directory>
+        <includes>
+          <include>*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/genapp/src/plugin-resources/web/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/web/template-resources/src/conf/app.properties
new file mode 100644
index 00000000..f2429655
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/conf/app.properties
@@ -0,0 +1,2 @@
+# Sample app properties.
+foo=bar
diff --git a/genapp/src/plugin-resources/web/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/web/template-resources/src/conf/cactus-web.xml
new file mode 100644
index 00000000..1300e433
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/conf/cactus-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>
+</web-app>
diff --git a/genapp/src/plugin-resources/web/template-resources/src/java/HelloWorldServlet.java b/genapp/src/plugin-resources/web/template-resources/src/java/HelloWorldServlet.java
new file mode 100644
index 00000000..f8aa393c
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/java/HelloWorldServlet.java
@@ -0,0 +1,35 @@
+package @PACKAGE@;
+
+import java.io.IOException;
+import java.util.Date;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * This is a sample servlet, typically you would not use this, but it is useful
+ * for testing the sanity of your web application configuration.
+ * 
+ * @web.servlet name="HelloWorld"
+ * @web.servlet-mapping url-pattern="/HelloWorld"
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: HelloWorldServlet.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class HelloWorldServlet extends HttpServlet {
+    /**
+     * This prints out the standard "Hello world" message with a date stamp.
+     * 
+     * @param request
+     *                   the HTTP request object
+     * @param response
+     *                   the HTTP response object
+     * @throws IOException
+     *                    thrown when there is a problem getting the writer
+     */
+    protected void doGet(HttpServletRequest request,
+            HttpServletResponse response) throws IOException {
+        response.getWriter().println("Hello world on " + new Date());
+    }
+}
diff --git a/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HelloWorldServletTest.java b/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HelloWorldServletTest.java
new file mode 100644
index 00000000..5282547e
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HelloWorldServletTest.java
@@ -0,0 +1,24 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+import org.apache.cactus.WebResponse;
+
+import @PACKAGE@.HelloWorldServlet;
+
+/**
+ * This tests that the HelloWorld servlet is functioning
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: HelloWorldServletTest.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class HelloWorldServletTest extends ServletTestCase {
+
+    public void testHelloWorld() throws Exception {
+        HelloWorldServlet servlet = new HelloWorldServlet();        
+        servlet.doGet(request,response);
+    }
+    
+    public void endHelloWorld(WebResponse response) {
+        assertTrue(response.getText().startsWith("Hello world on"));
+    }
+}
diff --git a/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HttpUnitTest.java
new file mode 100644
index 00000000..df3c3513
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HttpUnitTest.java
@@ -0,0 +1,52 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+
+import com.meterware.httpunit.WebConversation;
+
+/**
+ * This tests the system using the HttpUnit
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: HttpUnitTest.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class HttpUnitTest extends ServletTestCase {
+
+    /**
+     * This tests if the Hello World servlet provides the correct output
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testHelloWorldServlet() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/HelloWorld"));
+        assertTrue(wc.getCurrentPage().getText().startsWith("Hello world on"));
+    }
+
+    /**
+     * This tests if the Hello World JSP provides the correct output
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testHelloWorldJsp() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/sample.jsp"));
+        assertTrue(wc.getCurrentPage().getText().startsWith("Hello world JSP on"));
+    }
+
+    /**
+     * This is a helper method to create the URL string for the initial web
+     * conversation request
+     * 
+     * @param relativeUrl
+     *                   the relative URL including the leading"/"
+     * @return the context url with the relative URL appended to it
+     */
+    private String requestUrl(String relativeUrl) {
+        StringBuffer url = request.getRequestURL();
+        url.delete(url.lastIndexOf("/"), url.length());
+        url.append(relativeUrl);
+        return url.toString();
+    }
+}
diff --git a/genapp/src/plugin-resources/web/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/web/template-resources/src/test/SanityTest.java
new file mode 100644
index 00000000..2a7fe06b
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/test/SanityTest.java
@@ -0,0 +1,15 @@
+package @PACKAGE@;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a simple JUnit test case to ensure that the environment is okay.
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id: SanityTest.java,v 1.1 2004/02/27 06:22:27 evenisse Exp $
+ */
+public class SanityTest extends TestCase {
+  public void testSanity() {
+    assertEquals( "test", "test" );
+  }
+}
diff --git a/genapp/src/plugin-resources/web/template-resources/src/webapp/sample.jsp b/genapp/src/plugin-resources/web/template-resources/src/webapp/sample.jsp
new file mode 100644
index 00000000..d6736526
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template-resources/src/webapp/sample.jsp
@@ -0,0 +1 @@
+Hello world JSP on <%= new java.util.Date() %>
diff --git a/genapp/src/plugin-resources/web/template.properties b/genapp/src/plugin-resources/web/template.properties
new file mode 100644
index 00000000..f05e75d2
--- /dev/null
+++ b/genapp/src/plugin-resources/web/template.properties
@@ -0,0 +1,4 @@
+maven.genapp.repackage=java,test,test-cactus
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml
+
+maven.genapp.default.package=example.web