morciuch 2004/04/19 17:08:02
Modified: plugin plugin.jelly
Log:
Adjusted to work with the new bin distribution format.
Revision Changes Path
1.3 +29 -27 jakarta-jetspeed/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/plugin/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 9 Apr 2004 04:54:30 -0000 1.2
+++ plugin.jelly 20 Apr 2004 00:08:02 -0000 1.3
@@ -27,11 +27,13 @@
-->
<goal name="jetspeed:war" description="Create custom .war file based on
jetspeed binary distribution">
<j:set var="maven.war.src" value="${war.stage.dir}/webapp"/>
- <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
- <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
- <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
- <echo>[DEBUG] maven.war.build.dir = ${maven.war.build.dir}</echo>
- <echo>[DEBUG] maven.dependency.classpath =
${maven.dependency.classpath}</echo>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
+ <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
+ <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
+ <echo>[DEBUG] maven.war.build.dir =
${maven.war.build.dir}</echo>
+ <echo>[DEBUG] maven.dependency.classpath =
${maven.dependency.classpath}</echo>
+ </j:if>
<!-- recreate target area -->
<!--attainGoal name="war:init"/-->
<mkdir dir="${maven.war.src}"/>
@@ -45,32 +47,24 @@
<j:set var="internal.war.path"
value="${dep.getProperty('dist.native.name')}"/>
<j:set var="internal.war.path"
value="${dep.getProperty('dist.native.name')}"/>
<u:tokenize var="parts"
delim=":">${dep.getId()}</u:tokenize>
- <j:set var="depid" value="${parts[0]}"/>
+ <j:set var="depid" value="${parts[0]}"/>
<j:set var="dist.dependency.zip"
value="${maven.repo.local}/${depid}/distributions/${dep.getArtifact()}"/>
- <echo>[DEBUG] dist.dependency.zip =
${dist.dependency.zip}</echo>
- <echo>[DEBUG] dist.name = ${dist.name}</echo>
- <echo>[DEBUG] internal.war.path=
${internal.war.path}</echo>
- <echo>[DEBUG] depid= ${depid}</echo>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] dist.dependency.zip =
${dist.dependency.zip}</echo>
+ <echo>[DEBUG] dist.name = ${dist.name}</echo>
+ <echo>[DEBUG] internal.war.path=
${internal.war.path}</echo>
+ <echo>[DEBUG] depid= ${depid}</echo>
+ </j:if>
<!-- extract .war file from distribution -->
<unzip src="${dist.dependency.zip}"
dest="${maven.war.src}">
- <!-- This only extracts the .war -->
- <patternset>
- <!--include name="**/*.war"/-->
- <include name="**/webapp/*.*"/>
- </patternset>
<!-- This extracts the .war and expands it -->
- <!--fileset dir=".">
- <include name="**/*.war"/>
- <exclude name="**/${pom.id}.war"/>
- </fileset-->
+ <fileset dir=".">
+ <include name="**/*.war"/>
+ <exclude
name="**/${pom.artifactId}.war"/>
+ </fileset>
</unzip>
- <move todir="${maven.war.src}">
- <fileset
dir="${maven.war.src}/${internal.war.path}/webapp"/>
- </move>
<!-- delete work files from distribution -->
<delete dir="${maven.war.src}/${internal.war.path}"/>
- <!--delete dir="${maven.war.src}/META-INF"/>
- <delete dir="${maven.war.src}/WEB-INF/lib"/-->
</j:if>
</j:forEach>
<!-- copy application webapp source to stage webapp -->
@@ -80,6 +74,8 @@
<exclude name="**/*Entries*"/>
<exclude name="**/*Repository*"/>
<exclude name="**/*Tag*"/>
+ <exclude name="**/*.log"/>
+ <exclude name="**/*.log.1"/>
</fileset>
</copy>
<!-- create project .jar file -->
@@ -122,9 +118,13 @@
<j:set var="props.dir" value="${maven.war.src}/WEB-INF/conf"/>
<u:tokenize var="merge.prop.files"
delim=",">${maven.merge.properties}</u:tokenize>
<j:forEach items="${merge.prop.files}" var="prop.file">
- <echo>[DEBUG] Merging ${prop.file}</echo>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] Merging ${prop.file}</echo>
+ </j:if>
<j:if test="${maven.env.name == null}">
- <echo>[DEBUG] Merging ${prop.file} for
${maven.env.name}</echo>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] Merging ${prop.file} for
${maven.env.name}</echo>
+ </j:if>
<props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${props.dir}/${prop.file}-${maven.env.name}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
</j:if>
<props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${props.dir}/${prop.file}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
@@ -133,7 +133,9 @@
<j:if test="${maven.env.name == null}">
<u:tokenize var="local.xreg.files"
delim=",">${maven.copy.env.xreg}</u:tokenize>
<j:forEach items="${local.xreg.files}" var="xreg.file">
- <echo>[DEBUG] Copying local-${xreg.file} for
${maven.env.name}</echo>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] Copying local-${xreg.file} for
${maven.env.name}</echo>
+ </j:if>
<copy
file="${props.dir}/local-${xreg.file}-${maven.env.name}.xreg.copy"
toFile="${props.dir}/local-${xreg.file}.xreg" failonerror="false"/>
</j:forEach>
</j:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
