Return-Path: 
 <scm-return-44252-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 71192 invoked from network); 14 Oct 2010 00:45:24 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 14 Oct 2010 00:45:24 -0000
Received: (qmail 85560 invoked by uid 500); 14 Oct 2010 00:45:24 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 85512 invoked by uid 500); 14 Oct 2010 00:45:24 -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 85505 invoked by uid 99); 14 Oct 2010 00:45:24 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Oct 2010 00:45:24 +0000
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; Thu, 14 Oct 2010 00:45:22 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id ABE33238890A; Thu, 14 Oct 2010 00:44:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1022330 - in /geronimo/devtools/eclipse-plugin/trunk:
 eclipse/build.xml eclipse/pom.xml pom.xml testsuite/eclipse/build.xml
 testsuite/eclipse/pom.xml
Date: Thu, 14 Oct 2010 00:44:26 -0000
To: scm@geronimo.apache.org
From: tkirby@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101014004426.ABE33238890A@eris.apache.org>

Author: tkirby
Date: Thu Oct 14 00:44:26 2010
New Revision: 1022330

URL: http://svn.apache.org/viewvc?rev=1022330&view=rev
Log:
GERONIMODEVTOOLS-599 simplifications of build.xml 
pass in and fully use download_to and extract_to parameters.   fail if they aren't passed in.

Modified:
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.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=1022330&r1=1022329&r2=1022330&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Thu Oct 14 00:44:26 2010
@@ -24,6 +24,25 @@
  -->
 <project name="EclipseArtifacts" default="doit" >
 
+    <!-- expected input properties:
+        1. download_to   - The directory to download eclipse_zip to.
+        2. extract_to    - The directory to extract  ecslipe_zip to.
+      -->
+    <fail message="required download_to property not set.">
+        <condition>
+            <not>
+                <isset property="download_to" />
+            </not>
+        </condition>
+    </fail>
+    <fail message="required extract_to property not set.">
+        <condition>
+            <not>
+                <isset property="extract_to" />
+            </not>
+        </condition>
+    </fail>
+
     <!-- Set common propeties -->
 
     <property name="eclipse_name"                   value="helios" />
@@ -32,14 +51,6 @@
     <property name="eclipse_downloadserver"         value="http://www.eclipse.org/downloads/download.php?file=" />
     <property name="eclipse_url"                    value="${eclipse_downloadserver}/technology/epp/downloads/release/${eclipse_name}/${eclipse_release}" />
 
-    <!-- Set property where eclipse will be extracted to -->
-    <condition property="extract_to" value="${LOCAL_M2_REPO}/eclipse" >
-        <!-- property set when called from testsuite/eclipse/build.xml when getting eclipse for the testsuite. -->
-        <not>
-            <isset property="extract_to" />
-        </not>
-    </condition>
-
     <property name="protocol"                       value="&amp;r=1&amp;protocol=http" />
 
     <!-- Set propeties based on environment: 32 or 64 bit JDK, OS (Mac, Unix or Windows) -->
@@ -151,9 +162,9 @@
         <echo>## From: ${eclipse_url}                                                          </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <mkdir  dir="${LOCAL_M2_REPO}/eclipse-downloads" />
+        <mkdir  dir="${download_to}" />
         <get    src="${eclipse_url}/${eclipse_zip}${protocol}"
-                dest="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_zip}"
+                dest="${download_to}/${eclipse_zip}"
                 verbose="true"
                 ignoreerrors="true"
                 usetimestamp="true" />
@@ -162,19 +173,19 @@
         <echo>## Unzipping: ${eclipse_zip}                                                     </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true" />
-        <mkdir  dir="${LOCAL_M2_REPO}/eclipse" />
+        <delete dir="${extract_to}" quiet="true" />
+        <mkdir  dir="${extract_to}" />
     </target>
 
     <target name="unzip" if="isZip" description="Unzip artifact(s)" >
-        <unzip  src="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_zip}"
+        <unzip  src="${download_to}/${eclipse_zip}"
                 dest="${extract_to}"
                 overwrite="true" />
     </target>
 
     <target name="untargz" if="isTarGz" description="Ungzip and Untar artifact(s)" >
-        <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_zip}" />
-        <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_tar}"
+        <gunzip src="${download_to}/${eclipse_zip}" />
+        <untar  src="${download_to}/${eclipse_tar}"
                 dest="${extract_to}"
                 overwrite="true" />
     </target>

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=1022330&r1=1022329&r2=1022330&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Thu Oct 14 00:44:26 2010
@@ -43,7 +43,8 @@
                         <phase>validate</phase>
                         <configuration>
                             <tasks>
-                                <property name="LOCAL_M2_REPO" value="${settings.localRepository}" />
+                                <property name="download_to" value="${eclipseDownload}" />
+                                <property name="extract_to"  value="${eclipseInstall}" />
                                 <ant antfile="${basedir}/build.xml" />
                             </tasks>
                         </configuration>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=1022330&r1=1022329&r2=1022330&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Thu Oct 14 00:44:26 2010
@@ -84,6 +84,7 @@
     </distributionManagement>
                         
     <properties>
+        <eclipseDownload>${settings.localRepository}/eclipse-downloads</eclipseDownload>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
         <org.apache.geronimo.v30.feature_version>3.0.0</org.apache.geronimo.v30.feature_version>
         <keystoreAlias>devtools</keystoreAlias> 

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=1022330&r1=1022329&r2=1022330&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Thu Oct 14 00:44:26 2010
@@ -28,9 +28,37 @@
  -->
 <project name="TestsuiteArtifacts" default="common" >
 
+    <!-- expected input properties:
+        1. download_to   - The directory to download eclipse_zip to.
+        2. extract_to    - The directory to extract  ecslipe_zip to.
+        3. LOCAL_M2_REPO - Local M2 repo for various jars...
+      -->
+    <fail message="required download_to property not set.">
+        <condition>
+            <not>
+                <isset property="download_to" />
+            </not>
+        </condition>
+    </fail>
+    <fail message="required extract_to property not set.">
+        <condition>
+            <not>
+                <isset property="extract_to" />
+            </not>
+        </condition>
+    </fail>
+    <fail message="required LOCAL_M2_REPO property not set.">
+        <condition>
+            <not>
+                <isset property="LOCAL_M2_REPO" />
+            </not>
+        </condition>
+    </fail>
+
+
     <target name="init">
 
-        <property name="test_eclipse"                   value="${basedir}/../launcher/eclipse/"/>
+        <property name="test_eclipse"                   value="${extract_to}/"/>
         <property name="test_framework_url"             value="http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/eclipse-test-framework-3.6.zip" />
         <property name="test_framework"                 value="eclipse-test-framework-3.6.zip"/>
 
@@ -77,9 +105,9 @@
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
 
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
+        <mkdir dir="${download_to}"/>
         <get src="${test_framework_url}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}"
+             dest="${download_to}/${test_framework}"
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
@@ -92,7 +120,7 @@
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${test_eclipse}"/>
-        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}"
+        <unzip src="${download_to}/${test_framework}"
                dest="${test_eclipse}"
                overwrite="true"/>
     </target>
@@ -105,9 +133,9 @@
         <echo>## From: ${abbot_swt_url}                                                        </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
+        <mkdir dir="${download_to}"/>
         <get src="${abbot_swt_url}/${abbot_swt}${abbot_protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
+             dest="${download_to}/${abbot_swt}"
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
@@ -118,7 +146,7 @@
 		-->
 
 		<mkdir dir="${basedir}/temp"/>
-		<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
+		<unzip src="${download_to}/${abbot_swt}"
 		       dest="${basedir}/temp"/>
 
 		<mkdir dir="${basedir}/temp/plugins/abbot.swt.temp"/>
@@ -146,7 +174,7 @@
 		<delete dir="${basedir}/temp/plugins/abbot.swt.temp"/>
 		<delete dir="${basedir}/temp/plugins/abbot.swt.eclipse.temp"/>
 
-		<zip destfile="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
+		<zip destfile="${download_to}/${abbot_swt}"
 		     basedir="${basedir}/temp"
 		     includes="**"
 		     update="true"/>
@@ -158,12 +186,12 @@
         <echo>##                                                                               </echo>
         <echo>## Unzipping: ${abbot_swt}                                                       </echo>
         <echo>##                                                                               </echo>
-        <echo>## To: ${test_eclipse}eclipse                                                    </echo>
+        <echo>## To: ${test_eclipse}/eclipse                                                    </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${test_eclipse}"/>
-        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
-               dest="${test_eclipse}eclipse"
+        <unzip src="${download_to}/${abbot_swt}"
+               dest="${test_eclipse}/eclipse"
                overwrite="true"/>
 
         <!--
@@ -172,11 +200,11 @@
          |
          -->
         <mkdir dir="${LOCAL_M2_REPO}/abbot/abbot.swt/0.1.0.20080305_1254"/>
-        <copy file="${test_eclipse}eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar"
+        <copy file="${test_eclipse}/eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar"
               tofile="${LOCAL_M2_REPO}/abbot/abbot.swt/0.1.0.20080305_1254/abbot.swt-0.1.0.20080305_1254.jar"
               failonerror="true" />
         <mkdir dir="${LOCAL_M2_REPO}/abbot/abbot.swt.eclipse/0.1.0.20080305_1254"/>
-        <copy file="${test_eclipse}eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar"
+        <copy file="${test_eclipse}/eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar"
               tofile="${LOCAL_M2_REPO}/abbot/abbot.swt.eclipse/0.1.0.20080305_1254/abbot.swt.eclipse-0.1.0.20080305_1254.jar"
               failonerror="true" />
         <!--
@@ -184,10 +212,10 @@
          | Copy the SWT jars to the Eclipse plugins in the local maven repo
          |
          -->
-        <copy file="${test_eclipse}eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar"
+        <copy file="${test_eclipse}/eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar"
               tofile="${LOCAL_M2_REPO}/eclipse/eclipse/plugins/abbot.swt-0.1.0.20080305_1254.jar"
               failonerror="true" />
-        <copy file="${test_eclipse}eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar"
+        <copy file="${test_eclipse}/eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar"
               tofile="${LOCAL_M2_REPO}/eclipse/eclipse/plugins/abbot.swt.eclipse-0.1.0.20080305_1254.jar"
               failonerror="true" />
     </target>
@@ -200,7 +228,7 @@
         |
         -->
         <mkdir dir="${test_eclipse}"/>
-        <copy todir="${test_eclipse}eclipse/plugins">
+        <copy todir="${test_eclipse}/eclipse/plugins">
 	    <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jaxbmodel.common/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
@@ -284,7 +312,7 @@
         -->
         <mkdir dir="${test_eclipse}"/>
         <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.v30.feature/${gep_version}/org.apache.geronimo.v30.feature-${gep_version}.jar"
-               dest="${test_eclipse}eclipse/features/org.apache.geronimo.v30.feature_${gep_version}"
+               dest="${test_eclipse}/eclipse/features/org.apache.geronimo.v30.feature_${gep_version}"
                overwrite="true"/>
     </target>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml?rev=1022330&r1=1022329&r2=1022330&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml Thu Oct 14 00:44:26 2010
@@ -45,9 +45,10 @@
                         <phase>validate</phase>
                         <configuration>
                             <tasks>
+                                <property name="download_to" value="${eclipseDownload}"/>
+                                <property name="extract_to"  value="${basedir}/../launcher/eclipse"/>
                                 <property name="LOCAL_M2_REPO" value="${settings.localRepository}"/>
-                                <ant antfile="${basedir}/build.xml">
-                                </ant>
+                                <ant antfile="${basedir}/build.xml" />
                             </tasks>
                         </configuration>
                         <goals>