You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/09 04:08:04 UTC
cvs commit: avalon-sandbox/merlin/merlin-plugin plugin.jelly
mcconnell 2003/06/08 19:08:04
Modified: merlin/merlin-plugin plugin.jelly
Log:
Updated maven plugin based on patch from Aaron Farr.
Revision Changes Path
1.8 +7 -5 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 9 Jun 2003 01:10:17 -0000 1.7
+++ plugin.jelly 9 Jun 2003 02:08:04 -0000 1.8
@@ -25,18 +25,20 @@
</classpath>
</taskdef>
- <ant:property name="merlin.build.meta.dir" value="${maven.build.src}"/>
+ <!--
+ <ant:property name="merlin.build.meta.dir" value="${maven.build.dest}"/>
<ant:path id="merlin.build.meta.path">
<pathelement location="${merlin.build.meta.dir}"/>
</ant:path>
<maven:addPath id="maven.compile.src.set" refid="merlin.build.meta.path"/>
+ -->
<goal name="merlin:meta"
description="Generate meta info descriptors based on meta tags declared in Java source files for inclusion in a jar file.">
<echo>meta source dir: ${maven.src.dir}</echo>
- <echo>meta dest dir: ${maven.build.src}</echo>
- <mkdir dir="${maven.build.src}"/>
- <meta destDir="${maven.build.src}"
+ <echo>meta dest dir: ${maven.build.dest}</echo>
+ <mkdir dir="${maven.build.dest}"/>
+ <meta destDir="${maven.build.dest}"
format="${merlin.meta.format}"
force="${merlin.meta.force}">
<fileset dir="${maven.src.dir}/java">
@@ -46,7 +48,7 @@
</goal>
<goal name="merlin:deploy"
- description="Deployment of a jar file containing a block.xml directive and execution of all components associated with a lauch on startup policy.">
+ description="Deployment of a jar file containing a block.xml directive and execution of all components associated with a launch on startup policy.">
<echo>Merlin block deployment.</echo>
<echo>From jar: ${maven.build.dir}/${maven.final.name}.jar</echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org