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/12/10 15:42:50 UTC
cvs commit: avalon/merlin/kernel/plugin plugin.jelly
mcconnell 2003/12/10 06:42:50
Modified: merlin/kernel/plugin plugin.jelly
Log:
Remove dead code.
Revision Changes Path
1.4 +0 -84 avalon/merlin/kernel/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 8 Dec 2003 15:37:13 -0000 1.3
+++ plugin.jelly 10 Dec 2003 14:42:49 -0000 1.4
@@ -52,88 +52,4 @@
/>
</goal>
- <!--
- <goal name="merlin:execute" prereqs="merlin:prepare-context">
- <merlin:kernel
- repository="${merlin.repository.local}"
- home="${merlin.basedir}"
- anchor="${merlin.anchor}"
- kernel="${merlin.kernel}"
- target="${merlin.target}"
- config="${merlin.config}"
- debug="${merlin.debug}"
- info="${merlin.info}"
- wait="${wait}"/>
- </goal>
- -->
-
- <goal name="merlin:prepare-context">
-
- <ant:property environment="env"/>
-
- <!--
- Assign a value to the merlin.anchor.dir variable. If the
- value has already been defined this will fail and the prior
- defintion will hold.
- -->
-
- <j:set var="merlin.anchor.dir" value="${merlin.anchor}"/>
- <j:set var="merlin.anchor.dir" value="${basedir}"/>
- <util:file var="anchorFile" name="${merlin.anchor.dir}"/>
- <j:if test="${anchorFile.exists()}">
- <j:set var="merlin.anchor" value="${merlin.anchor.dir}"/>
- </j:if>
-
- <!--
- Set the repository path.
- -->
- <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}/repository"/>
- </j:if>
- <j:if test="${!repo.exists()}">
- <j:set var="merlin.repository.local" value="${user.dir}/.maven/repository"/>
- </j:if>
-
- <!--
- 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}/kernel.xml"/>
- <j:set var="merlin.kernel.config" value="${merlin.kernel}"/>
- <util:file var="kernelFile" name="${merlin.kernel.config}"/>
- <j:if test="${kernelFile.exists()}">
- <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.
- -->
- <j:set var="merlin.config" value="${maven.conf.dir}/config.xml"/>
- <j:set var="merlin.block.config" value="${merlin.config}"/>
- <util:file var="configFile" name="${merlin.block.config}"/>
- <j:if test="${configFile.exists()}">
- <j:set var="merlin.config" value="${merlin.block.config}"/>
- </j:if>
-
- <j:if test="${context.getVariable('merlin.debug') == null}">
- <j:set var="merlin.debug" value="false"/>
- </j:if>
- <j:if test="${context.getVariable('merlin.debug') != null}">
- <j:if test="${context.getVariable('merlin.debug') == 'true'}">
- <j:set var="merlin.debug" value="true"/>
- </j:if>
- <j:if test="${context.getVariable('merlin.debug') != 'true'}">
- <j:set var="merlin.debug" value="false"/>
- </j:if>
- </j:if>
-
- <j:set var="wait" value="${merlin.kernel.wait}"/>
- <j:if test="${wait == null}">
- <j:set var="wait" value="1000"/>
- </j:if>
- </goal>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org