dion 2003/09/18 00:26:25
Modified: src/plugins-build/plugin/xdocs goals.xml changes.xml
src/plugins-build/plugin plugin.jelly
Log:
Added plugin:download goal
Revision Changes Path
1.2 +7 -0 maven/src/plugins-build/plugin/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 24 Jan 2003 03:45:13 -0000 1.1
+++ goals.xml 18 Sep 2003 07:26:24 -0000 1.2
@@ -16,6 +16,13 @@
<description>Install an unpacked version of the plugin</description>
</goal>
<goal>
+ <name>plugin:download</name>
+ <description>
+ Download and install plugin from the remote repos.
+ Must provide groupId, artifactId and version variables.
+ </description>
+ </goal>
+ <goal>
<name>plugin:generate-docs</name>
<description>Generate navigation, goals and properties docs</description>
</goal>
1.4 +3 -0 maven/src/plugins-build/plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 8 Sep 2003 12:05:09 -0000 1.3
+++ changes.xml 18 Sep 2003 07:26:24 -0000 1.4
@@ -7,6 +7,9 @@
<body>
<release version="1.1" date="in CVS">
+ <action dev="dion" type="add">
+ Added plugin:download goal
+ </action>
<action dev="evenisse" type="fix">
Fixed MAVEN-708. Fix the goals description generation if there is no
plugin.jelly file.
</action>
1.16 +13 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 8 Sep 2003 12:05:09 -0000 1.15
+++ plugin.jelly 18 Sep 2003 07:26:25 -0000 1.16
@@ -172,7 +172,6 @@
</goal>
<!-- download a plugin from a remote repo -->
- <!-- TODO - is this still needed with plugin dependencies? -->
<goal name="plugin:download">
<maven:param-check value="${artifactId}" fail="true" message="'artifactId' must
be specified"/>
<maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
@@ -184,10 +183,22 @@
<u:file var="localPlugin"
name="${maven.home}/plugins/${artifactId}-${version}.jar" />
<j:if test="${!localPlugin.exists()}">
+ <u:file var="localPluginFile" name="${localPlugin}"/>
<j:set var="remoteFile"
value="${repo}/${groupId}/plugins/${artifactId}-${version}.jar" />
<echo>trying to download ${remoteFile}</echo>
- <http:get uri="${remoteFile}" var="outputVar" />
+ <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="${localPluginFile}"/>
+ <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:if>
</j:forEach>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
