diff --git a/appserver/src/plugin-resources/tomcat-4.0.x.jelly b/appserver/src/plugin-resources/tomcat-4.0.x.jelly
new file mode 100755
index 00000000..5ed55b7e
--- /dev/null
+++ b/appserver/src/plugin-resources/tomcat-4.0.x.jelly
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+
+<project xmlns:j="jelly:core" xmlns:log="jelly:log" xmlns:ant="jelly:ant"
+  xmlns:tomcat4x="http://www.maven.org/plugin/appserver/tomcat4x"
+  xmlns:define="jelly:define" >
+
+  <goal name="appserver:tomcat-4.0.x-reqs"
+    description="Intialize resources for tomcat processing">
+
+    <!-- Check if user has http.conf in a conf dir -->
+    <ant:available file="${maven.appserver.conf.dir}/conf/server.xml"
+      type="file" property="maven.appserver.tomcat4x.has.conf" value="true" />
+
+    <ant:fail unless="maven.appserver.tomcat4x.has.conf">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/conf/server.xml
+    </ant:fail>
+
+    <define:taglib uri="http://www.maven.org/plugin/appserver/tomcat4x">
+
+      <!-- accept the force property with a value of true or false -->
+      <define:tag name="install">
+
+        <j:if test="${force == 'false'}">
+          <!-- Create common directories and copy configuration files -->
+          <mkdir dir="${maven.appserver.dir}/conf"/>
+          <mkdir dir="${maven.appserver.dir}/work"/>
+          <mkdir dir="${maven.appserver.dir}/temp"/>
+          <mkdir dir="${maven.appserver.dir}/webapps"/>
+          <mkdir dir="${maven.appserver.dir}/logs"/>
+        </j:if>
+
+        <!-- copy any user configuration files w/ filtering by forcing copy -->
+        <!-- if reinstall -->
+        <ant:copy todir="${maven.appserver.dir}" overwrite="${force}">
+          <ant:fileset dir="${maven.appserver.conf.dir}" />
+          <ant:filterset refid="maven.appserver.filterset.default" />
+        </ant:copy>
+
+      </define:tag>
+    </define:taglib>
+
+  </goal>
+
+  <!--==================================================================-->
+  <!-- R E I N S T A L L                                                -->
+  <!--==================================================================-->
+  <goal name="appserver:reinstall-tomcat-4.0.x"
+    prereqs="appserver:tomcat-4.0.x-reqs" description="Reinstall Tomcat 4.0.x">
+    <tomcat4x:install force="true"/>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- I N S T A L L                                                    -->
+  <!--==================================================================-->
+  <goal name="appserver:install-tomcat-4.0.x" prereqs="appserver:tomcat-4.0.x-reqs"
+    description="Install Tomcat 4.0.x">
+    <tomcat4x:install force="false"/>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- S T A R T                                                        -->
+  <!--==================================================================-->
+  <goal name="appserver:start-tomcat-4.0.x" prereqs="appserver:tomcat-4.0.x-reqs"
+    description="Start Tomcat 4.0.x" >
+
+    <java classname="org.apache.catalina.startup.Bootstrap" fork="yes"
+        dir="${maven.appserver.dir}">
+        <classpath>
+          <pathelement path="${maven.appserver.classpath}"/>
+          <fileset dir="${maven.appserver.home}">
+            <include name="bin/bootstrap.jar"/>
+          </fileset>
+        </classpath>
+        <jvmarg value="-Dcatalina.base=${maven.appserver.dir}"/>
+        <jvmarg value="-Dcatalina.home=${maven.appserver.home}"/>
+        <arg value="start"/>
+      </java>
+
+  </goal>
+
+  <!--==================================================================-->
+  <!-- R E S T A R T                                                    -->
+  <!--==================================================================-->
+  <goal name="appserver:restart-tomcat-4.0.x" description="Restart Tomcat 4.0.x"
+    prereqs="appserver:tomcat-4.0.x-reqs" >
+    <ant:fail message="Not yet supported." />
+  </goal>
+
+  <!--==================================================================-->
+  <!-- S T O P                                                          -->
+  <!--==================================================================-->
+  <goal name="appserver:stop-tomcat-4.0.x" description="Stop Tomcat 4.0.x"
+    prereqs="appserver:tomcat-4.0.x-reqs" >
+
+    <java classname="org.apache.catalina.startup.Bootstrap" fork="yes"
+        dir="${maven.appserver.dir}">
+        <classpath>
+          <pathelement path="${maven.appserver.classpath}"/>
+          <fileset dir="${maven.appserver.home}">
+            <include name="bin/bootstrap.jar"/>
+          </fileset>
+        </classpath>
+        <jvmarg value="-Dcatalina.base=${maven.appserver.dir}"/>
+        <jvmarg value="-Dcatalina.home=${maven.appserver.home}"/>
+        <arg value="stop"/>
+      </java>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- C L E A N                                                        -->
+  <!--==================================================================-->
+  <goal name="appserver:clean-tomcat-4.0.x" description="Clean Tomcat 4.0.x"
+    prereqs="appserver:tomcat-4.0.x-reqs" >
+
+  </goal>
+
+</project>
diff --git a/appserver/src/plugin-resources/tomcat-4.1.x.jelly b/appserver/src/plugin-resources/tomcat-4.1.x.jelly
new file mode 100755
index 00000000..02fa649a
--- /dev/null
+++ b/appserver/src/plugin-resources/tomcat-4.1.x.jelly
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+
+<project xmlns:j="jelly:core" xmlns:log="jelly:log" xmlns:ant="jelly:ant"
+  xmlns:tomcat41x="http://www.maven.org/plugin/appserver/tomcat41x"
+  xmlns:define="jelly:define" >
+
+  <goal name="appserver:tomcat-4.1.x-reqs"
+    description="Intialize resources for tomcat processing">
+
+    <!-- Check if user has http.conf in a conf dir -->
+    <ant:available file="${maven.appserver.conf.dir}/conf/server.xml"
+      type="file" property="maven.appserver.tomcat41x.has.conf" value="true" />
+
+    <ant:fail unless="maven.appserver.tomcat41x.has.conf">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/conf/server.xml
+    </ant:fail>
+
+    <define:taglib uri="http://www.maven.org/plugin/appserver/tomcat41x">
+
+      <!-- accept the force property with a value of true or false -->
+      <define:tag name="install">
+
+        <j:if test="${force == 'false'}">
+          <!-- Create common directories and copy configuration files -->
+          <mkdir dir="${maven.appserver.dir}/conf"/>
+          <mkdir dir="${maven.appserver.dir}/work"/>
+          <mkdir dir="${maven.appserver.dir}/temp"/>
+          <mkdir dir="${maven.appserver.dir}/webapps"/>
+          <mkdir dir="${maven.appserver.dir}/logs"/>
+        </j:if>
+
+        <!-- copy any user configuration files w/ filtering by forcing copy -->
+        <!-- if reinstall -->
+        <ant:copy todir="${maven.appserver.dir}" overwrite="${force}">
+          <ant:fileset dir="${maven.appserver.conf.dir}" />
+          <ant:filterset refid="maven.appserver.filterset.default" />
+        </ant:copy>
+
+      </define:tag>
+    </define:taglib>
+
+  </goal>
+
+  <!--==================================================================-->
+  <!-- R E I N S T A L L                                                -->
+  <!--==================================================================-->
+  <goal name="appserver:reinstall-tomcat-4.1.x"
+    prereqs="appserver:tomcat-4.1.x-reqs" description="Reinstall Tomcat 4.1.x">
+    <tomcat41x:install force="true"/>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- I N S T A L L                                                    -->
+  <!--==================================================================-->
+  <goal name="appserver:install-tomcat-4.1.x" prereqs="appserver:tomcat-4.1.x-reqs"
+    description="Install Tomcat 4.1.x">
+    <tomcat41x:install force="false"/>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- S T A R T                                                        -->
+  <!--==================================================================-->
+  <goal name="appserver:start-tomcat-4.1.x" prereqs="appserver:tomcat-4.1.x-reqs"
+    description="Start Tomcat 4.1.x" >
+
+    <java classname="org.apache.catalina.startup.Bootstrap" fork="yes"
+        dir="${maven.appserver.dir}">
+        <classpath>
+          <pathelement path="${maven.appserver.classpath}"/>
+          <fileset dir="${maven.appserver.home}">
+            <include name="bin/bootstrap.jar"/>
+          </fileset>
+        </classpath>
+        <jvmarg value="-Dcatalina.base=${maven.appserver.dir}"/>
+        <jvmarg value="-Dcatalina.home=${maven.appserver.home}"/>
+        <arg value="start"/>
+      </java>
+
+  </goal>
+
+  <!--==================================================================-->
+  <!-- R E S T A R T                                                    -->
+  <!--==================================================================-->
+  <goal name="appserver:restart-tomcat-4.1.x" description="Restart Tomcat 4.1.x"
+    prereqs="appserver:tomcat-4.1.x-reqs" >
+    <ant:fail message="Not yet supported." />
+  </goal>
+
+  <!--==================================================================-->
+  <!-- S T O P                                                          -->
+  <!--==================================================================-->
+  <goal name="appserver:stop-tomcat-4.1.x" description="Stop Tomcat 4.1.x"
+    prereqs="appserver:tomcat-4.1.x-reqs" >
+
+    <java classname="org.apache.catalina.startup.Bootstrap" fork="yes"
+        dir="${maven.appserver.dir}">
+        <classpath>
+          <pathelement path="${maven.appserver.classpath}"/>
+          <fileset dir="${maven.appserver.home}">
+            <include name="bin/bootstrap.jar"/>
+          </fileset>
+        </classpath>
+        <jvmarg value="-Dcatalina.base=${maven.appserver.dir}"/>
+        <jvmarg value="-Dcatalina.home=${maven.appserver.home}"/>
+        <arg value="stop"/>
+      </java>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- C L E A N                                                        -->
+  <!--==================================================================-->
+  <goal name="appserver:clean-tomcat-4.1.x" description="Clean Tomcat 4.1.x"
+    prereqs="appserver:tomcat-4.1.x-reqs" >
+
+  </goal>
+
+</project>
diff --git a/appserver/src/plugin-resources/tomcat-4.x.jelly b/appserver/src/plugin-resources/tomcat-4.x.jelly
deleted file mode 100644
index a63140ed..00000000
--- a/appserver/src/plugin-resources/tomcat-4.x.jelly
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    ========================================================================
-        T O M C A T  4.x  C O N T R O L
-    ========================================================================
--->
-<project>
-
-    <!--
-       ========================================================================
-         Install and configure Tomcat 4.0 instance
-       ========================================================================
-    -->
-    <goal name="appserver:install-tomcat-4.x"
-      description="install and configure a tomcat 4.0 instance">
-
-        <!-- Create common directories and copy configuration files -->
-        <mkdir dir="${maven.appserver.dir}/conf"/>
-        <mkdir dir="${maven.appserver.dir}/work"/>
-        <mkdir dir="${maven.appserver.dir}/temp"/>
-        <mkdir dir="${maven.appserver.dir}/webapps"/>
-        <mkdir dir="${maven.appserver.dir}/logs"/>
-
-        <!-- copy any user configuration files w/ filtering by forcing copy -->
-        <!-- expecting at least a server.xml -->
-        <copy todir="${maven.appserver.dir}/conf" overwrite="true">
-            <fileset dir="${maven.conf.dir}/${maven.appserver.fullname}" excludes="**/web.xml"/>
-            <filterset refid="maven.appserver.filterset" />
-        </copy>
-
-    </goal>
-
-    <!--
-       ========================================================================
-         Start Tomcat 4.0
-       ========================================================================
-    -->
-    <goal name="appserver:start-tomcat-4.x"
-      description="Start Tomcat 4.0">
-      <java classname="org.apache.catalina.startup.Bootstrap" fork="yes"
-        dir="${maven.appserver.dir}">
-        <classpath>
-          <pathelement path="${maven.appserver.classpath}"/>
-          <fileset dir="${maven.appserver.home}">
-            <include name="bin/bootstrap.jar"/>
-          </fileset>
-        </classpath>
-        <jvmarg value="-Dcatalina.base=${maven.appserver.dir}"/>
-        <jvmarg value="-Dcatalina.home=${maven.appserver.home}"/>
-        <arg value="start"/>
-      </java>
-    </goal>
-
-    <!--
-       ========================================================================
-         Stop Tomcat 4.0
-       ========================================================================
-    -->
-    <goal name="appserver:stop-tomcat-4.x"
-      description="Stop Tomcat 4.0">
-      <java classname="org.apache.catalina.startup.Bootstrap" fork="yes"
-        dir="${maven.appserver.dir}">
-        <classpath>
-          <pathelement path="${maven.appserver.classpath}"/>
-          <fileset dir="${maven.appserver.home}">
-            <include name="bin/bootstrap.jar"/>
-          </fileset>
-        </classpath>
-        <jvmarg value="-Dcatalina.base=${maven.appserver.dir}"/>
-        <jvmarg value="-Dcatalina.home=${maven.appserver.home}"/>
-        <arg value="stop"/>
-      </java>
-    </goal>
-
-</project>
-