Index: applications/console-framework/maven.xml
===================================================================
--- applications/console-framework/maven.xml	(revision 396288)
+++ applications/console-framework/maven.xml	(working copy)
@@ -1,66 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="default"
-    xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant"
-    xmlns:define="jelly:define"
-    xmlns:velocity="jelly:velocity"
-    xmlns:deploy="geronimo:deploy"
-    xmlns:util="jelly:util">
+<project default="default">
 
-      <postGoal name="war:webapp">
-        <attainGoal name="preCompile"/>
-    </postGoal>
-
-    <!-- Output folder for compiled jsps. -->
-    <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
-   
-    <!-- pre compile jsps -->   
     <goal name="default">
-        <ant:mkdir dir="${outDir}"/>
         <attainGoal name="war:install"/>
     </goal>
 
-    
-    <!-- ==================================================== -->
-    <!-- Pre compile JSPs                                     -->
-    <!-- ==================================================== -->
-<goal name="preCompile">
-    <j:set var="webroot"  value="${basedir}/target/${pom.artifactId}"/>
-    <ant:path id="jspc.classpath">
-      <ant:path refid="maven.dependency.classpath"/>
-      <ant:pathelement path="${maven.build.dest}"/>
-    </ant:path>
-    <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
-    <!-- ant:taskdef classname="org.apache.jasper.JspC" name="ant:jasper2" classpathref="jspc.classpath"/>
-   <ant:jasper2 
-     validateXml="false" 
-     uriroot="${webroot}"
-     webapp="${basedir}/src/webapp"
-     webXmlFragment="${webroot}/generated_web.xml"
-     addWebXmlMappings="true"
-     outputDir="${outDir}" /  -->
-
-    <ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
-      <arg value="-d"/>
-      <arg value="${outDir}"/>
-      <arg value="-webapp"/>
-      <arg value="${basedir}/src/webapp"/>
-      <arg value="-uriroot"/>
-      <arg value="${webroot}"/>
-      <arg value="-webinc"/>
-      <arg value="${webroot}/WEB-INF/generated-web.xml"/>
-    </ant:java>
-
-    <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
-    <ant:javac
-            srcdir="${outDir}"
-            destdir="${outDir}"
-            debug="${maven.compile.debug}"
-            deprecation="${maven.compile.deprecation}"
-            optimize="${maven.compile.optimize}"
-            classpathref="jspc.classpath"/>
-
-        <deploy:mergeWebXML uriRoot="${webroot}" />
-  </goal>
-
 </project>
Index: applications/console-framework/project.xml
===================================================================
--- applications/console-framework/project.xml	(revision 396288)
+++ applications/console-framework/project.xml	(working copy)
@@ -79,17 +79,11 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
 
         <dependency>
@@ -106,4 +100,3 @@
 
 
 </project>
-
Index: applications/console-standard/maven.xml
===================================================================
--- applications/console-standard/maven.xml	(revision 396288)
+++ applications/console-standard/maven.xml	(working copy)
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="default"
-    xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
-    xmlns:define="jelly:define"
-    xmlns:velocity="jelly:velocity"
-    xmlns:deploy="geronimo:deploy"
-    xmlns:util="jelly:util">
+    xmlns:velocity="jelly:velocity">
 
   <postGoal name="war:webapp">
-    <attainGoal name="preCompile"/>
     <attainGoal name="substitute"/>
   </postGoal>
 
-  <!-- Output folder for compiled jsps. -->
-  <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
-
-  <!-- pre compile jsps -->
   <goal name="default">
     <ant:echo>${commons_fileupload_version}</ant:echo>
-    <ant:mkdir dir="${outDir}"/>
     <attainGoal name="war:install"/>
   </goal>
 
@@ -28,46 +18,4 @@
           name="${basedir}/target/${pom.artifactId}/WEB-INF/classes/jms-resource-providers.properties"/>
   </goal>
 
-  <!-- ==================================================== -->
-  <!-- Pre compile JSPs                                     -->
-  <!-- ==================================================== -->
-  <goal name="preCompile">
-    <j:set var="webroot"  value="${basedir}/target/${pom.artifactId}"/>
-    <ant:path id="jspc.classpath">
-      <ant:path refid="maven.dependency.classpath"/>
-      <ant:pathelement path="${maven.build.dest}"/>
-    </ant:path>
-
-    <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
-    <!-- ant:taskdef classname="org.apache.jasper.JspC" name="ant:jasper2" classpathref="jspc.classpath"/>
-   <ant:jasper2
-     validateXml="false"
-     uriroot="${webroot}"
-     webapp="${basedir}/src/webapp"
-     webXmlFragment="${webroot}/generated_web.xml"
-     addWebXmlMappings="true"
-     outputDir="${outDir}" /  -->
-
-    <ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
-      <arg value="-d"/>
-      <arg value="${outDir}"/>
-      <arg value="-webapp"/>
-      <arg value="${basedir}/src/webapp"/>
-      <arg value="-uriroot"/>
-      <arg value="${webroot}"/>
-      <arg value="-webinc"/>
-      <arg value="${webroot}/WEB-INF/generated-web.xml"/>
-    </ant:java>
-
-    <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
-    <ant:javac
-            srcdir="${outDir}"
-            destdir="${outDir}"
-            debug="${maven.compile.debug}"
-            deprecation="${maven.compile.deprecation}"
-            optimize="${maven.compile.optimize}"
-            classpathref="jspc.classpath"/>
-
-        <deploy:mergeWebXML uriRoot="${webroot}" />
-  </goal>
 </project>
Index: applications/console-standard/project.xml
===================================================================
--- applications/console-standard/project.xml	(revision 396288)
+++ applications/console-standard/project.xml	(working copy)
@@ -273,17 +273,11 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>        
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
         <dependency>
             <groupId>dwr</groupId>
@@ -311,6 +305,7 @@
             <version>${geronimo_deployment_plugin_version}</version>
             <type>plugin</type>
         </dependency>
+
     </dependencies>
 
     <build>
Index: applications/welcome/maven.xml
===================================================================
--- applications/welcome/maven.xml	(revision 396288)
+++ applications/welcome/maven.xml	(working copy)
@@ -18,9 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    default="default"
-    >
+<project default="default" >
 
     <goal name="default">
         <attainGoal name="war:install"/>
Index: applications/welcome/project.xml
===================================================================
--- applications/welcome/project.xml	(revision 396288)
+++ applications/welcome/project.xml	(working copy)
@@ -32,6 +32,71 @@
     </description>
 
     <dependencies>
+      <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>${ant_version}</version>
+<!--            <properties>
+                <repository>true</repository>
+            </properties> -->
+        </dependency>
+        <dependency>
+            <groupId>commons-el</groupId>
+            <artifactId>commons-el</artifactId>
+            <version>${commons_el_version}</version>
+            <url>http://jakarta.apache.org/commons/el/</url>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>                       
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>${standard_taglibs_version}</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>        
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl_version}</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>        
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+            <version>${jasper_version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-compiler</artifactId>
+            <version>${jasper_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment-plugin</artifactId>
+            <version>${geronimo_deployment_plugin_version}</version>
+            <type>plugin</type>
+        </dependency>
+        <!-- Logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+        </dependency>
+
         <!-- todo these are here purely to force the deployer to be built - work out how to remove them --> 
 <!--
         <dependency>
Index: etc/maven.xml
===================================================================
--- etc/maven.xml	(revision 396288)
+++ etc/maven.xml	(working copy)
@@ -25,6 +25,7 @@
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
     xmlns:define="jelly:define"
+    xmlns:deploy="geronimo:deploy"
     xmlns:velocity="jelly:velocity"
     >
 
@@ -234,6 +235,7 @@
   </postGoal>
 
   <postGoal name="war:webapp">
+    <attainGoal name="preCompile"/>
     <j:set var="usesJar" value="${maven.war.usesJar}"/>
     <ant:echo>Use classes.jar ? ${usesJar}</ant:echo>
     <j:if test="${usesJar}">
@@ -258,4 +260,52 @@
     </j:if>
   </postGoal>
 
+  <!-- ==================================================== -->
+    <!-- Pre compile JSPs                                     -->
+    <!-- ==================================================== -->
+<goal name="preCompile">
+  <!-- Output folder for compiled jsps. -->
+  <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
+  <ant:mkdir dir="${outDir}"/>
+
+    <j:set var="webroot"  value="${basedir}/target/${pom.artifactId}"/>
+    <ant:path id="jspc.classpath">
+      <ant:path refid="maven.dependency.classpath"/>
+      <ant:pathelement path="${maven.build.dest}"/>
+    </ant:path>
+    <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
+    <!-- ant:taskdef classname="org.apache.jasper.JspC" name="ant:jasper2" classpathref="jspc.classpath"/>
+   <ant:jasper2 
+     validateXml="false" 
+     uriroot="${webroot}"
+     webapp="${basedir}/src/webapp"
+     webXmlFragment="${webroot}/generated_web.xml"
+     addWebXmlMappings="true"
+     outputDir="${outDir}" /  -->
+
+    <ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
+      <arg value="-d"/>
+      <arg value="${outDir}"/>
+      <arg value="-webapp"/>
+      <arg value="${basedir}/src/webapp"/>
+      <arg value="-uriroot"/>
+      <arg value="${webroot}"/>
+      <arg value="-webinc"/>
+      <arg value="${webroot}/WEB-INF/generated-web.xml"/>
+    </ant:java>
+
+    <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
+    <ant:javac
+            srcdir="${outDir}"
+            destdir="${outDir}"
+            debug="${maven.compile.debug}"
+            deprecation="${maven.compile.deprecation}"
+            optimize="${maven.compile.optimize}"
+            classpathref="jspc.classpath"/>
+
+    <ant:echo>Merging generated-web.xml with our web.xml</ant:echo>
+    <deploy:mergeWebXML uriRoot="${webroot}" />
+  </goal>
+
+
 </project>