mcconnell 2003/08/26 05:18:56
Modified: merlin/merlin-plugin plugin.jelly
Log:
Plugin update - was not correctly locating the meven repository.
Revision Changes Path
1.28 +9 -2 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- plugin.jelly 26 Aug 2003 11:54:24 -0000 1.27
+++ plugin.jelly 26 Aug 2003 12:18:56 -0000 1.28
@@ -67,8 +67,15 @@
<!--
Set the repository path.
-->
- <j:set var="merlin.repository.local" value="${maven.home.local}"/>
- <j:set var="merlin.repository.local" value="${user.dir}/.maven"/>
+ <j:set var="merlin.repo.local" value="${maven.home.local}"/>
+ <util:file var="repo" name="${merlin.repo.local}"/>
+ <j:if test="${repo.exists()}">
+ <j:set var="merlin.repository.local" value="${merlin.repo.local}"/>
+ </j:if>
+ <j:if test="${!repo.exists()}">
+ <j:set var="merlin.repository.local" value="${user.dir}/.maven"/>
+ </j:if>
+ <echo>merlin.repository.local/2 = ${merlin.repository.local}</echo>
<!--
If a kernel configuration has been declared the use it otherwise
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
