mcconnell 2003/08/18 22:46:25
Modified: merlin/merlin-plugin plugin.jelly
Log:
Correct kernel references.
Revision Changes Path
1.21 +2 -3 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 19 Aug 2003 05:45:15 -0000 1.20
+++ plugin.jelly 19 Aug 2003 05:46:25 -0000 1.21
@@ -44,8 +44,7 @@
If a kernel configuration has been declared the use it otherwise
we default to the merlin installation kernel definition.
-->
- <j:set var="merlin.kernel"
- value="${env.MERLIN_HOME}/repository/merlin/xmls/kernel-3.0.xml"/>
+ <j:set var="merlin.kernel" value="${maven.conf.dir}/kernel.xml"/>
<j:set var="merlin.kernel.config" value="${merlin.kernel}"/>
<util:file var="kernelFile" name="${merlin.kernel.config}"/>
<j:if test="${kernelFile.exists()}">
@@ -120,7 +119,7 @@
If a kernel configuration has been declared the use it otherwise
we default to the merlin installation kernel definition.
-->
- <j:set var="merlin.kernel" value="${maven.conf.dir}/config/kernel.xml"/>
+ <j:set var="merlin.kernel" value="${maven.conf.dir}/kernel.xml"/>
<j:set var="merlin.kernel.config" value="${merlin.kernel}"/>
<util:file var="kernelFile" name="${merlin.kernel.config}"/>
<j:if test="${kernelFile.exists()}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
