dion 2003/09/26 10:44:31
Modified: src/plugins-build/plugin plugin.jelly
Log:
Apply MAVEN-860
Revision Changes Path
1.19 +18 -12 maven/src/plugins-build/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 18 Sep 2003 09:02:31 -0000 1.18
+++ plugin.jelly 26 Sep 2003 17:44:31 -0000 1.19
@@ -187,22 +187,28 @@
<j:set var="remoteFile"
value="${repo}/${groupId}/plugins/${artifactId}-${version}.jar" />
<echo>trying to download ${remoteFile}</echo>
- <j:invokeStatic var="dummy" method="getFile"
- className="org.apache.maven.util.HttpUtils">
- <j:arg type="java.lang.String" value="${remoteFile}" />
- <j:arg type="java.io.File" value="${localPlugin}"/>
- <j:arg type="boolean" value="false"/>
- <j:arg type="boolean" value="true"/>
- <j:arg type="java.lang.String" value="${maven.proxy.host}" />
- <j:arg type="java.lang.String" value="${maven.proxy.port}" />
- <j:arg type="java.lang.String" value="${maven.proxy.username}" />
- <j:arg type="java.lang.String" value="${maven.proxy.password}" />
- <j:arg type="boolean" value="false"/>
- </j:invokeStatic>
+ <j:catch var="ex">
+ <j:invokeStatic var="dummy" method="getFile"
+ className="org.apache.maven.util.HttpUtils">
+ <j:arg type="java.lang.String" value="${remoteFile}" />
+ <j:arg type="java.io.File" value="${localPlugin}"/>
+ <j:arg type="boolean" value="false"/>
+ <j:arg type="boolean" value="true"/>
+ <j:arg type="java.lang.String" value="${maven.proxy.host}" />
+ <j:arg type="java.lang.String" value="${maven.proxy.port}" />
+ <j:arg type="java.lang.String" value="${maven.proxy.username}" />
+ <j:arg type="java.lang.String" value="${maven.proxy.password}" />
+ <j:arg type="boolean" value="false"/>
+ </j:invokeStatic>
+ </j:catch>
</j:if>
+ <j:break test="${localPlugin.exists()}"/>
</j:forEach>
<j:set var="downloaded" value="${localPlugin.exists()}"/>
+ <j:if test="${!downloaded}">
+ <ant:fail message="Unable to find plug-in" />
+ </j:if>
<j:if test="${downloaded}">
<echo>Plugin downloaded, removing other versions</echo>
<delete verbose="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
