dion 2003/07/03 17:04:14
Modified: src/plugins-build/eclipse plugin.jelly
Log:
Fix external-tools to work with cached goals
Revision Changes Path
1.20 +5 -4 maven/src/plugins-build/eclipse/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/eclipse/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 30 Jun 2003 05:56:07 -0000 1.19
+++ plugin.jelly 4 Jul 2003 00:04:14 -0000 1.20
@@ -194,7 +194,8 @@
<externaltools>
<j:set var="project" value="${org.apache.commons.jelly.werkz.Project}"/>
- <j:forEach var="goal" items="${project.goals}">
+ <j:set var="session" value="${maven.session}"/>
+ <j:forEach var="goal" items="${session.allGoalNames}">
<j:set var="maven.eclipse.generate" value="false"/>
<j:set var="allGoals" value="${maven.eclipse.goals}" />
@@ -203,7 +204,7 @@
<j:set var="maven.eclipse.generate" value="true"/>
</j:when>
<j:otherwise>
- <j:if test="${goal.name.indexOf(':') == '-1'}">
+ <j:if test="${goal.indexOf(':') == '-1'}">
<j:set var="maven.eclipse.generate" value="true"/>
</j:if>
</j:otherwise>
@@ -214,12 +215,12 @@
<entry key="!{tool_refresh}">$${project}</entry>
<entry key="!{tool_show_log}">true</entry>
<entry key="!{tool_loc}">${tool.loc}</entry>
- <entry key="!{tool_args}">-e -p $${resource_loc} ${goal.name}</entry>
+ <entry key="!{tool_args}">-e -p $${resource_loc} ${goal}</entry>
<entry key="!{tool_block}">false</entry>
<entry
key="!{tool_type}">org.eclipse.ui.externaltools.type.program</entry>
<entry key="!{tool_dir}">$${container_loc}</entry>
<entry key="!{tool_build_types}"></entry>
- <entry key="!{tool_name}">Maven ${goal.name}</entry>
+ <entry key="!{tool_name}">Maven ${goal}</entry>
</tool>
</j:if>
</j:forEach>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
