Return-Path: 
 <scm-return-30355-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 95446 invoked from network); 23 Jul 2008 23:06:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Jul 2008 23:06:48 -0000
Received: (qmail 48926 invoked by uid 500); 23 Jul 2008 23:06:47 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 48887 invoked by uid 500); 23 Jul 2008 23:06:47 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 48878 invoked by uid 99); 23 Jul 2008 23:06:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2008 16:06:47 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2008 23:06:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 19BA62388878; Wed, 23 Jul 2008 16:06:27 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r679223 - in /geronimo/devtools/eclipse-plugin/trunk:
 eclipse/build.xml testsuite/eclipse/build.xml
Date: Wed, 23 Jul 2008 23:06:26 -0000
To: scm@geronimo.apache.org
From: mcconne@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080723230627.19BA62388878@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcconne
Date: Wed Jul 23 16:06:26 2008
New Revision: 679223

URL: http://svn.apache.org/viewvc?rev=679223&view=rev
Log:
GERONIMODEVTOOLS-407 Fix case where repeated mvn installs does not work without clean

Modified:
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=679223&r1=679222&r2=679223&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Wed Jul 23 16:06:26 2008
@@ -38,9 +38,9 @@
     <target name="win32" depends="init" description="Download Windows-specific artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Downloading: ${ganymede_jee_win32}                                              </echo>                                                                            
+        <echo>## Downloading: ${ganymede_jee_win32}                                            </echo>
         <echo>##                                                                               </echo>
-        <echo>## From: ${ganymede_url}                                                           </echo>                                                                            <echo>##                                                                               </echo>
+        <echo>## From: ${ganymede_url}                                                         </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
@@ -51,20 +51,22 @@
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Unzipping: ${ganymede_jee_win32}                                                </echo>                                                                            
+        <echo>## Unzipping: ${ganymede_jee_win32}                                              </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_win32}" 
-              dest="${LOCAL_M2_REPO}/eclipse"/>
+               dest="${LOCAL_M2_REPO}/eclipse"
+               overwrite="true"/>
     </target>
 
     <target name="linux" depends="init" description="Download Linux-specific artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Downloading: ${ganymede_jee_linux_gz}                                           </echo>
+        <echo>## Downloading: ${ganymede_jee_linux_gz}                                         </echo>
         <echo>##                                                                               </echo>
-        <echo>## From: ${ganymede_url}                                                           </echo>                                                                            <echo>##                                                                               </echo>
+        <echo>## From: ${ganymede_url}                                                         </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
@@ -75,21 +77,23 @@
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Unzipping: ${ganymede_jee_linux_gz}                                             </echo>
+        <echo>## Unzipping: ${ganymede_jee_linux_gz}                                           </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
         <mkdir  dir="${LOCAL_M2_REPO}/eclipse"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
+                dest="${LOCAL_M2_REPO}/eclipse"
+                overwrite="true"/>
     </target>
 
     <target name="macos" depends="init" description="Download Mac-specific artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Downloading: ${ganymede_jee_macos_gz}                                           </echo>
+        <echo>## Downloading: ${ganymede_jee_macos_gz}                                         </echo>
         <echo>##                                                                               </echo>
-        <echo>## From: ${ganymede_url}                                                           </echo>                                                                            <echo>##                                                                               </echo>
+        <echo>## From: ${ganymede_url}                                                         </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
@@ -100,13 +104,15 @@
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Unzipping: ${ganymede_jee_macos_gz}                                             </echo>
+        <echo>## Unzipping: ${ganymede_jee_macos_gz}                                           </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
         <mkdir  dir="${LOCAL_M2_REPO}/eclipse"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
+                dest="${LOCAL_M2_REPO}/eclipse"
+                overwrite="true"/>
     </target>
 
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml?rev=679223&r1=679222&r2=679223&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Wed Jul 23 16:06:26 2008
@@ -69,7 +69,8 @@
         <echo>#################################################################################</echo>
         <mkdir dir="${test_eclipse}"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_win32}" 
-              dest="${test_eclipse}"/>
+               dest="${test_eclipse}"
+               overwrite="true"/>
     </target>
 
     <target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
@@ -96,7 +97,8 @@
         <mkdir  dir="${test_eclipse}"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux}" 
-               dest="${test_eclipse}"/>
+                dest="${test_eclipse}"
+                overwrite="true"/>
     </target>
 
     <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
@@ -123,15 +125,29 @@
         <mkdir  dir="${test_eclipse}"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos}" 
-               dest="${test_eclipse}"/>
+                dest="${test_eclipse}"
+                overwrite="true"/>
     </target>
 
     <target name="common" depends="init" description="Download artifacts common to all OS'es">
+        <antcall target="cleanup"/>
         <antcall target="test-framework"/>
         <antcall target="abbot"/>
         <antcall target="gep-plugins"/>
     </target>
 
+    <target name="cleanup" depends="init" description="Cleanup from previos invocatins of the testsuite">
+        <!--
+        ##############################################################################################   
+        ##                                                                                          ##
+        ## Cannot repeatedly unzip into the test_eclipse as it will corrupt the Eclipse plugin      ##
+        ## registry. So delete it even though clean may not have been specified on the mvn command. ##
+        ##                                                                                          ##
+        ##############################################################################################
+        -->
+        <delete dir="${test_eclipse}" quiet="true"/>
+    </target>
+
     <target name="test-framework" depends="init" description="JUnit Plugin Tests and Automated Testing Framework artifact">
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
@@ -155,7 +171,8 @@
         <echo>#################################################################################</echo>
         <mkdir dir="${test_eclipse}"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}"
-              dest="${test_eclipse}"/>
+               dest="${test_eclipse}"
+               overwrite="true"/>
     </target>
 
     <target name="abbot" depends="init" description="Download Abbot SWT plugin artifacts">
@@ -181,7 +198,8 @@
         <echo>#################################################################################</echo>
         <mkdir dir="${test_eclipse}"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
-              dest="${test_eclipse}eclipse"/>
+               dest="${test_eclipse}eclipse"
+               overwrite="true"/>
         <!--
          |  
          | Copy the SWT jars to the local maven repo