geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r1021938 - in /geronimo/devtools/eclipse-plugin/trunk: eclipse/build.xml testsuite/eclipse/build.xml testsuite/eclipse/pom.xml
Date Tue, 12 Oct 2010 21:46:54 GMT
Author: tkirby
Date: Tue Oct 12 21:46:54 2010
New Revision: 1021938

URL: http://svn.apache.org/viewvc?rev=1021938&view=rev
Log:
GERONIMODEVTOOLS-599 simplifications of build.xml 
Call /eclipse/build.xml to get eclipse, don't replicate its code in /testsuite/eclipse/build.xml
Simplify pom.xml by having ant <os family> determine environment, don't need maven to.

Modified:
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.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=1021938&r1=1021937&r2=1021938&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Tue Oct 12 21:46:54 2010
@@ -32,6 +32,14 @@
     <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)
-->
@@ -129,9 +137,9 @@
     </condition>
 
     <target name="doit" >
-           <antcall target="download" />
-           <antcall target="unzip"    />
-           <antcall target="untargz"  />
+        <antcall target="download" />
+        <antcall target="unzip"    />
+        <antcall target="untargz"  />
     </target>
 
     <target name="download" description="Download artifact(s)" >
@@ -143,31 +151,31 @@
         <echo>## From: ${eclipse_url}                                             
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads" />
-        <get src="${eclipse_url}/${eclipse_zip}${protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_zip}"
-             verbose="true"
-             ignoreerrors="true"
-             usetimestamp="true" />
+        <mkdir  dir="${LOCAL_M2_REPO}/eclipse-downloads" />
+        <get    src="${eclipse_url}/${eclipse_zip}${protocol}"
+                dest="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_zip}"
+                verbose="true"
+                ignoreerrors="true"
+                usetimestamp="true" />
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
         <echo>## Unzipping: ${eclipse_zip}                                        
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
         <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true" />
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse" />
+        <mkdir  dir="${LOCAL_M2_REPO}/eclipse" />
     </target>
 
     <target name="unzip" if="isZip" description="Unzip artifact(s)" >
-        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${eclipse_zip}"
-               dest="${LOCAL_M2_REPO}/eclipse"
-               overwrite="true" />
+        <unzip  src="${LOCAL_M2_REPO}/eclipse-downloads/${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}"
-                dest="${LOCAL_M2_REPO}/eclipse"
+                dest="${extract_to}"
                 overwrite="true" />
     </target>
 

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=1021938&r1=1021937&r2=1021938&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Tue Oct 12 21:46:54
2010
@@ -17,152 +17,32 @@
   -->
 
 <!--
- |  
+ |
  | Download Eclipse, the Eclipse test-framework, and the Abbot SWT for usage with the GEP
testsuite
- |                                                                                      
      
+ |
  | TODO: Move many of these tasks to the antrun task in the various pom.xml files (i.e.,
each plugin)
- |                                                                                      
      
- |                                                                                      
      
- | @version $Rev$ $Date$                                                                
                           
- |                                                                                      
      
+ |
+ |
+ | @version $Rev$ $Date$
+ |
  -->
-<project name="TestsuiteArtifacts">
+<project name="TestsuiteArtifacts" default="common" >
 
     <target name="init">
-        <property name="helios_url"                     value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/R"/>
-        <property name="helios_jee_win32"               value="eclipse-jee-helios-win32.zip"/>
-		<property name="helios_jee_win64"               value="eclipse-jee-helios-win32_64.zip"/>
-        <property name="helios_jee_linux"               value="eclipse-jee-helios-linux-gtk.tar"/>
-        <property name="helios_jee_linux-x86_64"        value="eclipse-jee-helios-linux-gtk-x86_64.tar"/>
-        <property name="helios_jee_macos"               value="eclipse-jee-helios-macosx-carbon.tar"/>
-        <property name="helios_jee_linux_gz"            value="${helios_jee_linux}.gz"/>
-        <property name="helios_jee_linux-x86_64_gz"     value="${helios_jee_linux-x86_64}.gz"/>
-        <property name="helios_jee_macos_gz"            value="${helios_jee_macos}.gz"/>
-        
+
         <property name="test_eclipse"                   value="${basedir}/../launcher/eclipse/"/>
         <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"/>
-                                
-        
+
+
         <property name="abbot_swt_url"                  value="http://downloads.sourceforge.net/abbot"/>
         <property name="abbot_swt_version"              value="0.1.0.20080305_1254"/>
         <property name="abbot_swt"                      value="abbot.swt-${abbot_swt_version}.zip"/>
         <property name="abbot_protocol"                 value="?modtime=12047243638&amp;protocol=http"/>
-        
-        <property name="gep_version"                    value="3.0.0"/>
-        
-        <property name="protocol"                       value="&amp;r=1&amp;protocol=http"/>
-    </target>
-
-    <target name="win32" depends="init,common" description="Download Windows-specific
artifact(s)">
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_win32}                                 
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}/${helios_jee_win32}${protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win32}" 
-             verbose="true"
-             ignoreerrors="true"
-             usetimestamp="true"/>
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_win32}                                   
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## To: ${test_eclipse}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir dir="${test_eclipse}"/>
-        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win32}" 
-               dest="${test_eclipse}"
-               overwrite="true"/>
-    </target>
 
-    <target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_linux_gz}                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}/${helios_jee_linux_gz}${protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux_gz}" 
-             verbose="true"
-             ignoreerrors="true"
-             usetimestamp="true"/>
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_linux_gz}                                
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## To: ${test_eclipse}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir  dir="${test_eclipse}"/>
-        <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux_gz}"/>
-        <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux}" 
-                dest="${test_eclipse}"
-                overwrite="true"/>
-    </target>
-
-    <target name="linux-x86_64" depends="init,common" description="Download Linux-specific
artifact(s)">
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_linux-x86_64_gz}                       
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}/${helios_jee_linux-x86_64_gz}${protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64_gz}"
-             verbose="true"
-             ignoreerrors="true"
-             usetimestamp="true"/>
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_linux-x86_64_gz}                         
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## To: ${test_eclipse}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-    <mkdir  dir="${test_eclipse}"/>
-        <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64_gz}"/>
-        <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64}"
-        dest="${test_eclipse}"
-                overwrite="true"/>
-    </target>
+        <property name="gep_version"                    value="3.0.0"/>
 
-    <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_macos_gz}                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}/${helios_jee_macos_gz}${protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos_gz}" 
-             verbose="true"
-             ignoreerrors="true"
-             usetimestamp="true"/>
-        <echo>#################################################################################</echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_macos_gz}                                
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>## To: ${test_eclipse}                                              
            </echo>
-        <echo>##                                                                  
            </echo>
-        <echo>#################################################################################</echo>
-        <mkdir  dir="${test_eclipse}"/>
-        <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos_gz}"/>
-        <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos}" 
-                dest="${test_eclipse}"
-                overwrite="true"/>
+        <property name="protocol"                       value="&amp;r=1&amp;protocol=http"/>
     </target>
 
     <target name="common" depends="init" description="Download artifacts common to all
OS'es">
@@ -171,11 +51,14 @@
         <antcall target="abbot"/>
         <antcall target="gep-plugins"/>
         <antcall target="gep-features"/>
+        <ant antfile="../../eclipse/build.xml">
+            <property name="extract_to"   value="${test_eclipse}" />
+        </ant>
     </target>
 
     <target name="cleanup" depends="init" description="Cleanup from previous invocations
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. ##
@@ -193,14 +76,14 @@
         <echo>## From: ${test_framework_url}                                      
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
-		
+
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
         <get src="${test_framework_url}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}" 
+             dest="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}"
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
-	    
+
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
         <echo>## Unzipping: ${test_framework}                                     
            </echo>
@@ -224,22 +107,22 @@
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
         <get src="${abbot_swt_url}/${abbot_swt}${abbot_protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}" 
+             dest="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
-			 
+
 		<!--
-		Replace the MANIFEST.MF files of abbot.swt and abbot.swt.eclipse with new MF files in which

-		the junit version is 4.8.1 
+		Replace the MANIFEST.MF files of abbot.swt and abbot.swt.eclipse with new MF files in which
+		the junit version is 4.8.1
 		-->
-		
+
 		<mkdir dir="${basedir}/temp"/>
 		<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
 		       dest="${basedir}/temp"/>
-		
+
 		<mkdir dir="${basedir}/temp/plugins/abbot.swt.temp"/>
-		<unzip src="${basedir}/temp/plugins/abbot.swt_${abbot_swt_version}.jar" 
+		<unzip src="${basedir}/temp/plugins/abbot.swt_${abbot_swt_version}.jar"
 			   dest="${basedir}/temp/plugins/abbot.swt.temp"/>
 		<copy file="${basedir}/metadata_abbot_swt/MANIFEST.MF"
 		      tofile="${basedir}/temp/plugins/abbot.swt.temp/META-INF/MANIFEST.MF"
@@ -248,9 +131,9 @@
 		     basedir="${basedir}/temp/plugins/abbot.swt.temp"
 			 includes="**"
 			 update="true"/>
-		
+
 		<mkdir dir="${basedir}/temp/plugins/abbot.swt.eclipse.temp"/>
-		<unzip src="${basedir}/temp/plugins/abbot.swt.eclipse_${abbot_swt_version}.jar" 
+		<unzip src="${basedir}/temp/plugins/abbot.swt.eclipse_${abbot_swt_version}.jar"
 			   dest="${basedir}/temp/plugins/abbot.swt.eclipse.temp"/>
 		<copy file="${basedir}/metadata_abbot_swt_eclipse/MANIFEST.MF"
 			  tofile="${basedir}/temp/plugins/abbot.swt.eclipse.temp/META-INF/MANIFEST.MF"
@@ -259,18 +142,18 @@
 		     basedir="${basedir}/temp/plugins/abbot.swt.eclipse.temp"
 			 includes="**"
 		     update="true"/>
-		
+
 		<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}"
 		     basedir="${basedir}/temp"
 		     includes="**"
 		     update="true"/>
-			 
+
 		<delete dir="${basedir}/temp"/>
-		
-		
+
+
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
         <echo>## Unzipping: ${abbot_swt}                                          
            </echo>
@@ -282,52 +165,52 @@
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
                dest="${test_eclipse}eclipse"
                overwrite="true"/>
-		
+
         <!--
-         |  
+         |
          | Copy the SWT jars to the local maven repo
-         |  
+         |
          -->
         <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"

-              tofile="${LOCAL_M2_REPO}/abbot/abbot.swt/0.1.0.20080305_1254/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"

-              tofile="${LOCAL_M2_REPO}/abbot/abbot.swt.eclipse/0.1.0.20080305_1254/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" />
         <!--
-         |  
+         |
          | 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"

-              tofile="${LOCAL_M2_REPO}/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"

-              tofile="${LOCAL_M2_REPO}/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>
 
-	
+
     <target name="gep-plugins" depends="init" description="Copy the GEP plugin(s) into
the test_eclipse installation">
         <!--
-        |  
+        |
         | Copy the GEP plugins to the launcher Eclipse plugins directory
-        |  
+        |
         -->
         <mkdir dir="${test_eclipse}"/>
         <copy todir="${test_eclipse}eclipse/plugins">
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jaxbmodel.common/${gep_version}">
+	    <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jaxbmodel.common/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.j2ee.v11.jaxbmodel/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jee.v21.jaxbmodel/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jee.v21.jaxbmodel/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v30.jaxbmodel/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v30.jaxbmodel/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.common/${gep_version}">
@@ -345,7 +228,7 @@
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v20/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v11/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v11/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.core/${gep_version}">
@@ -381,13 +264,13 @@
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v20.ui/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.core/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.core/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.schemas/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.schemas/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-			<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.ui/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.ui/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
         </copy>
@@ -395,14 +278,14 @@
 
     <target name="gep-features" depends="init" description="Unzip the GEP latest feature
to the launcher Eclipse features directory">
         <!--
-        |  
+        |
         | Unzip the GEP latest feature to the launcher Eclipse features directory (for one
branding testcase)
-        |  
+        |
         -->
         <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}"
                overwrite="true"/>
     </target>
-	
+
 </project>

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=1021938&r1=1021937&r2=1021938&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml Tue Oct 12 21:46:54 2010
@@ -19,15 +19,15 @@
 <!-- @version $Rev$ $Date$ -->
 
 <project>
-                                                
+
     <modelVersion>4.0.0</modelVersion>
-                                                
+
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>testsuite-eclipse</artifactId>
     <version>3.0.0</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Testsuite :: Eclipse</name>
-                                                
+
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>testsuite</artifactId>
@@ -47,7 +47,6 @@
                             <tasks>
                                 <property name="LOCAL_M2_REPO" value="${settings.localRepository}"/>
                                 <ant antfile="${basedir}/build.xml">
-                                    <target name="${eclipsePlatformFamily}"></target>
                                 </ant>
                             </tasks>
                         </configuration>
@@ -59,54 +58,5 @@
             </plugin>
         </plugins>
     </build>
-                                                
-    <profiles>
-        <profile>
-            <id>windows</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>win32</eclipsePlatformFamily>
-            </properties>
-        </profile>
-        <profile>
-            <id>unix-x86</id>
-            <activation>
-                <os>
-                    <family>unix</family>
-                    <arch>i386</arch>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>linux</eclipsePlatformFamily>
-            </properties>
-        </profile>
-        <profile>
-            <id>unix-x86_64</id>
-            <activation>
-                <os>
-                    <family>unix</family>
-                    <arch>amd64</arch>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>linux-x86_64</eclipsePlatformFamily>
-            </properties>
-        </profile>
-        <profile>
-            <id>mac</id>
-            <activation>
-                <os>
-                    <family>mac</family>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>macos</eclipsePlatformFamily>
-            </properties>
-        </profile>
-    </profiles>
-                                                
+
 </project>



Mime
View raw message