mdiggory 2004/04/07 12:44:05
Modified: commons-build/maven prep.xsl commonGoals.ent
Log:
cleanup
Revision Changes Path
1.2 +6 -6 jakarta-commons/commons-build/maven/prep.xsl
Index: prep.xsl
===================================================================
RCS file: /home/cvs/jakarta-commons/commons-build/maven/prep.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prep.xsl 7 Apr 2004 19:17:20 -0000 1.1
+++ prep.xsl 7 Apr 2004 19:44:05 -0000 1.2
@@ -6,16 +6,16 @@
<xsl:strip-space elements="*"/>
+ <!-- replace the extends -->
+ <xsl:template match="extend">
+ <extend>commons.xml</extend>
+ </xsl:template>
+
<!--This is generic template which copies the contents of elements and
attributes -->
- <xsl:template match="@* | *">
+ <xsl:template match="@* | * | node()">
<xsl:copy>
<xsl:apply-templates select="* | @* | text()"/>
</xsl:copy>
- </xsl:template>
-
- <!-- replace the extends -->
- <xsl:template match="extends">
- <extends>common-project.xml</extends>
</xsl:template>
</xsl:stylesheet>
1.2 +9 -3 jakarta-commons/commons-build/maven/commonGoals.ent
Index: commonGoals.ent
===================================================================
RCS file: /home/cvs/jakarta-commons/commons-build/maven/commonGoals.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commonGoals.ent 7 Apr 2004 19:17:20 -0000 1.1
+++ commonGoals.ent 7 Apr 2004 19:44:05 -0000 1.2
@@ -1,6 +1,12 @@
<!-- copy commons-build/project.xml local and change extends -->
<postGoal name="dist:prepare-src-filesystem">
- <ant:copy tofile="${maven.dist.src.assembly.dir}/common-project.xml"
file="../commons-build/project.xml"/>
- <ant:xslt in="${maven.dist.src.assembly.dir}/project.xml"
out="${maven.dist.src.assembly.dir}/project.xml.tmp"
style="../commons-build/maven/prep.xsl"/>
- <ant:move tofile="${maven.dist.src.assembly.dir}/project.xml"
file="${maven.dist.src.assembly.dir}/project.xml.tmp"/>
+${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
+ <copy file="../commons-build/project.xml"
tofile="${maven.dist.src.assembly.dir}/commons.xml"/>
+ <xslt in="${maven.dist.src.assembly.dir}/project.xml"
out="${maven.dist.src.assembly.dir}/project.xml.tmp"
style="../commons-build/maven/prep.xsl">
+ <outputproperty name="method" value="xml"/>
+ <outputproperty name="standalone" value="yes"/>
+ <outputproperty name="encoding" value="iso8859_1"/>
+ <outputproperty name="indent" value="yes"/>
+ </xslt>
+ <move file="${maven.dist.src.assembly.dir}/project.xml.tmp"
tofile="${maven.dist.src.assembly.dir}/project.xml"/>
</postGoal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
