shuber 2004/11/11 16:01:59 CET
Modified files:
. plugin.jelly
Log:
Added variable to make sure we activate the preGoal and postGoals only if we
go through this packaging plugin.
Revision Changes Path
1.11 +72 -60 maven-jahiawar-plugin/plugin.jelly
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.jelly.diff?r1=1.10&r2=1.11&f=h
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 13 Oct 2004 17:50:22 -0000 1.10
+++ plugin.jelly 11 Nov 2004 15:01:59 -0000 1.11
@@ -7,35 +7,38 @@
<postGoal name="war:webapp">
- <j:set var="useSharedLibs" value="${maven.jahiawar.usesharedlibs}"/>
- <j:if test="${useSharedLibs == 'true'}">
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('war.shared.lib') == 'true'}">
- <delete deleteonexit="true"
file="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${artifact.name}" />
- </j:if>
- </j:forEach>
- </j:if>
+ <j:if test="${inJahiaWarPlugin == 'true'}">
- <j:set var="precompileJsp" value="${maven.jahiawar.precompile.jsp}"/>
- <j:if test="${precompileJsp == 'true'}">
- <attainGoal name="jahia:precompile-jsp" />
- <j:set var="target"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>
- <util:available file="${maven.build.dir}/web-fragment.xml">
- <util:loadText var="fragment"
file="${maven.build.dir}/web-fragment.xml"/>
- <ant:replace file="${target}/WEB-INF/web.xml" token="<!-- [INSERT
FRAGMENT HERE] -->" value="${fragment}"/>
- </util:available>
- <!-- We now need to copy the compiled classes to the WEB-INF/classes
directory. -->
- <!--echo>Copying JSP classes from ${maven.build.dest} to
${maven.war.webapp.dir}/WEB-INF/classes ...</echo-->
- <copy todir="${maven.war.webapp.dir}/WEB-INF/classes">
- <fileset dir="${maven.build.dest}"/>
- </copy>
+ <j:set var="useSharedLibs" value="${maven.jahiawar.usesharedlibs}"/>
+ <j:if test="${useSharedLibs == 'true'}">
+ <j:forEach var="artifact" items="${pom.artifacts}">
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <j:if test="${dependency.getProperty('war.shared.lib') ==
'true'}">
+ <delete deleteonexit="true"
file="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${artifact.name}" />
+ </j:if>
+ </j:forEach>
+ </j:if>
+
+ <j:set var="precompileJsp" value="${maven.jahiawar.precompile.jsp}"/>
+ <j:if test="${precompileJsp == 'true'}">
+ <attainGoal name="jahia:precompile-jsp" />
+ <j:set var="target"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>
+ <util:available file="${maven.build.dir}/web-fragment.xml">
+ <util:loadText var="fragment"
file="${maven.build.dir}/web-fragment.xml"/>
+ <ant:replace file="${target}/WEB-INF/web.xml" token="<!--
[INSERT FRAGMENT HERE] -->" value="${fragment}"/>
+ </util:available>
+ <!-- We now need to copy the compiled classes to the WEB-INF/classes
directory. -->
+ <!--echo>Copying JSP classes from ${maven.build.dest} to
${maven.war.webapp.dir}/WEB-INF/classes ...</echo-->
+ <copy todir="${maven.war.webapp.dir}/WEB-INF/classes">
+ <fileset dir="${maven.build.dest}"/>
+ </copy>
+ </j:if>
+
+ <delete deleteonexit="true">
+ <fileset dir="${maven.build.dir}/${pom.artifactId}"
includes="${maven.jahiawar.excludes}" />
+ </delete>
+
</j:if>
-
-
- <delete deleteonexit="true">
- <fileset dir="${maven.build.dir}/${pom.artifactId}"
includes="${maven.jahiawar.excludes}" />
- </delete>
</postGoal>
@@ -85,44 +88,51 @@
</goal>
<preGoal name="war:war">
- <j:set var="mavenJahiaWARJarClasses"
value="${maven.jahiawar.jarclasses}"/>
- <j:set var="mavenJahiaWARJarClassesJustClasses"
value="${maven.jahiawar.jarclasses.justclasses}"/>
- <j:set var="mavenJahiaWARJarClassesName"
value="${maven.jahiawar.jarclasses.name}"/>
- <j:if test="${mavenJahiaWARJarClasses == 'true'}" trim="true">
- <j:choose>
-
- <j:when test="${mavenJahiaWARJarClassesJustClasses == 'true'}"
trim="true">
- <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${mavenJahiaWARJarClassesName}"
- basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
- includes="**/*.class"
- />
- <!-- we do all this mess because the delete includeEmptyDirs
doesn't seem to work in Ant :( -->
- <mkdir
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources"/>
- <copy includeEmptyDirs="false"
toDir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources">
- <fileset
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
- <exclude name="**/*.class"/>
- </fileset>
- </copy>
- <delete dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
/>
- <move todir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
- <fileset
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources"/>
- </move>
- </j:when>
-
- <j:otherwise>
- <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${mavenJahiaWARJarClassesName}"
- basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
- includes="**/*"
- />
- <delete dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
/>
- <mkdir dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
/>
- </j:otherwise>
+
+ <j:if test="${inJahiaWarPlugin == 'true'}">
+
+ <j:set var="mavenJahiaWARJarClasses"
value="${maven.jahiawar.jarclasses}"/>
+ <j:set var="mavenJahiaWARJarClassesJustClasses"
value="${maven.jahiawar.jarclasses.justclasses}"/>
+ <j:set var="mavenJahiaWARJarClassesName"
value="${maven.jahiawar.jarclasses.name}"/>
+ <j:if test="${mavenJahiaWARJarClasses == 'true'}" trim="true">
+ <j:choose>
- </j:choose>
+ <j:when test="${mavenJahiaWARJarClassesJustClasses == 'true'}"
trim="true">
+ <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${mavenJahiaWARJarClassesName}"
+
basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
+ includes="**/*.class"
+ />
+ <!-- we do all this mess because the delete includeEmptyDirs
doesn't seem to work in Ant :( -->
+ <mkdir
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources"/>
+ <copy includeEmptyDirs="false"
toDir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources">
+ <fileset
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
+ <exclude name="**/*.class"/>
+ </fileset>
+ </copy>
+ <delete
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
+ <move
todir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
+ <fileset
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources"/>
+ </move>
+ </j:when>
+
+ <j:otherwise>
+ <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${mavenJahiaWARJarClassesName}"
+
basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
+ includes="**/*"
+ />
+ <delete
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
+ <mkdir
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
+ </j:otherwise>
+
+ </j:choose>
+ </j:if>
+
</j:if>
+
</preGoal>
<goal name="jahia:war" description="Builds a WAR using Jahia's specific
packaging">
+ <j:set var="inJahiaWarPlugin" value="true"/>
<attainGoal name="war:war" />
</goal>
@@ -131,6 +141,7 @@
<!-- ================================================================ -->
<goal name="jahia:hotdeploy-tomcat" description="Deploy only changes into
Tomcat">
+ <j:set var="inJahiaWarPlugin" value="true"/>
<attainGoal name="war:webapp"/>
<echo message="Hot deploying ${pom.id}, ${pom.name}"/>
<copy
todir="${maven.jahiawar.deploy.war.dir}/${maven.jahiawar.deploy.context.name}">
@@ -139,6 +150,7 @@
</goal>
<goal name="jahia:deploy-tomcat" description="Full deployment, erasing old
directory first">
+ <j:set var="inJahiaWarPlugin" value="true"/>
<attainGoal name="war:war"/>
<echo message="Deploying ${pom.id}, ${pom.name}"/>
<delete
dir="${maven.jahiawar.deploy.war.dir}/${maven.jahiawar.deploy.context.name}"/>
