PR: MAVEN-1219

plugin install/uninstall now goals


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115068 13f79535-47bb-0310-9956-ffa450edef68

plugin/plugin.jelly

@@ -43,18 +43,32 @@
     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 -->
 
     <copy file="${maven.build.dir}/${maven.final.name}.jar"
       todir="${maven.home}/plugins"/>
+  </goal>
 
+  <goal name="plugin:install-now" prereqs="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}" />
+    <maven:uninstallPlugin artifactId="${pom.artifactId}" />
+    <maven:installPlugin file="${maven.build.dir}/${maven.final.name}.jar" cache="true" />
   </goal>
 
   <goal name="plugin:uninstall" 
     description="Uninstall all versions of the plugin">
 
     <plugin:uninstall name="${pom.artifactId}" />
+    <plugin:clearCache />
   </goal>
-    
+
+  <goal name="plugin:uninstall-now" prereqs="plugin:uninstall"
+    description="Uninstall all versions of the plugin, including those in the currently running instance of Maven">
+    <maven:uninstallPlugin artifactId="${pom.artifactId}" />
+  </goal>
+
   <goal name="plugin:deploy" prereqs="plugin"
     description="Install a specific unpacked plugin but no new jar">
 
@@ -265,11 +279,19 @@
         </ant:fileset>
       </ant:delete>
 
+      <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>
+
+    <define:tag name="clearCache">
       <ant:delete includeEmptyDirs="true" verbose="false" failonerror="false">
         <ant:fileset dir="${maven.plugin.unpacked.dir}">
           <ant:include name="*.cache"/>
           <ant:include name="**/.processed" />
-          <ant:include name="${name}-*/**" />
         </ant:fileset>
       </ant:delete>
     </define:tag>