Return-Path: 
 <commits-return-9377-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: (qmail 27489 invoked from network); 29 Nov 2006 16:49:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Nov 2006 16:49:34 -0000
Received: (qmail 55474 invoked by uid 500); 29 Nov 2006 16:49:42 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 55434 invoked by uid 500); 29 Nov 2006 16:49:42 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 55421 invoked by uid 99); 29 Nov 2006 16:49:42 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 08:49:42 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 08:49:32 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id A8BCF1A984D; Wed, 29 Nov 2006 08:48:54 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r480620 -
 /maven/maven-1/plugins/trunk/eclipse/plugin.jelly
Date: Wed, 29 Nov 2006 16:48:54 -0000
To: commits@maven.apache.org
From: aheritier@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061129164854.A8BCF1A984D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: aheritier
Date: Wed Nov 29 08:48:53 2006
New Revision: 480620

URL: http://svn.apache.org/viewvc?view=rev&rev=480620
Log:
Update eclipse:clean goal to remove the wtp 1.5 config file

Modified:
    maven/maven-1/plugins/trunk/eclipse/plugin.jelly

Modified: maven/maven-1/plugins/trunk/eclipse/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/plugin.jelly?view=diff&rev=480620&r1=480619&r2=480620
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/eclipse/plugin.jelly Wed Nov 29 08:48:53 2006
@@ -154,14 +154,19 @@
   <!--==================================================================-->
   <!-- Generate Eclipse .wtpmodules file                                -->
   <!--==================================================================-->
-  <goal name="eclipse:generate-wtpmodules" description="Generate Eclipse .wtpmodules file">
+  <goal name="eclipse:wtpconfig">
+    <j:set var="modulesConfig0.7" value="${basedir}/.wtpmodules"/>
+    <j:set var="modulesConfig1.5" value="${basedir}/.settings/org.eclipse.wst.common.component"/>
+  </goal>
+  
+  <goal name="eclipse:generate-wtpmodules" description="Generate Eclipse .wtpmodules file" prereqs="eclipse:wtpconfig">
     <j:choose>
       <j:when test="${maven.eclipse.wtp.version==0.7}">
-        <j:set var="modulesConfig" value="${basedir}/.wtpmodules"/>
+        <j:set var="modulesConfig" value="${modulesConfig0.7}"/>
       </j:when>
       <j:when test="${maven.eclipse.wtp.version==1.5}">
         <ant:mkdir dir="${basedir}/.settings"/>
-        <j:set var="modulesConfig" value="${basedir}/.settings/org.eclipse.wst.common.component"/>
+        <j:set var="modulesConfig" value="${modulesConfig1.5}"/>
       </j:when>
       <j:otherwise>
         <ant:fail>maven.eclipse.wtp.version=${maven.eclipse.wtp.version} not supported. Please check the plugin documentation to have the list of supported values.</ant:fail>
@@ -318,13 +323,13 @@
   <!--==================================================================-->
   <!-- Clean up eclipse generated files                                 -->
   <!--==================================================================-->
-  <goal name="eclipse:clean" description="Clean eclipse generated files">
+  <goal name="eclipse:clean" description="Clean eclipse generated files" prereqs="eclipse:wtpconfig">
     <j:set var="projectFileName" value="${basedir}/.project" />
     <j:set var="classpathFileName" value="${basedir}/.classpath" />
-    <j:set var="wtpmodulesFileName" value="${basedir}/.wtpmodules" />
     <ant:delete file="${projectFileName}" />
     <ant:delete file="${classpathFileName}" />
-    <ant:delete file="${wtpmodulesFileName}" />
+    <ant:delete file="${modulesConfig0.7}" />
+    <ant:delete file="${modulesConfig1.5}" />
     <ant:echo>Cleaned up eclipse generated files</ant:echo>
   </goal>