PR: MPIDEA-4

fix idea:multiproject


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

idea/plugin.jelly

@@ -19,10 +19,13 @@
 
 
 <project xmlns:j="jelly:core"
+    xmlns:multiproject="multiproject"
     xmlns:ant="jelly:ant"
     xmlns:util="jelly:util"
     xmlns:maven="jelly:maven">
 
+    <multiproject:dependency-handle />
+
     <!--==================================================================-->
     <!-- Generate IntelliJ IDEA project, workspace and model files        -->
     <!--==================================================================-->
@@ -84,10 +87,8 @@
     <goal name="idea:multiproject" prereqs="idea:init">
 
         <j:set var="ideaVersion" value="${maven.idea.project.version}"/>
-        <j:if test="${ideaVersion=='3'}"> 
-             <ant:echo>WARNING: This goal should be used only with IDEA 4.</ant:echo>
-             <ant:echo>Property 'maven.idea.project.version' is set to '3'</ant:echo>
-             <!-- how to exist from goal? -->
+        <j:if test="${ideaVersion == '3'}"> 
+          <ant:fail>ERROR: This goal should be used only with IDEA 4 and above.</ant:fail>
         </j:if>
 
       
@@ -111,7 +112,6 @@
         <j:if test="${multiprojectBasedir == null or multiprojectBasedir.length() eq 0}">
            <maven:pluginVar var="multiprojectBasedir" plugin="maven-multiproject-plugin" property="maven.multiproject.basedir"/>
         </j:if>
-
        
         <maven:reactor
             basedir="${multiprojectBasedir}"
@@ -130,3 +130,4 @@
     </goal>
 
 </project>
+

idea/plugin.properties

@@ -14,5 +14,5 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-# Project version - v3 for 3.0+; v4 for "Aurora"
-maven.idea.project.version=3
+# Project version - valid values are 3, 4
+maven.idea.project.version=4

idea/project.xml

@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-idea-plugin</id>
   <name>Maven IDEA Plug-in</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <shortDescription>IDEA Plugin for Maven</shortDescription>
   <description>IDEA Plugin for Maven. Requires Maven 1.0 RC2.</description>
   <url>http://maven.apache.org/reference/plugins/idea/</url>

multiproject/plugin.jelly

@@ -20,12 +20,19 @@
 
 <project 
   xmlns:j="jelly:core"
+  xmlns:define="jelly:define"
   xmlns:maven="jelly:maven"
   xmlns:ant="jelly:ant"
   xmlns:doc="doc"
   xmlns:util="jelly:util"
   xmlns:velocity="jelly:velocity">
 
+  <define:taglib uri="multiproject">
+    <define:tag name="dependency-handle">
+      <!-- this page left intentionally blank -->
+    </define:tag>
+  </define:taglib>
+
   <!--==================================================================-->
   <!-- Default goal: builds sites for all subprojects                   -->
   <!--==================================================================-->    

multiproject/project.xml

@@ -75,6 +75,16 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <organization/>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+10</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>

multiproject/xdocs/changes.xml

@@ -38,6 +38,8 @@
         <code>multiproject:site</code> goal.
       </action>
       <action dev="brett" type="add">Utilise new reactor parameter "projectList" to avoid reloading projects</action>
+      <action dev="brett" type="add">Add a dependency-handle tag so that you can use multiproject properties in
+        your plugin without calling the goals.</action>
     </release>
     <release version="1.2" date="2004-03-07">
       <action dev="evenisse" type="fix">Fix dependency convergence page when project have no dependency.</action>