You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/04/21 08:36:24 UTC
svn commit: r395795 - in /geronimo/branches/1.1:
applications/console-framework/ applications/console-standard/ etc/
plugins/geronimo-deployment-plugin/
Author: dain
Date: Thu Apr 20 23:36:22 2006
New Revision: 395795
URL: http://svn.apache.org/viewcvs?rev=395795&view=rev
Log:
GERONIMO-1844 Precompile jsp pages in console. Thanks Prasad Kashyap.
Modified:
geronimo/branches/1.1/applications/console-framework/maven.xml
geronimo/branches/1.1/applications/console-framework/project.xml
geronimo/branches/1.1/applications/console-standard/maven.xml
geronimo/branches/1.1/applications/console-standard/project.xml
geronimo/branches/1.1/etc/maven.xml
geronimo/branches/1.1/etc/project.properties
geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly
geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml
Modified: geronimo/branches/1.1/applications/console-framework/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/maven.xml?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/maven.xml Thu Apr 20 23:36:22 2006
@@ -4,20 +4,19 @@
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:velocity="jelly:velocity"
+ xmlns:deploy="geronimo:deploy"
xmlns:util="jelly:util">
-<!--
- <preGoal name="war:war">
+ <postGoal name="war:webapp">
<attainGoal name="preCompile"/>
- </preGoal>
--->
+ </postGoal>
<!-- Output folder for compiled jsps. -->
- <!--<j:set var="outDir" value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/> -->
+ <j:set var="outDir" value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
<!-- pre compile jsps -->
<goal name="default">
- <!--<ant:mkdir dir="${outDir}"/> -->
+ <ant:mkdir dir="${outDir}"/>
<attainGoal name="war:install"/>
</goal>
@@ -25,28 +24,43 @@
<!-- ==================================================== -->
<!-- Pre compile JSPs -->
<!-- ==================================================== -->
-<!--
- <goal name="preCompile">
- <ant:path id="jspc.classpath">
- <ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${basedir}/target/${pom.artifactId}/WEB-INF/classes"/>
- </ant:path>
- <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
- <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"/>
- </ant:java>
- <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
- <ant:javac
+<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"/>
- </goal>
--->
+
+ <deploy:mergeWebXML uriRoot="${webroot}" />
+ </goal>
</project>
Modified: geronimo/branches/1.1/applications/console-framework/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/project.xml?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/project.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/project.xml Thu Apr 20 23:36:22 2006
@@ -92,6 +92,12 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment-plugin</artifactId>
+ <version>${geronimo_deployment_plugin_version}</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/branches/1.1/applications/console-standard/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/maven.xml?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/maven.xml Thu Apr 20 23:36:22 2006
@@ -4,54 +4,70 @@
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:velocity="jelly:velocity"
+ xmlns:deploy="geronimo:deploy"
xmlns:util="jelly:util">
- <preGoal name="war:war">
- <!--<attainGoal name="preCompile"/>-->
- <attainGoal name="substitute"/>
- </preGoal>
-
- <!-- 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>
+ <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>
- <goal name="substitute">
- <velocity:merge basedir="${basedir}/src/conf"
+ <goal name="substitute">
+ <velocity:merge basedir="${basedir}/src/conf"
template="jms-resource-providers.properties"
name="${basedir}/target/${pom.artifactId}/WEB-INF/classes/jms-resource-providers.properties"/>
- </goal>
+ </goal>
- <!-- ==================================================== -->
- <!-- Pre compile JSPs -->
- <!-- ==================================================== -->
-<!--
- <goal name="preCompile">
- <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: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"/>
- </ant:java>
- <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
- <ant:javac
+ <!-- ==================================================== -->
+ <!-- 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"/>
- </goal>
--->
+ <deploy:mergeWebXML uriRoot="${webroot}" />
+ </goal>
</project>
Modified: geronimo/branches/1.1/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/project.xml?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/project.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/project.xml Thu Apr 20 23:36:22 2006
@@ -305,6 +305,12 @@
<version>${stax_api_version}</version>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment-plugin</artifactId>
+ <version>${geronimo_deployment_plugin_version}</version>
+ <type>plugin</type>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/branches/1.1/etc/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/maven.xml?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/maven.xml (original)
+++ geronimo/branches/1.1/etc/maven.xml Thu Apr 20 23:36:22 2006
@@ -28,226 +28,232 @@
xmlns:velocity="jelly:velocity"
>
- <!-- ================= -->
- <!-- Global Properties -->
- <!-- ================= -->
-
- <!-- Determine what the top-level project root is -->
- <j:set var="project.root" value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
-
- <!-- ==================== -->
- <!-- Default Global Goals -->
- <!-- ==================== -->
-
- <goal name="default">
- <attainGoal name="jar:install"/>
- </goal>
-
- <goal name="build">
- <attainGoal name="default"/>
- </goal>
-
- <goal name="rebuild">
- <attainGoal name="clean"/>
- <attainGoal name="build"/>
- </goal>
-
- <!-- For testing -->
- <goal name="hello">
- <ant:echo>
+ <!-- ================= -->
+ <!-- Global Properties -->
+ <!-- ================= -->
+
+ <!-- Determine what the top-level project root is -->
+ <j:set var="project.root" value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
+
+ <!-- ==================== -->
+ <!-- Default Global Goals -->
+ <!-- ==================== -->
+
+ <goal name="default">
+ <attainGoal name="jar:install"/>
+ </goal>
+
+ <goal name="build">
+ <attainGoal name="default"/>
+ </goal>
+
+ <goal name="rebuild">
+ <attainGoal name="clean"/>
+ <attainGoal name="build"/>
+ </goal>
+
+ <!-- For testing -->
+ <goal name="hello">
+ <ant:echo>
H E L L O
---------
Module Name ${pom.name} [${pom.currentVersion}]
Geronimo: ${geronimo_version}
OpenEJB: ${openejb_version}
- </ant:echo>
- </goal>
+ </ant:echo>
+ </goal>
- <!-- Remove classes which depend on changed files, so they will rebuild. -->
- <preGoal name="java:compile">
- <j:if test="${sourcesPresent}">
- <ant:depend srcdir="${maven.compile.source}"
+ <!-- Remove classes which depend on changed files, so they will rebuild. -->
+ <preGoal name="java:compile">
+ <j:if test="${sourcesPresent}">
+ <ant:depend srcdir="${maven.compile.source}"
destdir="${maven.build.dest}"
dump="false"
closure="false">
- <j:forEach var="sm" items="${pom.build.sourceModifications}">
- <ant:available property="classPresent" classname="${sm.className}"/>
- <j:if test="${classPresent != 'true'}">
- <j:forEach var="exclude" items="${sm.excludes}">
- <ant:exclude name="${exclude}"/>
- </j:forEach>
- <j:forEach var="include" items="${sm.includes}">
- <ant:include name="${include}"/>
- </j:forEach>
- </j:if>
- </j:forEach>
- </ant:depend>
- </j:if>
- </preGoal>
-
- <!-- Construct dependency lists for inclusion in generated jar. -->
- <!-- putting this goal here produces a circular dependency -->
- <!-- <postGoal name="java:compile">
- <attainGoal name="geronimo:dependency"/>
- </postGoal>
--->
- <!-- Remove the log files -->
- <goal name="clobber"
+ <j:forEach var="sm" items="${pom.build.sourceModifications}">
+ <ant:available property="classPresent" classname="${sm.className}"/>
+ <j:if test="${classPresent != 'true'}">
+ <j:forEach var="exclude" items="${sm.excludes}">
+ <ant:exclude name="${exclude}"/>
+ </j:forEach>
+ <j:forEach var="include" items="${sm.includes}">
+ <ant:include name="${include}"/>
+ </j:forEach>
+ </j:if>
+ </j:forEach>
+ </ant:depend>
+ </j:if>
+ </preGoal>
+
+ <!-- Construct dependency lists for inclusion in generated jar. -->
+ <!-- putting this goal here produces a circular dependency -->
+ <!-- <postGoal name="java:compile">
+ <attainGoal name="geronimo:dependency"/>
+ </postGoal>
+ -->
+ <!-- Remove the log files -->
+ <goal name="clobber"
description="Removes all (non-repository installed) build generated files">
- <!-- Let clean:clean do some work first -->
- <attainGoal name="clean:clean"/>
+ <!-- Let clean:clean do some work first -->
+ <attainGoal name="clean:clean"/>
- <j:jelly xmlns="jelly:ant">
- <delete quiet="false" failonerror="false">
- <fileset dir="${basedir}">
- <include name="maven.log"/>
- <include name="velocity.log*"/>
- <include name="junit*.properties"/>
- </fileset>
- </delete>
- </j:jelly>
+ <j:jelly xmlns="jelly:ant">
+ <delete quiet="false" failonerror="false">
+ <fileset dir="${basedir}">
+ <include name="maven.log"/>
+ <include name="velocity.log*"/>
+ <include name="junit*.properties"/>
+ </fileset>
+ </delete>
+ </j:jelly>
- </goal>
+ </goal>
- <!-- Cleanse source files -->
- <goal name="cleanse-sources"
+ <!-- Cleanse source files -->
+ <goal name="cleanse-sources"
description="Cleanse source files, removing tabs and translating CRLF -> LF">
- <j:scope xmlns="jelly:ant">
+ <j:scope xmlns="jelly:ant">
- <!-- Cleanse sources -->
- <j:set var="srcdir" value="${basedir}/src/java"/>
- <u:available file="">
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
- <include name="**/*.java"/>
- </fixcrlf>
- <fixcrlf srcdir="${basedir}" eol="lf" eof="remove" tab="remove" tablength="4">
- <include name="**/*.xml"/>
- <include name="**/*.html"/>
- </fixcrlf>
- </u:available>
-
- <!-- Cleanse test sources -->
- <j:set var="srcdir" value="${basedir}/src/test"/>
- <u:available file="${srcdir}">
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.html"/>
- </fixcrlf>
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
- <include name="**/*.xml"/>
- <include name="**/*.html"/>
- </fixcrlf>
- </u:available>
-
- <!-- Cleanse xdocs -->
- <j:set var="srcdir" value="${basedir}/src/xdocs"/>
- <u:available file="${srcdir}">
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
- <include name="**/*.xml"/>
- <include name="**/*.html"/>
- </fixcrlf>
- </u:available>
-
- <!-- Cleanse build files -->
- <fixcrlf srcdir="." eol="lf" tab="remove" eof="remove" tablength="4">
- <include name="project.xml"/>
- <include name="maven.xml"/>
- </fixcrlf>
-
- <!-- Cleanse scripts -->
- <j:set var="srcdir" value="${basedir}/src/bin"/>
- <u:available file="${srcdir}">
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
- <include name="**/*"/>
- </fixcrlf>
- </u:available>
+ <!-- Cleanse sources -->
+ <j:set var="srcdir" value="${basedir}/src/java"/>
+ <u:available file="">
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
+ <include name="**/*.java"/>
+ </fixcrlf>
+ <fixcrlf srcdir="${basedir}" eol="lf" eof="remove" tab="remove" tablength="4">
+ <include name="**/*.xml"/>
+ <include name="**/*.html"/>
+ </fixcrlf>
+ </u:available>
+
+ <!-- Cleanse test sources -->
+ <j:set var="srcdir" value="${basedir}/src/test"/>
+ <u:available file="${srcdir}">
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.html"/>
+ </fixcrlf>
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
+ <include name="**/*.xml"/>
+ <include name="**/*.html"/>
+ </fixcrlf>
+ </u:available>
+
+ <!-- Cleanse xdocs -->
+ <j:set var="srcdir" value="${basedir}/src/xdocs"/>
+ <u:available file="${srcdir}">
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
+ <include name="**/*.xml"/>
+ <include name="**/*.html"/>
+ </fixcrlf>
+ </u:available>
+
+ <!-- Cleanse build files -->
+ <fixcrlf srcdir="." eol="lf" tab="remove" eof="remove" tablength="4">
+ <include name="project.xml"/>
+ <include name="maven.xml"/>
+ </fixcrlf>
+
+ <!-- Cleanse scripts -->
+ <j:set var="srcdir" value="${basedir}/src/bin"/>
+ <u:available file="${srcdir}">
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove" tablength="4">
+ <include name="**/*"/>
+ </fixcrlf>
+ </u:available>
- </j:scope>
+ </j:scope>
- </goal>
+ </goal>
- <goal name="java-src"
+ <goal name="java-src"
description="Creates an archive containing only java source.">
- <u:available file="${basedir}/src/java">
- <j:set var="javaSrcBuilt" value="true"/>
- <ant:mkdir dir="${basedir}/target"/>
- <ant:jar destfile="${basedir}/target/${pom.artifactId}-${pom.currentVersion}-java-src.jar">
- <fileset dir="${basedir}/src/java"/>
- <u:available file="${basedir}/target/xmlbeans">
- <fileset dir="${basedir}/target/xmlbeans"/>
- </u:available>
- </ant:jar>
+ <u:available file="${basedir}/src/java">
+ <j:set var="javaSrcBuilt" value="true"/>
+ <ant:mkdir dir="${basedir}/target"/>
+ <ant:jar destfile="${basedir}/target/${pom.artifactId}-${pom.currentVersion}-java-src.jar">
+ <fileset dir="${basedir}/src/java"/>
+ <u:available file="${basedir}/target/xmlbeans">
+ <fileset dir="${basedir}/target/xmlbeans"/>
</u:available>
+ </ant:jar>
+ </u:available>
- <j:if test="${javaSrcBuilt != 'true'}">
- <u:available file="${basedir}/target/xmlbeans">
- <j:set var="java-src.built" value="true"/>
- <ant:mkdir dir="${basedir}/target"/>
- <ant:jar destfile="${basedir}/target/${pom.artifactId}-${pom.currentVersion}-java-src.jar">
- <fileset dir="${basedir}/target/xmlbeans"/>
- </ant:jar>
- </u:available>
- </j:if>
- </goal>
-
- <!-- If there is no src/test directory you can
- turn off clover in that module by overriding this goal to do nothing -->
- <goal name="clover.wrapper">
- <attainGoal name="clover"/>
- </goal>
-
- <preGoal name="clover:test">
- <j:set var="cloveroverride" value="true"/>
- </preGoal>
-
- <!-- Check if the tests need to run -->
- <preGoal name="test:test">
- <j:if test="${context.getVariable('maven.test.force') == null}">
- <j:if test="${cloveroverride != 'true'}">
- <j:set var="uptodatePropName" value="tests.uptodate"/>
- <j:remove var="${uptodatePropName}"/>
- <ant:mkdir dir="${basedir}/target/test-reports/"/>
- <j:set var="uptodateFile" value="${basedir}/target/test-reports/tstamp"/>
-
- <ant:uptodate property="${uptodatePropName}" targetfile="${uptodateFile}">
- <ant:srcfiles dir="${basedir}/src/" includes="**/*"/>
- </ant:uptodate>
-
- <j:if test="${context.getVariable(uptodatePropName) == 'true'}">
- <ant:echo>NOTICE: Skipping tests; they seem to have passed already</ant:echo>
- <j:set var="maven.test.skip" value="true"/>
- <j:set var="unitTestSourcesPresent" value="false"/>
- </j:if>
- </j:if>
- </j:if>
- </preGoal>
-
- <!-- Update the timestamp of the last successful test -->
- <postGoal name="test:test">
- <j:if test="${context.getVariable('maven.test.failure') == null}">
- <ant:touch file="${basedir}/target/test-reports/tstamp"/>
+ <j:if test="${javaSrcBuilt != 'true'}">
+ <u:available file="${basedir}/target/xmlbeans">
+ <j:set var="java-src.built" value="true"/>
+ <ant:mkdir dir="${basedir}/target"/>
+ <ant:jar destfile="${basedir}/target/${pom.artifactId}-${pom.currentVersion}-java-src.jar">
+ <fileset dir="${basedir}/target/xmlbeans"/>
+ </ant:jar>
+ </u:available>
+ </j:if>
+ </goal>
+
+ <!-- If there is no src/test directory you can
+ turn off clover in that module by overriding this goal to do nothing -->
+ <goal name="clover.wrapper">
+ <attainGoal name="clover"/>
+ </goal>
+
+ <preGoal name="clover:test">
+ <j:set var="cloveroverride" value="true"/>
+ </preGoal>
+
+ <!-- Check if the tests need to run -->
+ <preGoal name="test:test">
+ <j:if test="${context.getVariable('maven.test.force') == null}">
+ <j:if test="${cloveroverride != 'true'}">
+ <j:set var="uptodatePropName" value="tests.uptodate"/>
+ <j:remove var="${uptodatePropName}"/>
+ <ant:mkdir dir="${basedir}/target/test-reports/"/>
+ <j:set var="uptodateFile" value="${basedir}/target/test-reports/tstamp"/>
+
+ <ant:uptodate property="${uptodatePropName}" targetfile="${uptodateFile}">
+ <ant:srcfiles dir="${basedir}/src/" includes="**/*"/>
+ </ant:uptodate>
+
+ <j:if test="${context.getVariable(uptodatePropName) == 'true'}">
+ <ant:echo>NOTICE: Skipping tests; they seem to have passed already</ant:echo>
+ <j:set var="maven.test.skip" value="true"/>
+ <j:set var="unitTestSourcesPresent" value="false"/>
</j:if>
- </postGoal>
+ </j:if>
+ </j:if>
+ </preGoal>
+
+ <!-- Update the timestamp of the last successful test -->
+ <postGoal name="test:test">
+ <j:if test="${context.getVariable('maven.test.failure') == null}">
+ <ant:touch file="${basedir}/target/test-reports/tstamp"/>
+ </j:if>
+ </postGoal>
- <postGoal name="war:webapp">
+ <postGoal name="war:webapp">
<j:set var="usesJar" value="${maven.war.usesJar}"/>
<ant:echo>Use classes.jar ? ${usesJar}</ant:echo>
<j:if test="${usesJar}">
<j:set var="webroot" value="${basedir}/target/${pom.artifactId}/WEB-INF"/>
- <ant:copy todir="${basedir}/target/work" includeEmptyDirs="false">
- <ant:fileset dir="${webroot}/classes"/>
- </ant:copy>
- <ant:available file="${basedir}/target/work" property="classes.present"/>
+ <ant:move todir="${basedir}/target/temp" includeEmptyDirs="false" failonerror="false">
+ <ant:fileset dir="${webroot}/classes">
+ <ant:include name="**/*" />
+ </ant:fileset>
+ <ant:fileset dir="${webroot}/work">
+ <ant:include name="**/*.class" />
+ </ant:fileset>
+ </ant:move>
+ <ant:available file="${basedir}/target/temp" property="classes.present"/>
<j:if test="${classes.present}">
- <ant:jar destfile="${webroot}/lib/classes.jar" basedir="${webroot}/classes"/>
- <ant:delete includeemptydirs="true">
- <ant:fileset dir="${webroot}/classes" includes="**/*"/>
- <ant:fileset dir="${basedir}/target/work" includes="**/*"/>
- </ant:delete>
+ <ant:jar destfile="${webroot}/lib/classes.jar" basedir="${basedir}/target/temp"/>
+ <ant:delete includeemptydirs="true" failonerror="false">
+ <ant:fileset dir="${webroot}/classes" includes="**/*"/>
+ <ant:fileset dir="${webroot}/work"/>
+ <ant:fileset dir="${basedir}/target/temp"/>
+ </ant:delete>
</j:if>
</j:if>
</postGoal>
Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Thu Apr 20 23:36:22 2006
@@ -97,7 +97,7 @@
geronimo_packaging_plugin_version=1.1.0-5
geronimo_assembly_plugin_version=1.1.0-10
-geronimo_deployment_plugin_version=1.1.0-1
+geronimo_deployment_plugin_version=1.1.0-2
geronimo_dependency_plugin_version=1.1.0-2
geronimo_spec_activation_version=1.0
Modified: geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly Thu Apr 20 23:36:22 2006
@@ -51,7 +51,10 @@
method="execute"/>
<define:jellybean
name="velocityFilter"
- className="org.apache.geronimo.deployment.mavenplugin.VelocityFilter"
+ className="org.apache.geronimo.deployment.mavenplugin.VelocityFilter"/>
+ <define:jellybean
+ name="mergeWebXML"
+ className="org.apache.geronimo.deployment.mavenplugin.MergeWebXML"
method="execute"/>
<define:tag name="unpackServer" xmlns="jelly:ant">
Modified: geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml?rev=395795&r1=395794&r2=395795&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml Thu Apr 20 23:36:22 2006
@@ -32,7 +32,7 @@
<package>org.apache.geronimo</package>
<logo></logo>
- <currentVersion>1.1.0-1</currentVersion>
+ <currentVersion>1.1.0-2</currentVersion>
<dependencies>
<dependency>