mcconnell 2004/04/12 09:01:57
Modified: merlin/kernel/plugin index.ent maven.xml project.xml
Added: merlin/kernel/plugin copy-all.xsl
Log:
Update merlin-plugin to eliminate ent reference in packaged project.xml.
Revision Changes Path
1.5 +2 -0 avalon/merlin/kernel/plugin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/index.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 9 Apr 2004 06:52:02 -0000 1.4
+++ index.ent 12 Apr 2004 16:01:57 -0000 1.5
@@ -1,3 +1,5 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % repo-entities SYSTEM
"file:../../../versioning/avalon-repository.ent"> %repo-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % logging-entities SYSTEM
"file:../../../versioning/avalon-logging.ent"> %logging-entities;
1.7 +16 -5 avalon/merlin/kernel/plugin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 13 Dec 2003 21:08:31 -0000 1.6
+++ maven.xml 12 Apr 2004 16:01:57 -0000 1.7
@@ -1,13 +1,24 @@
-<project default="plugin:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="plugin:install" xmlns:ant="jelly:ant">
-
- <!--
- Add the merlin.properties file.
- -->
<postGoal name="java:compile">
<ant:copy
file="${maven.repo.local}/${pom.groupId}/properties/merlin.properties"
toDir="${maven.build.dir}/classes" verbose="yes"/>
</postGoal>
+ <preGoal name="jar:jar">
+ <attainGoal name="avalon:generate"/>
+ </preGoal>
+
+ <goal name="avalon:generate">
+ <echo message="starting"/>
+ <mkdir dir="${maven.build.dir}/classes"/>
+ <ant:xslt in="${basedir}/project.xml"
out="${maven.build.dir}/classes/project.xml"
+ style="${basedir}/copy-all.xsl">
+ <outputproperty name="method" value="xml" />
+ <outputproperty name="standalone" value="yes"/>
+ <outputproperty name="indent" value="yes"/>
+ </ant:xslt>
+ <echo message="done"/>
+ </goal>
</project>
1.23 +0 -1 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 9 Apr 2004 06:52:02 -0000 1.22
+++ project.xml 12 Apr 2004 16:01:57 -0000 1.23
@@ -51,7 +51,6 @@
<include>plugin.jelly</include>
<include>plugin.properties</include>
<include>project.properties</include>
- <include>project.xml</include>
</includes>
</resource>
<resource>
1.1 avalon/merlin/kernel/plugin/copy-all.xsl
Index: copy-all.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns="http://www.w3.org/1999/xhtml";>
<xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
<xsl:copy>
<xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
