Hello,
Perhaps I'm mistaken, but shouldn't the meta-info XML files generated by the
merlin maven plugin end up in the jar file created by maven? Currently the
meta-info files end up in target/src. If we want them in the resulting jar
file, they need to end up in target/classes. The attached patch includes
the necessary changes if this is how it should work. (If it's not supposed
to work this way, anyone want to explain why?)
J. Aaron Farr
� SONY ELECTRONICS
� DDP-CIM
� (724) 696-7653
�
--- plugin.jelly~1~ 2003-05-30 14:12:02.000000000 -0400
+++ plugin.jelly 2003-06-06 16:23:11.000000000 -0400
@@ -25,19 +25,19 @@
</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"
+ <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}"
- format="${merlin.meta.format}"
+ <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">
<include name="**/*.java"/>
@@ -45,14 +45,14 @@
</meta>
</goal>
- <goal name="merlin:deploy"
+ <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.">
<echo>Merlin block deployment.</echo>
<echo>From jar: ${maven.build.dir}/${maven.final.name}.jar</echo>
<!--
- Assign a value to the merlin.system.dir variable. If the
+ Assign a value to the merlin.system.dir variable. If the
value has already been defined this will fail and the prior
defintion will hold.
-->
@@ -75,7 +75,7 @@
<j:set var="merlin.kernel" value="${merlin.kernel.config}"/>
</j:if>
- <!--
+ <!--
Declare the default configuration path which will be overriden
if an merlin.block.config property is set and exists.
-->
@@ -100,14 +100,14 @@
Launch Merlin with the supplied system, kernel, target and config
paths and internal debug priority.
-->
- <merlin:test
+ <merlin:test
system="${merlin.system}"
- kernel="${merlin.kernel}"
- home="${basedir}"
- target="${maven.build.dir}/${maven.final.name}.jar"
- config="${merlin.config}"
- debug="${merlin.debug}"
- wait="1000"
+ kernel="${merlin.kernel}"
+ home="${basedir}"
+ target="${maven.build.dir}/${maven.final.name}.jar"
+ config="${merlin.config}"
+ debug="${merlin.debug}"
+ wait="1000"
/>
</goal>
@@ -120,7 +120,7 @@
<echo>Block: ${maven.conf.dir}/block.xml</echo>
<!--
- Assign a value to the merlin.system.dir variable. If the
+ Assign a value to the merlin.system.dir variable. If the
value has already been defined this will fail and the prior
defintion will hold.
-->
@@ -143,7 +143,7 @@
<j:set var="merlin.kernel" value="${merlin.kernel.config}"/>
</j:if>
- <!--
+ <!--
Declare the default configuration path which will be overriden
if an merlin.block.config property is set and exists.
-->
@@ -168,15 +168,15 @@
Launch Merlin with the supplied system, kernel, target and config
paths and internal debug priority.
-->
- <merlin:test
+ <merlin:test
system="${merlin.system}"
- kernel="${merlin.kernel}"
- home="${basedir}"
- path="${maven.conf.dir}/block.xml"
- base="${basedir}/target/classes"
- config="${merlin.config}"
- debug="${merlin.debug}"
- wait="${wait}"
+ kernel="${merlin.kernel}"
+ home="${basedir}"
+ path="${maven.conf.dir}/block.xml"
+ base="${basedir}/target/classes"
+ config="${merlin.config}"
+ debug="${merlin.debug}"
+ wait="${wait}"
/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
