incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1073358 [1/6] - in /incubator/easyant/easyant4e/trunk: org.apache.easyant4e.releng/ org.apache.easyant4e.releng/build-files/ org.apache.easyant4e.releng/build-files/automatedTests/ org.apache.easyant4e.tests/datas/simplejavaproject/ org.ap...
Date Tue, 22 Feb 2011 15:09:32 GMT
Author: hibou
Date: Tue Feb 22 15:09:30 2011
New Revision: 1073358

URL: http://svn.apache.org/viewvc?rev=1073358&view=rev
Log:
4 spaces in place of tabulations

Modified:
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/allElements.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.properties
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build.properties
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_rcp.properties
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_shared.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/customTargets.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/fetchSvnAll.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/postBuild.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/subversionSupport.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build.properties
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build_local.properties
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build_shared.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/datas/simplejavaproject/module.ivy
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/AbstractEasyAntTest.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/EasyAntAllTests.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/EasyantCoreServiceTest.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/EasyantProjectServiceTest.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/EclipseProjectBuilder.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/ExtensionRegistryTest.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/ImportProjectTest.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/StartupTest.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e.tests/src/org/apache/easyant4e/tests/TestPlugin.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/plugin.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/ivysettings-remote.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/ivysettings.xml
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/Activator.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/EasyAntConstants.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/EasyAntPlugin.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/Startup.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/builders/EasyAntBuilder.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/console/EasyAntConsole.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/console/EasyAntConsoleFactory.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/console/EasyAntConsoleImpl.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/console/EasyAntConsolePageParticipant.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/RepositoryInstaller.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/model/EasyAntModuleDescriptorExtension.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/page/BuildLifeCycleContentProvider.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/page/BuildLifecycleBlock.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/page/BuildLifecycleLabelProvider.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/page/BuildPage.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/page/PhaseDetailsPage.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/ivyde/extension/page/TargetDetailsPage.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/modules/EasyAnt4EclipseModule.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/modules/EasyAntCoreModule.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/natures/AddEasyAntNatureAction.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/natures/AddEasyAntNatureOperation.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/natures/EasyAntNature.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/natures/RemoveEasyAntNatureAction.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/natures/RemoveEasyAntNatureOperation.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/providers/ImageProvider.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/providers/ImageProviderImpl.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/services/EasyantCoreService.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/services/EasyantCoreServiceImpl.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/services/EasyantProjectService.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/services/EasyantProjectServiceImpl.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/wizards/EasyAntImportWizard.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/wizards/EasyAntImportWizardPage.java
    incubator/easyant/easyant4e/trunk/org.apache.easyant4e/src/org/apache/easyant4e/wizards/ProjectRecord.java
    incubator/easyant/easyant4e/trunk/quality/checkstyle/checkstyle-suppress.xml
    incubator/easyant/easyant4e/trunk/quality/checkstyle/checkstyle-text.xsl
    incubator/easyant/easyant4e/trunk/quality/checkstyle/checkstyle-xdoc.xsl

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/allElements.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/allElements.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/allElements.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/allElements.xml Tue Feb 22 15:09:30 2011
@@ -16,88 +16,88 @@
 -->
 <project name="allElements delegation and assemble customTargets.xml">
 <!-- FILE WILL BE OVERWRITTEN WHEN GENERATED -->
-  	<target name="allElementsExceptSvnFetch" unless="is.svn.fetch">
-  		<antcall target="norcpbuild"/>
-  		<antcall target="rcpbuild"/>
-    </target>
-	
-	<target name="norcpbuild" unless="build.container.feature">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.apache.easyant4e.feature" />
-		</ant>
-		
-	</target>
+    <target name="allElementsExceptSvnFetch" unless="is.svn.fetch">
+        <antcall target="norcpbuild"/>
+        <antcall target="rcpbuild"/>
+    </target>
+    
+    <target name="norcpbuild" unless="build.container.feature">
+        <ant antfile="${genericTargets}" target="${target}">
+            <property name="type" value="feature" />
+            <property name="id" value="org.apache.easyant4e.feature" />
+        </ant>
+        
+    </target>
 
-	<target name="rcpbuild" if="build.container.feature">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.pde.build.container.feature" />
-		</ant>
-	</target>
-	
-	<!-- generated assemble targets -->	     
-	<target name="assemble.org.apache.easyant4e.feature">
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-			<property name="zipargs" value="" />
-		</ant>
-	</target>
+    <target name="rcpbuild" if="build.container.feature">
+        <ant antfile="${genericTargets}" target="${target}">
+            <property name="type" value="feature" />
+            <property name="id" value="org.eclipse.pde.build.container.feature" />
+        </ant>
+    </target>
+    
+    <!-- generated assemble targets -->      
+    <target name="assemble.org.apache.easyant4e.feature">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+            <property name="zipargs" value="" />
+        </ant>
+    </target>
 
-	
-	<!-- assmble targets for RCP build -->	
-	<target name="assemble.org.eclipse.pde.build.container.feature.win32.win32.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.ppc.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.linux.motif.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.motif.x86.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.solaris.motif.sparc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-solaris.motif.sparc.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.solaris.gtk.sparc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-solaris.gtk.sparc.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.aix.motif.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-aix.motif.ppc.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.hpux.motif.PA_RISC">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-hpux.motif.PA_RISC.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.macosx.carbon.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.ppc.zip"/>
-		</ant>
-	</target>
-	<target name="assemble.org.eclipse.pde.build.container.feature.macosx.carbon.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.x86.zip"/>
-		</ant>
-	</target>	
-</project>
\ No newline at end of file
+    
+    <!-- assmble targets for RCP build -->  
+    <target name="assemble.org.eclipse.pde.build.container.feature.win32.win32.x86">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.ppc">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.ppc.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.linux.motif.x86">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-linux.motif.x86.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.solaris.motif.sparc">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-solaris.motif.sparc.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.solaris.gtk.sparc">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-solaris.gtk.sparc.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.aix.motif.ppc">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-aix.motif.ppc.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.hpux.motif.PA_RISC">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-hpux.motif.PA_RISC.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.macosx.carbon.ppc">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.ppc.zip"/>
+        </ant>
+    </target>
+    <target name="assemble.org.eclipse.pde.build.container.feature.macosx.carbon.x86">
+        <ant antfile="${assembleScriptName}" dir="${buildDirectory}">           
+            <property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.x86.zip"/>
+        </ant>
+    </target>   
+</project>

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.properties?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.properties (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.properties Tue Feb 22 15:09:30 2011
@@ -86,7 +86,7 @@ autotestsuite.class.exclusions=
 # only necessary if you want to use the Eclipse test framework to run your test. If you
 # run the tests with the autotestsuite (i.e. you use the include/exclude filters below)
 # this property is not being used.
-# @category testHidden	
+# @category testHidden  
 test.library.xml=${test.eclipseExtensionDirectory}/plugins/org.eclipse.test_3.1.0/library.xml
 
 # Enablement for code coverage.
@@ -103,4 +103,4 @@ pluginbuilder.coverage.inclusionfilter=
 
 # Place for runtime data.
 # @category coverageHidden
-emma.coverage.output=${buildDirectory}/coverage.ec
\ No newline at end of file
+emma.coverage.output=${buildDirectory}/coverage.ec

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/automatedTests/run-tests.xml Tue Feb 22 15:09:30 2011
@@ -15,257 +15,257 @@
    limitations under the License.
 -->
 <project name="Run automated Tests" default="run" basedir=".">
-	<taskdef resource="org/pluginbuilder/anttasks/pluginbuildertasks.properties" classpath="../pluginbuilder-anttasks.jar" />
-	<typedef resource="org/pluginbuilder/anttasks/pluginbuildertypes.properties" classpath="../pluginbuilder-anttasks.jar" />
+    <taskdef resource="org/pluginbuilder/anttasks/pluginbuildertasks.properties" classpath="../pluginbuilder-anttasks.jar" />
+    <typedef resource="org/pluginbuilder/anttasks/pluginbuildertypes.properties" classpath="../pluginbuilder-anttasks.jar" />
 
-	<GetHostName />
-	<property file="../../build_${hostname}.properties" />
-	<property file="../../build_local.properties" />
-	<property file="run-tests.properties" />
-	<property name="test.eclipse.host.eclipse" value="${test.eclipse.host}/eclipse" />
-
-	<import file="../build_shared.xml" />
-	
-	<condition property="is.emma">
-		<equals arg1="${pluginbuilder.is.runcoverage}" arg2="true"/>
-	</condition>
-	
-	<target name="-init" depends="-emmaInit">
-		<antcall target="-unpackEclipse"/>
-		<antcall target="-installEclipseExtensionLocation"/>
-		<antcall target="umAddSite" />
-		<!-- Useful for debugging 
-		<antcall target="umListFeaturesSite" />
-		-->
-	</target>
-
-	<target name="-installEclipseExtensionLocation">
-		<echo message="Installing plug-ins for testing into eclipse extension location" />
-		<mkdir dir="${test.eclipseExtensionDirectory}"/>
-		<condition property="buildResultZipDest" value="${test.eclipseExtensionDirectory}/.." else="${test.eclipseExtensionDirectory}">
-			<equals arg1="${archivePrefix}" arg2="eclipse" />
-		</condition>
-		<unzip dest="${buildResultZipDest}">
-			<fileset dir="${buildDirectory}" includes="${buildType}-**/*.zip" excludes="**/${archiveNamePrefix}-*"/>
-		</unzip>
-		<antcall target="-emmaInstrument"/>
-		<unzip dest="${test.eclipseExtensionDirectory}/..">
-			<fileset dir="." includes="eclipse-test-framework*.zip" />
-		</unzip>
-		<unzip dest="${test.eclipseExtensionDirectory}">
-			<fileset dir="." includes="org.pluginbuilder.autotestsuite*.zip" />
-		</unzip>
-		<echo file="${test.eclipseExtensionDirectory}/.eclipseextension">id=org.eclipse.platform
+    <GetHostName />
+    <property file="../../build_${hostname}.properties" />
+    <property file="../../build_local.properties" />
+    <property file="run-tests.properties" />
+    <property name="test.eclipse.host.eclipse" value="${test.eclipse.host}/eclipse" />
+
+    <import file="../build_shared.xml" />
+    
+    <condition property="is.emma">
+        <equals arg1="${pluginbuilder.is.runcoverage}" arg2="true"/>
+    </condition>
+    
+    <target name="-init" depends="-emmaInit">
+        <antcall target="-unpackEclipse"/>
+        <antcall target="-installEclipseExtensionLocation"/>
+        <antcall target="umAddSite" />
+        <!-- Useful for debugging 
+        <antcall target="umListFeaturesSite" />
+        -->
+    </target>
+
+    <target name="-installEclipseExtensionLocation">
+        <echo message="Installing plug-ins for testing into eclipse extension location" />
+        <mkdir dir="${test.eclipseExtensionDirectory}"/>
+        <condition property="buildResultZipDest" value="${test.eclipseExtensionDirectory}/.." else="${test.eclipseExtensionDirectory}">
+            <equals arg1="${archivePrefix}" arg2="eclipse" />
+        </condition>
+        <unzip dest="${buildResultZipDest}">
+            <fileset dir="${buildDirectory}" includes="${buildType}-**/*.zip" excludes="**/${archiveNamePrefix}-*"/>
+        </unzip>
+        <antcall target="-emmaInstrument"/>
+        <unzip dest="${test.eclipseExtensionDirectory}/..">
+            <fileset dir="." includes="eclipse-test-framework*.zip" />
+        </unzip>
+        <unzip dest="${test.eclipseExtensionDirectory}">
+            <fileset dir="." includes="org.pluginbuilder.autotestsuite*.zip" />
+        </unzip>
+        <echo file="${test.eclipseExtensionDirectory}/.eclipseextension">id=org.eclipse.platform
 name=Eclipse Platform
 version=3.1.0</echo>
-	</target>
+    </target>
 
-	<target name="-unpackEclipse" unless="isEclipseInstallationAvailable">
-	 	<antcall target="unpack.eclipse">
-			<param name="eclipse.installation.dir" value="${test.eclipse.host.eclipse}"/>
-			<param name="eclipse.local.tar.non.server" value="${test.eclipse.zip}"/>
-		</antcall>
-	</target>
-
-	<!-- Example target which demonstrates how to run a test suite with the Eclipse test fwk.
-		Note that it is not needed if you use the autotestsuite
-
-	<target name="-runTestSuite" description="Should be called from allTests.xml only">
-		<ant target="core-test" antfile="${test.library.xml}" dir="${test.eclipse.host.eclipse}">
-			--><!-- inject additional properties for Eclipse startup with data-dir property --><!--
-			<property name="data-dir" value="${test.workspace} -clean -dev ${basedir}/emma.jar" />
-    		<property name="plugin-name" value="org.rssowl.core.tests" />
-    		<property name="classname" value="org.rssowl.core.tests.AllTests" />
-			<property name="eclipse-home" value="${test.eclipse.host.eclipse}" />
-			<property name="extraVMargs" value="-Demma.coverage.out.file=${emma.coverage.output}" />
-		</ant>
-	</target>
-	
-	<target name="run" depends="-init,-runTestSuite,-emmaReport" description="Run manually defined tests and create a report.">
-		<antcall target="umRemoveSite" />
-		<delete dir="${test.result.dir}" />
-		<mkdir dir="${test.result.dir}/xml" />
-		--><!-- collect creates an aggregated report file in ${test.eclipse.host} --><!--
-		<ant target="collect" antfile="${test.library.xml}" dir="${test.eclipse.host.eclipse}">
-			<property name="includes" value="*.xml" />
-			<property name="output-file" value="${test.aggregated.report}" />
-		</ant>
-		<copy file="${test.eclipse.host.eclipse}/${test.aggregated.report}" todir="${test.result.dir}/xml" />
-		
-		<BundleFileLocator eclipseInstallationRoot="${test.eclipseExtensionDirectory}" bundleId="org.pluginbuilder.autotestsuite.application" filePath="JUNIT.XSL" property="junit.xsl.file" />
-		<style style="${junit.xsl.file}" basedir="${test.result.dir}/xml" destdir="${test.result.dir}/html" />
-
-		<antcall target="-checkTestResultFileForErrors"/>
-	</target>
-	-->
-	
-	<target name="run" depends="-init,-runAutoTests,-emmaReport" description="Run all tests using the autotestsuite and create xml and html reports.">
-		<antcall target="umRemoveSite" />
-		<junitreport todir="${test.result.dir}/xml" tofile="${test.aggregated.report}">
-			<fileset dir="${test.result.dir}/xml">
-				<include name="*.xml" />
-			</fileset>
-		</junitreport>
-
-		<BundleFileLocator eclipseInstallationRoot="${test.eclipseExtensionDirectory}" bundleId="org.pluginbuilder.autotestsuite.application" filePath="JUNIT.XSL" property="junit.xsl.file" />
-
-		<style style="${junit.xsl.file}" basedir="${test.result.dir}/xml" includes="${test.aggregated.report}" destdir="${test.result.dir}/html" />
-	</target>
-	
-	<target name="-markErrorOrFailure" if="isErrorOrFailure">
-		<!-- Write Message to stderr and continue the build. Do not let the build fail so that 
-		     other tasks which come afterwards can be completed. E.g. packaging might take place
-		     after test execution -->
-		<echo level="error" message="TESTS FAILED"/>
-	</target>
-	
-	<target name="-checkTestResultFileForErrors" unless="isErrorOrFailure" description="Check test result file for errors. Not needed for autotestsuite where the return status is used to signal a failed build.">	
-		<echo message="Checke auf Fehler: ${test.aggregated.report}"/>
+    <target name="-unpackEclipse" unless="isEclipseInstallationAvailable">
+        <antcall target="unpack.eclipse">
+            <param name="eclipse.installation.dir" value="${test.eclipse.host.eclipse}"/>
+            <param name="eclipse.local.tar.non.server" value="${test.eclipse.zip}"/>
+        </antcall>
+    </target>
+
+    <!-- Example target which demonstrates how to run a test suite with the Eclipse test fwk.
+        Note that it is not needed if you use the autotestsuite
+
+    <target name="-runTestSuite" description="Should be called from allTests.xml only">
+        <ant target="core-test" antfile="${test.library.xml}" dir="${test.eclipse.host.eclipse}">
+            --><!-- inject additional properties for Eclipse startup with data-dir property --><!--
+            <property name="data-dir" value="${test.workspace} -clean -dev ${basedir}/emma.jar" />
+            <property name="plugin-name" value="org.rssowl.core.tests" />
+            <property name="classname" value="org.rssowl.core.tests.AllTests" />
+            <property name="eclipse-home" value="${test.eclipse.host.eclipse}" />
+            <property name="extraVMargs" value="-Demma.coverage.out.file=${emma.coverage.output}" />
+        </ant>
+    </target>
+    
+    <target name="run" depends="-init,-runTestSuite,-emmaReport" description="Run manually defined tests and create a report.">
+        <antcall target="umRemoveSite" />
+        <delete dir="${test.result.dir}" />
+        <mkdir dir="${test.result.dir}/xml" />
+        --><!-- collect creates an aggregated report file in ${test.eclipse.host} --><!--
+        <ant target="collect" antfile="${test.library.xml}" dir="${test.eclipse.host.eclipse}">
+            <property name="includes" value="*.xml" />
+            <property name="output-file" value="${test.aggregated.report}" />
+        </ant>
+        <copy file="${test.eclipse.host.eclipse}/${test.aggregated.report}" todir="${test.result.dir}/xml" />
+        
+        <BundleFileLocator eclipseInstallationRoot="${test.eclipseExtensionDirectory}" bundleId="org.pluginbuilder.autotestsuite.application" filePath="JUNIT.XSL" property="junit.xsl.file" />
+        <style style="${junit.xsl.file}" basedir="${test.result.dir}/xml" destdir="${test.result.dir}/html" />
+
+        <antcall target="-checkTestResultFileForErrors"/>
+    </target>
+    -->
+    
+    <target name="run" depends="-init,-runAutoTests,-emmaReport" description="Run all tests using the autotestsuite and create xml and html reports.">
+        <antcall target="umRemoveSite" />
+        <junitreport todir="${test.result.dir}/xml" tofile="${test.aggregated.report}">
+            <fileset dir="${test.result.dir}/xml">
+                <include name="*.xml" />
+            </fileset>
+        </junitreport>
+
+        <BundleFileLocator eclipseInstallationRoot="${test.eclipseExtensionDirectory}" bundleId="org.pluginbuilder.autotestsuite.application" filePath="JUNIT.XSL" property="junit.xsl.file" />
+
+        <style style="${junit.xsl.file}" basedir="${test.result.dir}/xml" includes="${test.aggregated.report}" destdir="${test.result.dir}/html" />
+    </target>
+    
+    <target name="-markErrorOrFailure" if="isErrorOrFailure">
+        <!-- Write Message to stderr and continue the build. Do not let the build fail so that 
+             other tasks which come afterwards can be completed. E.g. packaging might take place
+             after test execution -->
+        <echo level="error" message="TESTS FAILED"/>
+    </target>
+    
+    <target name="-checkTestResultFileForErrors" unless="isErrorOrFailure" description="Check test result file for errors. Not needed for autotestsuite where the return status is used to signal a failed build."> 
+        <echo message="Checke auf Fehler: ${test.aggregated.report}"/>
 
         <condition property="isErrorOrFailure">
                 <hasErrorOrFailure reportFile="${test.result.dir}/xml/${test.aggregated.report}" />
         </condition>
 
         <antcall target="-markErrorOrFailure" />        
-	</target>
+    </target>
+
+    <target name="-runAutoTests">
+        <mkdir dir="${test.result.dir}/xml"/>
+        <BundleFileLocator eclipseInstallationRoot="${test.eclipse.host.eclipse}" bundleId="org.eclipse.equinox.launcher" property="equinoxjar" />
+        <condition property="optJvmArg" else="-DdummyVar=NotOnMac" value="-XstartOnFirstThread">
+            <os family="mac"/>
+        </condition>
+        <condition property="testApplication" else="" value="-testApplication ${autotest.testapplication}">
+            <isset property="autotest.testapplication"/>
+        </condition>
+        <java fork="true" dir="." logError="true" classname="org.eclipse.core.launcher.Main" resultproperty="autotestsuite.result"> 
 
-	<target name="-runAutoTests">
-		<mkdir dir="${test.result.dir}/xml"/>
-		<BundleFileLocator eclipseInstallationRoot="${test.eclipse.host.eclipse}" bundleId="org.eclipse.equinox.launcher" property="equinoxjar" />
-		<condition property="optJvmArg" else="-DdummyVar=NotOnMac" value="-XstartOnFirstThread">
-			<os family="mac"/>
-		</condition>
-		<condition property="testApplication" else="" value="-testApplication ${autotest.testapplication}">
-			<isset property="autotest.testapplication"/>
-		</condition>
-		<java fork="true" dir="." logError="true" classname="org.eclipse.core.launcher.Main" resultproperty="autotestsuite.result"> 
-
-			<arg line="-application org.pluginbuilder.autotestsuite.application.autoTestApplication ${testApplication}" />
-			<arg line="-data ${test.workspace}" />
-			<arg line="-os ${os}" />
-			<arg line="-ws ${ws}" />
-			<arg line="-arch ${arch}" />
-			<arg line="-clean" />
-			<arg line="-consolelog" />
-			<arg line="-dev ${basedir}/emma.jar" />
-			
-			<jvmarg value="-Demma.coverage.out.file=${emma.coverage.output}"/>
-			<jvmarg value="${optJvmArg}"/>
-			<jvmarg value="-Xmx512m"/>
-			
-			<sysproperty key="autotestsuite.results.directory" value="${test.result.dir}/xml" />
-			<sysproperty key="autotest.debug" value="${autotestsuite.trace}" />
-			<sysproperty key="autotestsuite.headless" value="${autotestsuite.headless}" />
-			<sysproperty key="autotestsuite.plugin.inclusions" value="${autotestsuite.plugin.inclusions}" />
-			<sysproperty key="autotestsuite.plugin.exclusions" value="${autotestsuite.plugin.exclusions}|^org.eclipse.test$" />
-			<sysproperty key="autotestsuite.class.inclusions" value="${autotestsuite.class.inclusions}" />
-			<sysproperty key="autotestsuite.class.exclusions" value="${autotestsuite.class.exclusions}" />
-			
-			<classpath>
-				<pathelement location="${equinoxjar}" />
-			</classpath>
-		</java>
-		<condition property="isErrorOrFailure">
-			<not>
-				<equals arg1="${autotestsuite.result}" arg2="0"/>
-			</not>
-		</condition>
-	
-		<antcall target="-markErrorOrFailure"/>
-	</target>
-
-	<target name="umAddSite">
-		<echo message="Adding Extension Site to ${test.eclipse.host}. Might fail if extension already exists."/>
-		<!-- the addSite calls fails if the extension site already exists (for example because it was not removed properly
-		     from a previous build. Nonetheless the tests can proceed --> 
-		<antcall target="updateManager">	
-			<param name="updateManagerCommand" value="addSite"/>
-			<param name="updateManagerCommandParam" value="-from"/>
-			<param name="updateManagerCommandSiteUrl" value="${test.eclipseExtensionDirectory}"/>
-			<param name="updateManagerCommandFailOnError" value="false"/>
-		</antcall>
-	</target>
-	
-	<target name="umRemoveSite">
-		<!--  This command might fail if the Extension Site has never been added or was properly removed before. -->
-		<echo message="Removing Extension Site from ${test.eclipse.host}."/>
-		
-		<antcall target="updateManager">	
-			<param name="updateManagerCommand" value="removeSite"/>
-			<param name="updateManagerCommandParam" value="-to"/>
-			<param name="updateManagerCommandSiteUrl" value="${test.eclipseExtensionDirectory}"/>
-			<param name="updateManagerCommandFailOnError" value="false"/>
-		</antcall>
-	</target>
-	
-	<target name="umListFeaturesSite">
-		<antcall target="updateManager">	
-			<param name="updateManagerCommand" value="listFeatures"/>
-			<param name="updateManagerCommandParam" value="-from"/>
-			<param name="updateManagerCommandSiteUrl" value="${test.eclipseExtensionDirectory}"/>
-			<param name="updateManagerCommandFailOnError" value="false"/>
-		</antcall>
-
-	</target>
-	
-	<target name="updateManager">
-		<BundleFileLocator eclipseInstallationRoot="${test.eclipse.host.eclipse}" bundleId="org.eclipse.equinox.launcher" property="equinoxjar" />	
-		<java classname="org.eclipse.equinox.launcher.Main" fork="true" failonerror="${updateManagerCommandFailOnError}">
-			<arg value="-ws" />
-			<arg value="${ws}" />
-			<arg value="-os" />
-			<arg value="${os}" />			
-			<arg value="-application" />
-			<arg value="org.eclipse.update.core.standaloneUpdate" />
-			<arg value="-command" />
-			<arg value="${updateManagerCommand}" />
-			<arg value="${updateManagerCommandParam}" />
-			<arg value="${updateManagerCommandSiteUrl}" />
-
-			<classpath>
-				<pathelement location="${equinoxjar}" />
-			</classpath>
-			
-		</java>
-	</target>
-	
-	
-	
-	<target name="-emmaInit" if="is.emma">
-		<path id='emma.lib' >
-			<fileset dir='.' includes='*.jar' />
-		</path>
-		<taskdef resource='emma_ant.properties' classpathref='emma.lib' />
-	</target>
-	
-	<target name="-emmaReport" if="is.emma">		
-		<mkdir dir="${test.result.dir}/coverage" />
-		<emma enabled="${pluginbuilder.is.runcoverage}">
-			<report encoding="UTF-8">
-				<fileset dir="${buildDirectory}" includes="*.emma"/>
-				<fileset file="${emma.coverage.output}"/>
-			    <html outfile="${test.result.dir}/coverage/coverage.html" />
-
-				<sourcepath>
-					<dirset dir="${buildDirectory}/plugins">
-					</dirset>
-				</sourcepath>
-				
-			</report>
-		</emma>
-	</target>
-
-	<target name="-emmaInstrument" if="is.emma">
-		<!-- <emma enabled="${pluginbuilder.is.runcoverage}"> -->
-		<emma>
-			<instr verbosity="info" metadatafile="${buildDirectory}/metadata.emma" mode="overwrite">
-				<instrpath>
-					<fileset dir="${test.eclipseExtensionDirectory}" includes="**/*.jar" excludes="**/emma*.jar"/>
-					<dirset dir="${test.eclipseExtensionDirectory}/plugins" includes="*" />
-				</instrpath>
-				<!-- http://emma.sourceforge.net/reference/ch02s06s02.html#filtersyntax.ANT -->
-		        <filter includes="${pluginbuilder.coverage.inclusionfilter}" excludes="${pluginbuilder.coverage.exclusionfilter}" />
-			</instr>
-		</emma>	
-	</target>
+            <arg line="-application org.pluginbuilder.autotestsuite.application.autoTestApplication ${testApplication}" />
+            <arg line="-data ${test.workspace}" />
+            <arg line="-os ${os}" />
+            <arg line="-ws ${ws}" />
+            <arg line="-arch ${arch}" />
+            <arg line="-clean" />
+            <arg line="-consolelog" />
+            <arg line="-dev ${basedir}/emma.jar" />
+            
+            <jvmarg value="-Demma.coverage.out.file=${emma.coverage.output}"/>
+            <jvmarg value="${optJvmArg}"/>
+            <jvmarg value="-Xmx512m"/>
+            
+            <sysproperty key="autotestsuite.results.directory" value="${test.result.dir}/xml" />
+            <sysproperty key="autotest.debug" value="${autotestsuite.trace}" />
+            <sysproperty key="autotestsuite.headless" value="${autotestsuite.headless}" />
+            <sysproperty key="autotestsuite.plugin.inclusions" value="${autotestsuite.plugin.inclusions}" />
+            <sysproperty key="autotestsuite.plugin.exclusions" value="${autotestsuite.plugin.exclusions}|^org.eclipse.test$" />
+            <sysproperty key="autotestsuite.class.inclusions" value="${autotestsuite.class.inclusions}" />
+            <sysproperty key="autotestsuite.class.exclusions" value="${autotestsuite.class.exclusions}" />
+            
+            <classpath>
+                <pathelement location="${equinoxjar}" />
+            </classpath>
+        </java>
+        <condition property="isErrorOrFailure">
+            <not>
+                <equals arg1="${autotestsuite.result}" arg2="0"/>
+            </not>
+        </condition>
+    
+        <antcall target="-markErrorOrFailure"/>
+    </target>
+
+    <target name="umAddSite">
+        <echo message="Adding Extension Site to ${test.eclipse.host}. Might fail if extension already exists."/>
+        <!-- the addSite calls fails if the extension site already exists (for example because it was not removed properly
+             from a previous build. Nonetheless the tests can proceed --> 
+        <antcall target="updateManager">    
+            <param name="updateManagerCommand" value="addSite"/>
+            <param name="updateManagerCommandParam" value="-from"/>
+            <param name="updateManagerCommandSiteUrl" value="${test.eclipseExtensionDirectory}"/>
+            <param name="updateManagerCommandFailOnError" value="false"/>
+        </antcall>
+    </target>
+    
+    <target name="umRemoveSite">
+        <!--  This command might fail if the Extension Site has never been added or was properly removed before. -->
+        <echo message="Removing Extension Site from ${test.eclipse.host}."/>
+        
+        <antcall target="updateManager">    
+            <param name="updateManagerCommand" value="removeSite"/>
+            <param name="updateManagerCommandParam" value="-to"/>
+            <param name="updateManagerCommandSiteUrl" value="${test.eclipseExtensionDirectory}"/>
+            <param name="updateManagerCommandFailOnError" value="false"/>
+        </antcall>
+    </target>
+    
+    <target name="umListFeaturesSite">
+        <antcall target="updateManager">    
+            <param name="updateManagerCommand" value="listFeatures"/>
+            <param name="updateManagerCommandParam" value="-from"/>
+            <param name="updateManagerCommandSiteUrl" value="${test.eclipseExtensionDirectory}"/>
+            <param name="updateManagerCommandFailOnError" value="false"/>
+        </antcall>
+
+    </target>
+    
+    <target name="updateManager">
+        <BundleFileLocator eclipseInstallationRoot="${test.eclipse.host.eclipse}" bundleId="org.eclipse.equinox.launcher" property="equinoxjar" />  
+        <java classname="org.eclipse.equinox.launcher.Main" fork="true" failonerror="${updateManagerCommandFailOnError}">
+            <arg value="-ws" />
+            <arg value="${ws}" />
+            <arg value="-os" />
+            <arg value="${os}" />           
+            <arg value="-application" />
+            <arg value="org.eclipse.update.core.standaloneUpdate" />
+            <arg value="-command" />
+            <arg value="${updateManagerCommand}" />
+            <arg value="${updateManagerCommandParam}" />
+            <arg value="${updateManagerCommandSiteUrl}" />
+
+            <classpath>
+                <pathelement location="${equinoxjar}" />
+            </classpath>
+            
+        </java>
+    </target>
+    
+    
+    
+    <target name="-emmaInit" if="is.emma">
+        <path id='emma.lib' >
+            <fileset dir='.' includes='*.jar' />
+        </path>
+        <taskdef resource='emma_ant.properties' classpathref='emma.lib' />
+    </target>
+    
+    <target name="-emmaReport" if="is.emma">        
+        <mkdir dir="${test.result.dir}/coverage" />
+        <emma enabled="${pluginbuilder.is.runcoverage}">
+            <report encoding="UTF-8">
+                <fileset dir="${buildDirectory}" includes="*.emma"/>
+                <fileset file="${emma.coverage.output}"/>
+                <html outfile="${test.result.dir}/coverage/coverage.html" />
+
+                <sourcepath>
+                    <dirset dir="${buildDirectory}/plugins">
+                    </dirset>
+                </sourcepath>
+                
+            </report>
+        </emma>
+    </target>
+
+    <target name="-emmaInstrument" if="is.emma">
+        <!-- <emma enabled="${pluginbuilder.is.runcoverage}"> -->
+        <emma>
+            <instr verbosity="info" metadatafile="${buildDirectory}/metadata.emma" mode="overwrite">
+                <instrpath>
+                    <fileset dir="${test.eclipseExtensionDirectory}" includes="**/*.jar" excludes="**/emma*.jar"/>
+                    <dirset dir="${test.eclipseExtensionDirectory}/plugins" includes="*" />
+                </instrpath>
+                <!-- http://emma.sourceforge.net/reference/ch02s06s02.html#filtersyntax.ANT -->
+                <filter includes="${pluginbuilder.coverage.inclusionfilter}" excludes="${pluginbuilder.coverage.exclusionfilter}" />
+            </instr>
+        </emma> 
+    </target>
 </project>

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build.properties?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build.properties (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build.properties Tue Feb 22 15:09:30 2011
@@ -42,7 +42,7 @@ collectingFolder=${archivePrefix}
 #The list can only contain the configuration for which the desired format is different than zip.
 # E.g. win32,win32,x86 - antZip
 #archivesFormat=
-	
+    
 # Set to true for Jnlp generation
 # @category jnlp
 # @type Boolean
@@ -66,7 +66,7 @@ collectingFolder=${archivePrefix}
 # Set to ${configs} in order to filter the content of the generated jnlp files based on the configuration being built
 # @category jnlp
 # @type enum values=${configs} 
-# jnlp.configs=			
+# jnlp.configs=         
 
 # Check if you want to sign jars
 # @type Boolean
@@ -222,4 +222,4 @@ p2.artifact.repo.name=EasyAnt For Eclips
 # @category hidden
 p2.flavor=tooling
 # @category hidden
-p2.publish.artifacts=true
\ No newline at end of file
+p2.publish.artifacts=true

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_rcp.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_rcp.properties?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_rcp.properties (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_rcp.properties Tue Feb 22 15:09:30 2011
@@ -49,4 +49,4 @@ build.container.feature=true
 
 # Set the root path in the platform specific packages
 # @category packaging
-# archivePrefix=
\ No newline at end of file
+# archivePrefix=

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_shared.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_shared.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_shared.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/build_shared.xml Tue Feb 22 15:09:30 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <project name="Shared build targets">
-	<!-- the following properties must be set from the calling script 
+    <!-- the following properties must be set from the calling script 
     <property name="eclipse.installation.dir" value="${buildDirectory}"/>
     <property name="eclipse.local.tar.non.server" value="${test.eclipse.zip}"/>
     eclipse.download.cache,pluginbuilder.eclipse.url
@@ -23,110 +23,110 @@
     <property name="pluginbuilder.additional.feature.urls" value="featureurl1,featureurl2"/>
     -->
     
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${buildHome}/build-files/ant-contrib.jar" />
-	
-	<target name="unpack.eclipse">
-		<condition property="unpack.eclipse">
-			<not>
-				<available type="dir" file="${eclipse.installation.dir}"/>
-			</not>
-		</condition>
-		<antcall target="-unpack.eclipse.ifnecessary"/>
-	</target>    
-    
-	<!-- call either with or feature.url or pluginbuilder.eclipse.url
-		 sets property archive.location to the archive path in download cache.
-	 -->
-	<target name="-set.archive.location" if="pluginbuilder.is.server">
-		<!-- set default, useful for server where pluginbuilder.eclipse.url.default can be specified in build_local.properties --> 
-		<property name="pluginbuilder.eclipse.url" value="${pluginbuilder.eclipse.url.default}"/>
-		<condition property="archive.url" value="${feature.url}" else="${pluginbuilder.eclipse.url}">
-				<isset property="feature.url"/>
-		</condition>
-		<mkdir dir="${eclipse.download.cache}"/>
-		<tempfile destdir="${eclipse.download.cache}" property="tmp.file" suffix=".txt" prefix="downloadurl"/>		
-		<echo file="${tmp.file}" message="${archive.url}"/>
-		<checksum file="${tmp.file}" property="pluginbuilder.eclipse.url.checksum"/>
-		<delete file="${tmp.file}"/>
-		<property name="archive.location" value="${eclipse.download.cache}/${pluginbuilder.eclipse.url.checksum}"/>
-		<!-- <echo message="${archive.location} is archive location for ${archive.url}"/> -->
-	</target>
-	
-	<target name="-set.eclipse.local.tar.server" if="pluginbuilder.is.server" depends="-set.archive.location">
-		<property name="eclipse.local.tar" value="${archive.location}"/>
-	</target>
-	
-	<target name="-set.eclipse.local.tar.non.server" unless="pluginbuilder.is.server">
-		<property name="eclipse.local.tar" value="${eclipse.local.tar.non.server}"/>
-	</target>
-	
-	<target name="-get.archive.ifnecessary" unless="eclipse.is.downloaded">
-		<condition property="archive.url" value="${feature.url}" else="${pluginbuilder.eclipse.url}">
-				<isset property="feature.url"/>
-		</condition>
-		<get src="${archive.url}" dest="${archive.location}" />		
-	</target>
-	
-	<target name="-get.archive" depends="-set.archive.location" if="pluginbuilder.is.server">
-		<condition property="eclipse.is.downloaded">
-			<available file="${archive.location}" property="${eclipse.is.downloaded}"/>
-		</condition>		
-		<antcall target="-get.archive.ifnecessary"/> 
-	</target>
-	
-	<target name="-get.features" if="pluginbuilder.is.server" >
-		<property name="pluginbuilder.feature.urls" value="${pluginbuilder.feature.urls.default}"/>
-		<foreach list="${pluginbuilder.feature.urls}" param="feature.url" delimiter="," target="-get.archive" inheritall="true"/>
-	</target>
-	
-	<target name="-unpack.features" if="pluginbuilder.is.server">
-		<property name="pluginbuilder.feature.urls" value="${pluginbuilder.feature.urls.default}"/>
-		<foreach list="${pluginbuilder.feature.urls}" param="feature.url" delimiter="," target="-unpack.feature" inheritall="true"/>
-	</target>
-	
-	<target name="-unpack.feature" depends="-set.archive.location">
-		<property name="tempunziplocation" value="${buildDirectory}/tmpunzip"/>
-		<delete dir="${tempunziplocation}" failonerror="false"/>
-		<mkdir dir="${tempunziplocation}"/>
-		<unzip src="${archive.location}" overwrite="true" dest="${tempunziplocation}"/>
-		<condition property="moveroot" value="${tempunziplocation}/eclipse" else="${tempunziplocation}">
-				<available file="${tempunziplocation}/eclipse" type="dir"/>
-		</condition>
-		<move todir="${eclipse.installation.dir}" includeemptydirs="true">
-			<fileset dir="${moveroot}" includes="**"/>
-		</move>
-	</target>
-			
-	<target name="-unpack.eclipse.ifnecessary" if="unpack.eclipse">
-		<antcall target="-get.archive"/>
-		<condition property="is.windows">
-		  <os family="windows"/>
-		</condition>
-		<antcall target="-unpack.eclipse.windows"/>
-		<antcall target="-unpack.eclipse.linux"/>
-		<antcall target="-get.features"/>
-		<antcall target="-unpack.features"/>
-	</target>
-	
-	<target name="-unpack.eclipse.windows" if="is.windows" depends="-set.eclipse.local.tar.server,-set.eclipse.local.tar.non.server">
-		<unzip src="${eclipse.local.tar}" overwrite="true" dest="${eclipse.installation.dir}/.."/>		
-	</target>
-	
-	<target name="-unpack.eclipse.linux" unless="is.windows" depends="-set.eclipse.local.tar.server,-set.eclipse.local.tar.non.server">
-		<untar src="${eclipse.local.tar}" overwrite="true" dest="${eclipse.installation.dir}/.." compression="gzip"/>		
-	</target>
-	
-	<target name="test">
-		<property name="buildDirectory" value="C:/Temp/tst"/>
-		<mkdir dir="${buildDirectory}"/>
-		<property name="eclipse.download.cache" value="C:/Temp/downloadcache"/>
-		<property name="pluginbuilder.is.server" value="true"/>
-		<property name="pluginbuilder.eclipse.url" value="http://mirror.yoxos-eclipse-distribution.de/eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-PDE-3.2.2.zip"/>
-		
-		<property name="eclipse.installation.dir" value="C:/Temp/eclipse_root/eclipse"/>
-		<delete dir="${eclipse.installation.dir}" failonerror="false"/>
-		<property name="pluginbuilder.feature.urls" value="http://self.pluginbuilder.org/0.2.0/org.pluginbuilder.feature-0.2.0.20070218PRD.zip,http://mirror.yoxos-eclipse-distribution.de/eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-examples-3.2.2.zip"/>
-		<antcall target="unpack.eclipse"/>
-	</target>
-	
-</project>
\ No newline at end of file
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${buildHome}/build-files/ant-contrib.jar" />
+    
+    <target name="unpack.eclipse">
+        <condition property="unpack.eclipse">
+            <not>
+                <available type="dir" file="${eclipse.installation.dir}"/>
+            </not>
+        </condition>
+        <antcall target="-unpack.eclipse.ifnecessary"/>
+    </target>    
+    
+    <!-- call either with or feature.url or pluginbuilder.eclipse.url
+         sets property archive.location to the archive path in download cache.
+     -->
+    <target name="-set.archive.location" if="pluginbuilder.is.server">
+        <!-- set default, useful for server where pluginbuilder.eclipse.url.default can be specified in build_local.properties --> 
+        <property name="pluginbuilder.eclipse.url" value="${pluginbuilder.eclipse.url.default}"/>
+        <condition property="archive.url" value="${feature.url}" else="${pluginbuilder.eclipse.url}">
+                <isset property="feature.url"/>
+        </condition>
+        <mkdir dir="${eclipse.download.cache}"/>
+        <tempfile destdir="${eclipse.download.cache}" property="tmp.file" suffix=".txt" prefix="downloadurl"/>      
+        <echo file="${tmp.file}" message="${archive.url}"/>
+        <checksum file="${tmp.file}" property="pluginbuilder.eclipse.url.checksum"/>
+        <delete file="${tmp.file}"/>
+        <property name="archive.location" value="${eclipse.download.cache}/${pluginbuilder.eclipse.url.checksum}"/>
+        <!-- <echo message="${archive.location} is archive location for ${archive.url}"/> -->
+    </target>
+    
+    <target name="-set.eclipse.local.tar.server" if="pluginbuilder.is.server" depends="-set.archive.location">
+        <property name="eclipse.local.tar" value="${archive.location}"/>
+    </target>
+    
+    <target name="-set.eclipse.local.tar.non.server" unless="pluginbuilder.is.server">
+        <property name="eclipse.local.tar" value="${eclipse.local.tar.non.server}"/>
+    </target>
+    
+    <target name="-get.archive.ifnecessary" unless="eclipse.is.downloaded">
+        <condition property="archive.url" value="${feature.url}" else="${pluginbuilder.eclipse.url}">
+                <isset property="feature.url"/>
+        </condition>
+        <get src="${archive.url}" dest="${archive.location}" />     
+    </target>
+    
+    <target name="-get.archive" depends="-set.archive.location" if="pluginbuilder.is.server">
+        <condition property="eclipse.is.downloaded">
+            <available file="${archive.location}" property="${eclipse.is.downloaded}"/>
+        </condition>        
+        <antcall target="-get.archive.ifnecessary"/> 
+    </target>
+    
+    <target name="-get.features" if="pluginbuilder.is.server" >
+        <property name="pluginbuilder.feature.urls" value="${pluginbuilder.feature.urls.default}"/>
+        <foreach list="${pluginbuilder.feature.urls}" param="feature.url" delimiter="," target="-get.archive" inheritall="true"/>
+    </target>
+    
+    <target name="-unpack.features" if="pluginbuilder.is.server">
+        <property name="pluginbuilder.feature.urls" value="${pluginbuilder.feature.urls.default}"/>
+        <foreach list="${pluginbuilder.feature.urls}" param="feature.url" delimiter="," target="-unpack.feature" inheritall="true"/>
+    </target>
+    
+    <target name="-unpack.feature" depends="-set.archive.location">
+        <property name="tempunziplocation" value="${buildDirectory}/tmpunzip"/>
+        <delete dir="${tempunziplocation}" failonerror="false"/>
+        <mkdir dir="${tempunziplocation}"/>
+        <unzip src="${archive.location}" overwrite="true" dest="${tempunziplocation}"/>
+        <condition property="moveroot" value="${tempunziplocation}/eclipse" else="${tempunziplocation}">
+                <available file="${tempunziplocation}/eclipse" type="dir"/>
+        </condition>
+        <move todir="${eclipse.installation.dir}" includeemptydirs="true">
+            <fileset dir="${moveroot}" includes="**"/>
+        </move>
+    </target>
+            
+    <target name="-unpack.eclipse.ifnecessary" if="unpack.eclipse">
+        <antcall target="-get.archive"/>
+        <condition property="is.windows">
+          <os family="windows"/>
+        </condition>
+        <antcall target="-unpack.eclipse.windows"/>
+        <antcall target="-unpack.eclipse.linux"/>
+        <antcall target="-get.features"/>
+        <antcall target="-unpack.features"/>
+    </target>
+    
+    <target name="-unpack.eclipse.windows" if="is.windows" depends="-set.eclipse.local.tar.server,-set.eclipse.local.tar.non.server">
+        <unzip src="${eclipse.local.tar}" overwrite="true" dest="${eclipse.installation.dir}/.."/>      
+    </target>
+    
+    <target name="-unpack.eclipse.linux" unless="is.windows" depends="-set.eclipse.local.tar.server,-set.eclipse.local.tar.non.server">
+        <untar src="${eclipse.local.tar}" overwrite="true" dest="${eclipse.installation.dir}/.." compression="gzip"/>       
+    </target>
+    
+    <target name="test">
+        <property name="buildDirectory" value="C:/Temp/tst"/>
+        <mkdir dir="${buildDirectory}"/>
+        <property name="eclipse.download.cache" value="C:/Temp/downloadcache"/>
+        <property name="pluginbuilder.is.server" value="true"/>
+        <property name="pluginbuilder.eclipse.url" value="http://mirror.yoxos-eclipse-distribution.de/eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-PDE-3.2.2.zip"/>
+        
+        <property name="eclipse.installation.dir" value="C:/Temp/eclipse_root/eclipse"/>
+        <delete dir="${eclipse.installation.dir}" failonerror="false"/>
+        <property name="pluginbuilder.feature.urls" value="http://self.pluginbuilder.org/0.2.0/org.pluginbuilder.feature-0.2.0.20070218PRD.zip,http://mirror.yoxos-eclipse-distribution.de/eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-examples-3.2.2.zip"/>
+        <antcall target="unpack.eclipse"/>
+    </target>
+    
+</project>

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/customTargets.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/customTargets.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/customTargets.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/customTargets.xml Tue Feb 22 15:09:30 2011
@@ -15,210 +15,210 @@
    limitations under the License.
 -->
 <project name="Build specific targets and properties" default="noDefault">
-	<condition property="isNightlyBuild">
-		<equals arg1="${buildType}" arg2="N" />
-	</condition>
-	<condition property="isNightlyOrIntegrationBuild">
-		<or>
-			<equals arg1="${buildType}" arg2="N" />
-			<equals arg1="${buildType}" arg2="I" />
-		</or>
-	</condition>
-	
-	<property file="${buildHome}/pluginbuilder.config" />
-	
-	<property file="${buildDirectory}/version.properties" />
-	<property name="buildLabel" value="${buildType}-${version.full}" />
-	<property name="buildId" value="${version.full}" />
-	
-	<condition property="isCVSOrCopy" value="true">
-		<or>
-			<equals arg1="${pluginbuilder.is.cvs}" arg2="true"/>
-			<equals arg1="${pluginbuilder.is.copy}" arg2="true"/>
-		</or>
-	</condition>
-	<condition property="isSVN" value="true">
-		<equals arg1="${pluginbuilder.is.svn}" arg2="true"/>
-	</condition>
-	<condition property="isRunTests" value="true">
-		<equals arg1="${pluginbuilder.is.runtests}" arg2="true"/>
-	</condition>
-	
-	
-	<target name="allElements">
-		<condition property="isFetch" value="true">
-			<equals arg1="${target}" arg2="fetchElement"/>
-		</condition>
-	    <condition property="is.svn.fetch" value="true">
-	 		<and>
-		  		<equals arg1="${target}" arg2="fetchElement"/>
-				<equals arg1="${pluginbuilder.is.svn}" arg2="true"/>
-			</and>
-	    </condition>
-	
-		<antcall target="allElementsExceptSvnFetch"/>
-		<antcall target="fetchSubversion"/>
-	</target>
-	
-	<import file="allElements.xml"/>
-	<import file="subversionSupport.xml"/>
-	
-	
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="getMapFiles" if="isCVSOrCopy">
-		<echo message="Copying map files."/>
-		<copy todir="${buildDirectory}/maps">
-			<fileset dir="${buildHome}/maps" includes="*.map"></fileset>
-		</copy>
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">	
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<condition property="is.fetch" value="true">
-			<available file="${buildDirectory}/plugins"/>
-		</condition>
-		<fail unless="is.fetch" message="There was no plug-in fetched. Was the configuration generated? Is the repository correct?"/>
-		<antcall target="replaceVersions"/>		
-	</target>
-	
-	<target name="replaceVersions">
-		<fail unless="version.full" message="Property version.full must be set" />
-		<fail unless="version.qualifier" message="Property version.qualifier must be set" />
-	
-		<echo message="Updating versions in feature and plugin manifests. Full version: ${version.full}, qualifier: ${version.qualifier}"/>
-		<replaceregexp
+    <condition property="isNightlyBuild">
+        <equals arg1="${buildType}" arg2="N" />
+    </condition>
+    <condition property="isNightlyOrIntegrationBuild">
+        <or>
+            <equals arg1="${buildType}" arg2="N" />
+            <equals arg1="${buildType}" arg2="I" />
+        </or>
+    </condition>
+    
+    <property file="${buildHome}/pluginbuilder.config" />
+    
+    <property file="${buildDirectory}/version.properties" />
+    <property name="buildLabel" value="${buildType}-${version.full}" />
+    <property name="buildId" value="${version.full}" />
+    
+    <condition property="isCVSOrCopy" value="true">
+        <or>
+            <equals arg1="${pluginbuilder.is.cvs}" arg2="true"/>
+            <equals arg1="${pluginbuilder.is.copy}" arg2="true"/>
+        </or>
+    </condition>
+    <condition property="isSVN" value="true">
+        <equals arg1="${pluginbuilder.is.svn}" arg2="true"/>
+    </condition>
+    <condition property="isRunTests" value="true">
+        <equals arg1="${pluginbuilder.is.runtests}" arg2="true"/>
+    </condition>
+    
+    
+    <target name="allElements">
+        <condition property="isFetch" value="true">
+            <equals arg1="${target}" arg2="fetchElement"/>
+        </condition>
+        <condition property="is.svn.fetch" value="true">
+            <and>
+                <equals arg1="${target}" arg2="fetchElement"/>
+                <equals arg1="${pluginbuilder.is.svn}" arg2="true"/>
+            </and>
+        </condition>
+    
+        <antcall target="allElementsExceptSvnFetch"/>
+        <antcall target="fetchSubversion"/>
+    </target>
+    
+    <import file="allElements.xml"/>
+    <import file="subversionSupport.xml"/>
+    
+    
+    <!-- ===================================================================== -->
+    <!-- Check out map files from correct repository -->
+    <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+    <!-- ===================================================================== -->
+    <target name="getMapFiles" if="isCVSOrCopy">
+        <echo message="Copying map files."/>
+        <copy todir="${buildDirectory}/maps">
+            <fileset dir="${buildHome}/maps" includes="*.map"></fileset>
+        </copy>
+    </target>
+    
+    <!-- ===================================================================== -->
+    <!-- Steps to do before setup -->
+    <!-- ===================================================================== -->
+    <target name="preSetup">    
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after setup but before starting the build proper -->
+    <!-- ===================================================================== -->
+    <target name="postSetup">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do before fetching the build elements -->
+    <!-- ===================================================================== -->
+    <target name="preFetch">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after fetching the build elements -->
+    <!-- ===================================================================== -->
+    <target name="postFetch">
+        <condition property="is.fetch" value="true">
+            <available file="${buildDirectory}/plugins"/>
+        </condition>
+        <fail unless="is.fetch" message="There was no plug-in fetched. Was the configuration generated? Is the repository correct?"/>
+        <antcall target="replaceVersions"/>     
+    </target>
+    
+    <target name="replaceVersions">
+        <fail unless="version.full" message="Property version.full must be set" />
+        <fail unless="version.qualifier" message="Property version.qualifier must be set" />
+    
+        <echo message="Updating versions in feature and plugin manifests. Full version: ${version.full}, qualifier: ${version.qualifier}"/>
+        <replaceregexp
             match="(&lt;feature[^&gt;]*version=)&quot;0.0.0&quot;"
             replace="\1&quot;${version.full}&quot;"
-			byline="false"
-			flags="s">
-			  <fileset dir="${buildDirectory}/features" includes="**/feature.xml"/>
-		</replaceregexp>
-		<replaceregexp
+            byline="false"
+            flags="s">
+              <fileset dir="${buildDirectory}/features" includes="**/feature.xml"/>
+        </replaceregexp>
+        <replaceregexp
             match="(&lt;feature[^&gt;]*version=&quot;.*)qualifier&quot;"
             replace="\1${version.qualifier}&quot;"
-			byline="false"
-			flags="s">
-			  <fileset dir="${buildDirectory}/features" includes="**/feature.xml"/>
-		</replaceregexp>
-		<!-- in a manual build started with export from the feature.xml, there is no
-			need to replace the versions in the plugin.xml files if they are set to 0.0.0,
-			but here it needs to be -->
-		<replace dir="${buildDirectory}/plugins">
-			<include name="**/plugin.xml"/>
-			<replacefilter token="0.0.0" value="${version.full}" />
-		</replace>
-		<replace dir="${buildDirectory}/plugins">
-			<include name="**/META-INF/MANIFEST.MF"/>
-			<replacefilter token="Bundle-Version: 0.0.0" value="Bundle-Version: ${version.full}" />
-			<replacefilter token="qualifier" value="${version.qualifier}" />
-		</replace>	
-	</target>	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-		<!-- fail unless="featureVersion" message="Property featureVersion must be set.
-		 Either directly or in case of a nightly build with nightlyBuildFeatureVersionPrefix." />
-		 -->
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do before/after packaging RCP. -->
-	<!-- ===================================================================== -->
-	<target name="prePackage">
-	</target>
-	
-	<target name="postPackage">
-		<!-- copy build results for rcp build -->
-		<copy todir="${buildResultsDirectory}" flatten="true">
-			<fileset dir="${buildDirectory}" includes="${buildType}-**/*.zip" />
-		</copy>
-	</target>
+            byline="false"
+            flags="s">
+              <fileset dir="${buildDirectory}/features" includes="**/feature.xml"/>
+        </replaceregexp>
+        <!-- in a manual build started with export from the feature.xml, there is no
+            need to replace the versions in the plugin.xml files if they are set to 0.0.0,
+            but here it needs to be -->
+        <replace dir="${buildDirectory}/plugins">
+            <include name="**/plugin.xml"/>
+            <replacefilter token="0.0.0" value="${version.full}" />
+        </replace>
+        <replace dir="${buildDirectory}/plugins">
+            <include name="**/META-INF/MANIFEST.MF"/>
+            <replacefilter token="Bundle-Version: 0.0.0" value="Bundle-Version: ${version.full}" />
+            <replacefilter token="qualifier" value="${version.qualifier}" />
+        </replace>  
+    </target>   
+    <!-- ===================================================================== -->
+    <!-- Steps to do before generating the build scripts. -->
+    <!-- ===================================================================== -->
+    <target name="preGenerate">
+        <!-- fail unless="featureVersion" message="Property featureVersion must be set.
+         Either directly or in case of a nightly build with nightlyBuildFeatureVersionPrefix." />
+         -->
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after generating the build scripts. -->
+    <!-- ===================================================================== -->
+    <target name="postGenerate">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do before running the build.xmls for the elements being built. -->
+    <!-- ===================================================================== -->
+    <target name="preProcess">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after running the build.xmls for the elements being built. -->
+    <!-- ===================================================================== -->
+    <target name="postProcess">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do before running assemble. -->
+    <!-- ===================================================================== -->
+    <target name="preAssemble">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after  running assemble. -->
+    <!-- ===================================================================== -->
+    <target name="postAssemble">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do before/after packaging RCP. -->
+    <!-- ===================================================================== -->
+    <target name="prePackage">
+    </target>
+    
+    <target name="postPackage">
+        <!-- copy build results for rcp build -->
+        <copy todir="${buildResultsDirectory}" flatten="true">
+            <fileset dir="${buildDirectory}" includes="${buildType}-**/*.zip" />
+        </copy>
+    </target>
 
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the build is done. -->
-	<!-- ===================================================================== -->
-	<property name="buildResultsDirectory" value="${buildDirectory}/results" />
-	<target name="postBuild" depends="-prepareBuildResultsDirectory" unless="no.postBuild">
-		<antcall target="runTests"/>
-		<copy todir="${buildResultsDirectory}" flatten="true">
-			<fileset dir="${buildDirectory}" includes="${buildType}-**/*.zip" />
-		</copy>
-		<condition property="is.External.Postbuild">
-			<available file="${buildHome}/build-files/postBuild.xml"/>
-		</condition>
-		<antcall target="callExternalPostBuild"/>
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Run tests. -->
-	<!-- ===================================================================== -->
-	<target name="runTests" if="isRunTests">
-		<property name="automatedTestsHome" location="${buildHome}/build-files/automatedTests"/>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after the build is done. -->
+    <!-- ===================================================================== -->
+    <property name="buildResultsDirectory" value="${buildDirectory}/results" />
+    <target name="postBuild" depends="-prepareBuildResultsDirectory" unless="no.postBuild">
+        <antcall target="runTests"/>
+        <copy todir="${buildResultsDirectory}" flatten="true">
+            <fileset dir="${buildDirectory}" includes="${buildType}-**/*.zip" />
+        </copy>
+        <condition property="is.External.Postbuild">
+            <available file="${buildHome}/build-files/postBuild.xml"/>
+        </condition>
+        <antcall target="callExternalPostBuild"/>
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Run tests. -->
+    <!-- ===================================================================== -->
+    <target name="runTests" if="isRunTests">
+        <property name="automatedTestsHome" location="${buildHome}/build-files/automatedTests"/>
 
-		<ant antfile="${automatedTestsHome}/run-tests.xml" target="run" dir="${automatedTestsHome}">
-			<property name="test.result.dir" value="${buildResultsDirectory}/testresults"/>
-		</ant>
-	</target>	
-	<!--======================================================-->
-	<!-- Gather build results  -->
-	<!-- ==================================================== -->
-	<target name="-prepareBuildResultsDirectory">
-		<echo message="Creating ${buildResultsDirectory}" />
-		<mkdir dir="${buildResultsDirectory}" />	
-	</target>
+        <ant antfile="${automatedTestsHome}/run-tests.xml" target="run" dir="${automatedTestsHome}">
+            <property name="test.result.dir" value="${buildResultsDirectory}/testresults"/>
+        </ant>
+    </target>   
+    <!--======================================================-->
+    <!-- Gather build results  -->
+    <!-- ==================================================== -->
+    <target name="-prepareBuildResultsDirectory">
+        <echo message="Creating ${buildResultsDirectory}" />
+        <mkdir dir="${buildResultsDirectory}" />    
+    </target>
 
-	<!--======================================================-->
-	<!-- Call External post build file if available -->
-	<!-- ==================================================== -->
-	<target name="callExternalPostBuild" if="is.External.Postbuild">
-		<ant antfile="${buildHome}/build-files/postBuild.xml"/>
-	</target>
-	
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
+    <!--======================================================-->
+    <!-- Call External post build file if available -->
+    <!-- ==================================================== -->
+    <target name="callExternalPostBuild" if="is.External.Postbuild">
+        <ant antfile="${buildHome}/build-files/postBuild.xml"/>
+    </target>
+    
+    <target name="noDefault">
+        <echo message="You must specify a target when invoking this file" />
+    </target>
 </project>

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/fetchSvnAll.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/fetchSvnAll.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/fetchSvnAll.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/fetchSvnAll.xml Tue Feb 22 15:09:30 2011
@@ -18,4 +18,4 @@
   <target name="fetch.svn.all">
     <!-- use pluginbuilder editor to change content -->
   </target>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/postBuild.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/postBuild.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/postBuild.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/postBuild.xml Tue Feb 22 15:09:30 2011
@@ -15,30 +15,30 @@
    limitations under the License.
 -->
 <project name="Run as part of postBuild" default="main">
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${buildHome}/build-files/ant-contrib.jar" />
-	<taskdef resource="org/pluginbuilder/anttasks/pluginbuildertasks.properties" classpath="${buildHome}/build-files/pluginbuilder-anttasks.jar" />
-	
-	
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${buildHome}/build-files/ant-contrib.jar" />
+    <taskdef resource="org/pluginbuilder/anttasks/pluginbuildertasks.properties" classpath="${buildHome}/build-files/pluginbuilder-anttasks.jar" />
+    
+    
     <target name="main">
-    	<property name="UpdateSiteStagingLocation" value="${buildDirectory}/tmpUpdateSite/updateSite"/>
-    	<property name="UpdateSiteFinalLocation" value="${buildResultsDirectory}/../updateSite"/>
-    	<property name="siteXmlFile" value="${UpdateSiteStagingLocation}/site.xml"/>
-    	
+        <property name="UpdateSiteStagingLocation" value="${buildDirectory}/tmpUpdateSite/updateSite"/>
+        <property name="UpdateSiteFinalLocation" value="${buildResultsDirectory}/../updateSite"/>
+        <property name="siteXmlFile" value="${UpdateSiteStagingLocation}/site.xml"/>
+        
         <antcall target="-generateUpdateSite"/>
-    	<antcall target="-createNightlyBuildSiteXml"/>
-    	<zip destfile="${buildResultsDirectory}/updateSite-${version.full}.zip" basedir="${UpdateSiteStagingLocation}"/>
-    	<antcall target="deleteSiteXml"/>
-    	<copy todir="${UpdateSiteFinalLocation}">
-    		<fileset dir="${UpdateSiteStagingLocation}" includes="**"/>
-    	</copy>
-    	<delete dir="${UpdateSiteStagingLocation}/../.." includes="tmpUpdateSite/**" includeemptydirs="true"/>
-    	<antcall target="-p2"/>
-    </target>
-	
-	<target name="deleteSiteXml" unless="isNightlyBuild">
-		<!-- in release builds the site.xml should not be overwritten, so older version can survive -->
-		<delete file="${siteXmlFile}"/>
-	</target>
+        <antcall target="-createNightlyBuildSiteXml"/>
+        <zip destfile="${buildResultsDirectory}/updateSite-${version.full}.zip" basedir="${UpdateSiteStagingLocation}"/>
+        <antcall target="deleteSiteXml"/>
+        <copy todir="${UpdateSiteFinalLocation}">
+            <fileset dir="${UpdateSiteStagingLocation}" includes="**"/>
+        </copy>
+        <delete dir="${UpdateSiteStagingLocation}/../.." includes="tmpUpdateSite/**" includeemptydirs="true"/>
+        <antcall target="-p2"/>
+    </target>
+    
+    <target name="deleteSiteXml" unless="isNightlyBuild">
+        <!-- in release builds the site.xml should not be overwritten, so older version can survive -->
+        <delete file="${siteXmlFile}"/>
+    </target>
     
     <!--======================================================-->
     <!-- UpdateSite Export target, to be called from allElements  -->
@@ -55,9 +55,9 @@
         <mkdir dir="${UpdateSiteStagingLocation}"/>
         <mkdir dir="${UpdateSiteStagingLocation}/features"/>
         <mkdir dir="${UpdateSiteStagingLocation}/plugins"/>
-    	<condition property="jarProcessor.sign" value="true">
-    		<istrue value="${signJars}"/>
-    	</condition>
+        <condition property="jarProcessor.sign" value="true">
+            <istrue value="${signJars}"/>
+        </condition>
         <!-- Build the jar files -->
         <ant antfile="${builder}/customTargets.xml" target="allElements">
             <property name="genericTargets" value="${builder}/postBuild.xml"/>
@@ -67,59 +67,59 @@
         <antcall target="-createNightlyBuildSiteXml"/>
         <delete dir="${buildDirectory}/temp.updatesite"/>
     </target>
-	
+    
     <target name="-createNightlyBuildSiteXml">
-    	<echo>${siteXmlFile}</echo>
+        <echo>${siteXmlFile}</echo>
         <echo file="${siteXmlFile}">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;site&gt;
-		&lt;description&gt;${updateSiteDescription}&lt;/description&gt;
+        &lt;description&gt;${updateSiteDescription}&lt;/description&gt;
 </echo>
-    	<foreach list="${pluginbuilder.features}" delimiter="," target="-appendFeatureElement" param="featureId" inheritall="true"/> 
-        <echo file="${siteXmlFile}" append="true">		&lt;category-def name=&quot;${updateSiteCategoryName}&quot;
+        <foreach list="${pluginbuilder.features}" delimiter="," target="-appendFeatureElement" param="featureId" inheritall="true"/> 
+        <echo file="${siteXmlFile}" append="true">      &lt;category-def name=&quot;${updateSiteCategoryName}&quot;
             label=&quot;${updateSiteCategoryLabel}&quot;&gt;
-		&lt;/category-def&gt;
+        &lt;/category-def&gt;
 &lt;/site&gt;</echo>
     </target>
 
-	<target name="-appendFeatureElement">
-		<!-- we can not rely on ${version.full} at this point since people could use
-			a fix feature id like 0.5.0.qualifier. ${version.full} would only work if
-			the feature were set to 0.0.0 --> 
-		<loadfile property="featurexml" srcfile="${buildDirectory}/features/${featureId}/feature.xml"/>
-		<SetRegex input="${featurexml}" match="^.*&lt;feature.+?version=&quot;(.+?)&quot;.*$" property="realFeatureVersion" value="\1" />
-    	<echo file="${siteXmlFile}" append="true">		&lt;feature 
-		url=&quot;features/${featureId}_${realFeatureVersion}.jar&quot; 
-		id=&quot;${featureId}&quot; 
-		version=&quot;${realFeatureVersion}&quot;&gt; 
-    	&lt;category name=&quot;${updateSiteCategoryName}&quot;/&gt; 
-		&lt;/feature&gt;
-</echo>    	
-    </target>
-	
-	<target name="-p2">
-		<condition property="is.p2" value="true">
-				<equals  arg1="${generate.p2.metadata}" arg2="true"/>
-		</condition>
-		<property name="p2archive" value="${buildResultsDirectory}/p2-repository-${version.full}.zip"/>
-		<antcall target="-createP2Archive"/>
-		<antcall target="-createP2UpdateSite"/>
-	</target>
-		
-	<target name="-createP2Archive" if="is.p2">
-		<pathconvert property="repodir">
-			<resources>
-			      <url url="${p2.metadata.repo}"/>
-			</resources>
-			<map from="file:" to=""/>
-		</pathconvert>
-		<zip destfile="${p2archive}" basedir="${repodir}"/>
-	</target>
-	
-	<target name="-createP2UpdateSite" if="is.p2">
-		<property name="p2updatesite" value="${buildResultsDirectory}/../p2-updateSite"/>
-		<delete dir="${p2updatesite}"/>
-		<mkdir dir="${p2updatesite}"/>
-		<unzip src="${p2archive}" dest="${p2updatesite}"/>
-	</target>
-	
+    <target name="-appendFeatureElement">
+        <!-- we can not rely on ${version.full} at this point since people could use
+            a fix feature id like 0.5.0.qualifier. ${version.full} would only work if
+            the feature were set to 0.0.0 --> 
+        <loadfile property="featurexml" srcfile="${buildDirectory}/features/${featureId}/feature.xml"/>
+        <SetRegex input="${featurexml}" match="^.*&lt;feature.+?version=&quot;(.+?)&quot;.*$" property="realFeatureVersion" value="\1" />
+        <echo file="${siteXmlFile}" append="true">      &lt;feature 
+        url=&quot;features/${featureId}_${realFeatureVersion}.jar&quot; 
+        id=&quot;${featureId}&quot; 
+        version=&quot;${realFeatureVersion}&quot;&gt; 
+        &lt;category name=&quot;${updateSiteCategoryName}&quot;/&gt; 
+        &lt;/feature&gt;
+</echo>     
+    </target>
+    
+    <target name="-p2">
+        <condition property="is.p2" value="true">
+                <equals  arg1="${generate.p2.metadata}" arg2="true"/>
+        </condition>
+        <property name="p2archive" value="${buildResultsDirectory}/p2-repository-${version.full}.zip"/>
+        <antcall target="-createP2Archive"/>
+        <antcall target="-createP2UpdateSite"/>
+    </target>
+        
+    <target name="-createP2Archive" if="is.p2">
+        <pathconvert property="repodir">
+            <resources>
+                  <url url="${p2.metadata.repo}"/>
+            </resources>
+            <map from="file:" to=""/>
+        </pathconvert>
+        <zip destfile="${p2archive}" basedir="${repodir}"/>
+    </target>
+    
+    <target name="-createP2UpdateSite" if="is.p2">
+        <property name="p2updatesite" value="${buildResultsDirectory}/../p2-updateSite"/>
+        <delete dir="${p2updatesite}"/>
+        <mkdir dir="${p2updatesite}"/>
+        <unzip src="${p2archive}" dest="${p2updatesite}"/>
+    </target>
+    
 </project>

Modified: incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/subversionSupport.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/subversionSupport.xml?rev=1073358&r1=1073357&r2=1073358&view=diff
==============================================================================
--- incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/subversionSupport.xml (original)
+++ incubator/easyant/easyant4e/trunk/org.apache.easyant4e.releng/build-files/subversionSupport.xml Tue Feb 22 15:09:30 2011
@@ -16,27 +16,27 @@
 -->
 <project name="to be included into customTargets.xml">
 
-	<import file="fetchSvnAll.xml"/>
+    <import file="fetchSvnAll.xml"/>
 
-	<path id="project.classpath">
-		<pathelement location="${buildHome}/build-files/svn/svnant.jar"/>
-		<pathelement location="${buildHome}/build-files/svn/svnClientAdapter.jar"/>
-	</path>
-	
-  	<target name="fetchSubversion" if="is.svn.fetch">
-  		 <taskdef resource="svntask.properties" classpathref="project.classpath"/>
-  		 <property name="fetchTag" value="HEAD"/>
-  		 <antcall target="fetch.svn.all"/>
-  	</target>
+    <path id="project.classpath">
+        <pathelement location="${buildHome}/build-files/svn/svnant.jar"/>
+        <pathelement location="${buildHome}/build-files/svn/svnClientAdapter.jar"/>
+    </path>
+    
+    <target name="fetchSubversion" if="is.svn.fetch">
+         <taskdef resource="svntask.properties" classpathref="project.classpath"/>
+         <property name="fetchTag" value="HEAD"/>
+         <antcall target="fetch.svn.all"/>
+    </target>
     
     <target name="svn.co">
-    	<property name="target.dir" value="${element.id}"/>
-    	<condition property="svn.url" value="${pluginbuilder.svn.url}" else="${url}">
-    		<isset property="pluginbuilder.svn.url"/>
-    	</condition>
-     	<svn javahl="false" username="${pluginbuilder.svn.user}" password="${pluginbuilder.svn.password}">
-  			<checkout revision="${fetchTag}" url="${svn.url}/${project.name}" destPath="${buildDirectory}/${target}/${target.dir}" />
-  		</svn>    	
-	</target>  
+        <property name="target.dir" value="${element.id}"/>
+        <condition property="svn.url" value="${pluginbuilder.svn.url}" else="${url}">
+            <isset property="pluginbuilder.svn.url"/>
+        </condition>
+        <svn javahl="false" username="${pluginbuilder.svn.user}" password="${pluginbuilder.svn.password}">
+            <checkout revision="${fetchTag}" url="${svn.url}/${project.name}" destPath="${buildDirectory}/${target}/${target.dir}" />
+        </svn>      
+    </target>  
 
-</project>
\ No newline at end of file
+</project>



Mime
View raw message