brett 2004/06/28 02:42:48
Modified: plugin plugin.jelly project.xml
plugin/xdocs changes.xml
Log:
separate cache from plusing directory
Revision Changes Path
1.39 +18 -36 maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plugin.jelly 25 Jun 2004 16:52:18 -0000 1.38
+++ plugin.jelly 28 Jun 2004 09:42:48 -0000 1.39
@@ -44,33 +44,28 @@
<ant:fail>
Must remove the deploy plugin to use this version of the plugin plugin.
Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar
from
- ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
+ ${maven.plugin.dir} and ${maven.plugin.user.dir} (if it exists)
</ant:fail>
</j:if>
</j:if>
- <goal name="plugin"
- description="Build a plugin jar and install to the maven.repo.local">
-
- <!-- Plugins are just a jar. -->
- <attainGoal name="jar:jar"/>
-
- <copy file="${maven.build.dir}/${maven.final.name}.jar"
- todir="${maven.repo.local}/${pom.groupId}/plugins" />
-
+ <goal name="plugin" prereqs="plugin:plugin" description="Build a plugin jar" />
+ <goal name="plugin:plugin" description="Build a plugin jar">
+ <!-- For some reason a prereq on this causes an internal error... -->
+ <attainGoal name="jar:jar" />
</goal>
- <goal name="plugin:install" prereqs="plugin"
+ <goal name="plugin:install" prereqs="plugin:plugin"
description="Install the plugin jar, prepare Maven to expand it locally and
clear caches">
<plugin:uninstall name="${pom.artifactId}" />
- <!-- Don't clear the cache. RC3 will do this if we happened to clean up an
additional version -->
+ <!-- Don't clear the cache. Maven will do this if we happened to clean up an
additional version -->
<copy file="${maven.build.dir}/${maven.final.name}.jar"
- todir="${maven.home}/plugins"/>
+ todir="${maven.plugin.dir}" />
</goal>
- <goal name="plugin:install-now" prereqs="plugin"
+ <goal name="plugin:install-now" prereqs="plugin:plugin"
description="Build a plugin and load it into the currently running instance of
Maven.">
<!-- The cache should remain intact through these operations -->
<plugin:uninstall name="${pom.artifactId}" />
@@ -90,21 +85,6 @@
<maven:uninstallPlugin artifactId="${pom.artifactId}" />
</goal>
- <goal name="plugin:deploy" prereqs="plugin"
- description="Install a specific unpacked plugin but no new jar">
-
- <mkdir dir="${maven.plugin.unpacked.dir}/${maven.final.name}"/>
- <unzip src="${maven.build.dir}/${maven.final.name}.jar"
- dest="${maven.plugin.unpacked.dir}/${maven.final.name}"/>
-
- <echo message="" >
- Warning: Contents of ${maven.home}/plugins/${maven.final.name}.jar does not match
- the unpacked contents of ${maven.plugin.unpacked.dir}/${maven.final.name}
directory.
- </echo>
-
- </goal>
-
-
<!-- generate documentation -->
<!-- generate docs that are usually missing -->
@@ -220,7 +200,7 @@
<goal name="plugin:download" description="download and install a plugin from a
remote repo" prereqs="plugin:download-artifact">
<plugin:uninstall name="${artifactId}" />
- <u:file var="localPlugin"
name="${maven.home}/plugins/${artifactId}-${version}.jar" />
+ <u:file var="localPlugin"
name="${maven.plugin.dir}/${artifactId}-${version}.jar" />
<ant:copy file="${localPluginFile}" tofile="${localPlugin}" />
</goal>
@@ -282,7 +262,7 @@
</u:available>
</goal>
- <goal name="plugin:repository-install" prereqs="plugin">
+ <goal name="plugin:repository-install" prereqs="plugin:plugin">
<artifact:install
artifact="${maven.build.dir}/${maven.final.name}.jar"
type="plugin"
@@ -290,7 +270,7 @@
/>
</goal>
- <goal name="plugin:repository-install-snapshot" prereqs="plugin">
+ <goal name="plugin:repository-install-snapshot" prereqs="plugin:plugin">
<artifact:install-snapshot
artifact="${maven.build.dir}/${maven.final.name}.jar"
type="plugin"
@@ -298,7 +278,7 @@
/>
</goal>
- <goal name="plugin:repository-deploy" prereqs="plugin">
+ <goal name="plugin:repository-deploy" prereqs="plugin:plugin">
<artifact:deploy
artifact="${maven.build.dir}/${maven.final.name}.jar"
type="plugin"
@@ -306,7 +286,7 @@
/>
</goal>
- <goal name="plugin:repository-deploy-snapshot" prereqs="plugin">
+ <goal name="plugin:repository-deploy-snapshot" prereqs="plugin:plugin">
<artifact:deploy-snapshot
artifact="${maven.build.dir}/${maven.final.name}.jar"
type="plugin"
@@ -317,7 +297,10 @@
<define:taglib uri="plugin">
<define:tag name="uninstall">
<ant:delete verbose="false" failonerror="false">
- <ant:fileset dir="${maven.home}/plugins">
+ <ant:fileset dir="${maven.plugin.dir}">
+ <ant:include name="${name}-*.jar" />
+ </ant:fileset>
+ <ant:fileset dir="${maven.plugin.user.dir}">
<ant:include name="${name}-*.jar" />
</ant:fileset>
</ant:delete>
@@ -325,7 +308,6 @@
<ant:delete includeEmptyDirs="true" verbose="false" failonerror="false">
<ant:fileset dir="${maven.plugin.unpacked.dir}">
<ant:include name="${name}-*/**" />
- <ant:include name="${name}-*.jar" />
</ant:fileset>
</ant:delete>
</define:tag>
1.38 +1 -1 maven-plugins/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/project.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- project.xml 25 Jun 2004 15:24:30 -0000 1.37
+++ project.xml 28 Jun 2004 09:42:48 -0000 1.38
@@ -24,7 +24,7 @@
<id>maven-plugin-plugin</id>
<name>Maven Plugin Plugin</name>
<currentVersion>1.5-SNAPSHOT</currentVersion>
- <description>Maven Plugin management plugin. Requires Maven 1.0 RC3.</description>
+ <description>Maven Plugin management plugin. Requires Maven 1.0 RC4.</description>
<shortDescription>Maven Plugin plugin</shortDescription>
<url>http://maven.apache.org/reference/plugins/plugin/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPPLUGIN</issueTrackingUrl>
1.23 +3 -0 maven-plugins/plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- changes.xml 25 Jun 2004 13:53:28 -0000 1.22
+++ changes.xml 28 Jun 2004 09:42:48 -0000 1.23
@@ -25,6 +25,9 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPPLUGIN-16">Install to
maven.plugin.dir instead of maven.home/plugins</action>
+ <action dev="brett" type="update">More consistency in default goal naming
(plugin:plugin)</action>
+ <action dev="brett" type="update">plugin goal no longer installs to local
repository: use plugin:repository-install</action>
<action dev="brett" type="update">Use the artifact plugin instead of the
deploy plugin</action>
</release>
<release version="1.4" date="2004-05-13">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
