From 698ac42bc260ef0ee9bc932e2090406076a4a9d4 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 15 May 2009 04:47:37 +0000
Subject: [PATCH] minor - ADEMPIERE_VERSION and ADEMPIERE_VENDOR not read from
 AdempiereEnv.properties

---
 install/Adempiere/build.xml | 162 ++++++++++++++++++------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/install/Adempiere/build.xml b/install/Adempiere/build.xml
index 3cb35e0d07..5bb8abc49c 100644
--- a/install/Adempiere/build.xml
+++ b/install/Adempiere/build.xml
@@ -20,11 +20,11 @@
 	  <exclude name="META-INF/MANIFEST.MF"/>
 	  <exclude name="META-INF/INDEX.LIST"/>
 	</patternset>
-	
+
 	<!-- ==================================================== -->
 	<!-- Init                                                 -->
 	<!-- ==================================================== -->
-	<target name="setupInit" 
+	<target name="setupInit"
 		description="initialization target">
 
 		<echo message="Adempiere Server Setup ===================" />
@@ -36,7 +36,7 @@
 		<available file="lib/AdempiereOriginal.jar" type="file" property="adempiereOriginal.exists"/>
 		<available file="lib/webuiOriginal.war" type="file" property="webuiOriginal.exists"/>
 		<fail message="**** RUN_setup was not successful - please re-run ****" unless="envFileExists" />
-		<property file="${envFile}" />
+		<property file="${envFile}"/>
 		<filter filtersfile="${envFile}" />
 
 		<echo message="Environment   = ${envFile}" />
@@ -63,22 +63,22 @@
 	<!-- ==================================================== -->
 	<!-- Windows Setup                                        -->
 	<!-- ==================================================== -->
-	<target name="setupWin" depends="setupInit" if="isWindows" 
+	<target name="setupWin" depends="setupInit" if="isWindows"
 		description="Windows Setup">
 
 		<!--	Filter files No Overwrite	-->
-		<copy file="utils/myDBcopyTemplate.bat" 
+		<copy file="utils/myDBcopyTemplate.bat"
 			tofile="utils/myDBcopy.bat" filtering="yes" overwrite="no" />
 
 		<!--	Filter files Overwrite		-->
-		<copy file="utils/myEnvironmentTemplate.bat" 
+		<copy file="utils/myEnvironmentTemplate.bat"
 			tofile="utils/myEnvironment.bat" filtering="yes" overwrite="yes" />
 
-		<copy file="utils/RUN_GetAdempiereTemplate.bat" 
+		<copy file="utils/RUN_GetAdempiereTemplate.bat"
 			tofile="utils/RUN_GetAdempiere.bat" filtering="yes" overwrite="yes" />
-		<copy file="utils/RUN_PutExportTemplate.bat" 
+		<copy file="utils/RUN_PutExportTemplate.bat"
 			tofile="utils/RUN_PutExport.bat" filtering="yes" overwrite="yes" />
-		<copy file="utils/RUN_WinEnvTemplate.bat" 
+		<copy file="utils/RUN_WinEnvTemplate.bat"
 			tofile="utils/RUN_WinEnv.bat" filtering="yes" overwrite="yes" />
 
 		<delete>
@@ -91,22 +91,22 @@
 	<!-- ==================================================== -->
 	<!-- Non Windows Setup                                    -->
 	<!-- ==================================================== -->
-	<target name="setupNonWin" depends="setupInit" unless="isWindows" 
+	<target name="setupNonWin" depends="setupInit" unless="isWindows"
 		description="Non Windows Setup">
 
 		<!--	Filter files No Overwrite	-->
-		<copy file="utils/myDBcopyTemplate.sh" 
+		<copy file="utils/myDBcopyTemplate.sh"
 			tofile="utils/myDBcopy.sh" filtering="yes" overwrite="no" />
 
 		<!--	Filter files Overwrite		-->
-		<copy file="utils/myEnvironmentTemplate.sh" 
+		<copy file="utils/myEnvironmentTemplate.sh"
 			tofile="utils/myEnvironment.sh" filtering="yes" overwrite="yes" />
 
-		<copy file="utils/RUN_GetAdempiereTemplate.sh" 
+		<copy file="utils/RUN_GetAdempiereTemplate.sh"
 			tofile="utils/RUN_GetAdempiere.sh" filtering="yes" overwrite="yes" />
-		<copy file="utils/RUN_PutExportTemplate.sh" 
+		<copy file="utils/RUN_PutExportTemplate.sh"
 			tofile="utils/RUN_PutExport.sh" filtering="yes" overwrite="yes" />
-		<copy file="utils/RUN_UnixEnvTemplate.sh" 
+		<copy file="utils/RUN_UnixEnvTemplate.sh"
 			tofile="utils/RUN_UnixEnv.sh" filtering="yes" overwrite="yes" />
 
 		<!--	Fix OS stuff	-->
@@ -161,11 +161,11 @@
 			</indexjars>
 			<manifest>
 	        	<attribute name="Specification-Title" value="Adempiere"/>
-		        <attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
+		        <attribute name="Specification-Version" value="${ADEMPIERE_VERSION}"/>
 		        <attribute name="Specification-Vendor" value="ADempiere"/>
-		        <attribute name="Implementation-Title" value="Adempiere ${env.ADEMPIERE_VERSION}"/>
-		        <attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}"/>
-		        <attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}"/> 
+		        <attribute name="Implementation-Title" value="Adempiere ${ADEMPIERE_VERSION}"/>
+		        <attribute name="Implementation-Version" value="${ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}"/>
+		        <attribute name="Implementation-Vendor" value="${ADEMPIERE_VENDOR}"/>
 		        <attribute name="Implementation-URL" value="http://www.adempiere.com"/>
 		        <attribute name="Main-Class" value="org.compiere.Adempiere"/>
 		        <attribute name="Class-Path" value="AdempiereSLib.jar"/>
@@ -173,19 +173,19 @@
 	    </jar>
 
 		<!-- Sign Adempiere Jar -->
-		<signjar jar="lib/Adempiere1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/Adempiere1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<copy file="lib/Adempiere1.jar" tofile="lib/Adempiere.jar" overwrite="yes" />
 
 		<!-- Sign patches Jar -->
 		<copy file="lib/patches.jar" tofile="lib/patches1.jar" overwrite="yes" />
-		<signjar jar="lib/patches1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/patches1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<copy file="lib/patches1.jar" tofile="lib/patches.jar" overwrite="yes" />
 
 		<!-- Sign customization Jar -->
 		<copy file="lib/customization.jar" tofile="lib/customization1.jar" overwrite="yes" />
-		<signjar jar="lib/customization1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/customization1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<copy file="lib/customization1.jar" tofile="lib/customization.jar" overwrite="yes" />
 
@@ -229,14 +229,14 @@
 	<!-- ==================================================== -->
 	<!-- Adempiere Client Lib                                  -->
 	<!-- ==================================================== -->
-	<target name="setupCLib" depends="setupInit"  
+	<target name="setupCLib" depends="setupInit"
 		description="Setup Adempiere Client Lib">
 
 		<!-- Delete Old		-->
 		<delete file="lib/AdempiereCLib.jar" failonerror="no" />
 		<delete file="lib/CClient.jar" failonerror="no" />
 		<delete file="lib/CTools.jar" failonerror="no" />
-		
+
 		<!-- Create AdempiereCLib.jar file 	-->
 		<jar jarfile="lib/AdempiereCLib.jar" index="yes" duplicate="preserve">
 			<zipfileset src="lib/${ADEMPIERE_APPS_TYPE}.jar" >
@@ -250,8 +250,8 @@
 			</zipfileset>
 			<zipfileset src="lib/postgresql.jar" >
 				<patternset refid="manifest.exclude"/>
-			</zipfileset>		
-					
+			</zipfileset>
+
 			<manifest>
 				<attribute name="Specification-Title" value="Adempiere Client Library" />
 				<attribute name="Specification-Version" value="${ADEMPIERE_MAIN_VERSION}" />
@@ -265,7 +265,7 @@
 
 		<echo message="KeyStore=${ADEMPIERE_KEYSTORE} - Alias=${ADEMPIERE_KEYSTORECODEALIAS}" />
 		<!-- Sign AdempiereCLib Jar 		-->
-		<signjar jar="lib/AdempiereCLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/AdempiereCLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 
 	</target>
@@ -273,7 +273,7 @@
 	<!-- ==================================================== -->
 	<!-- Adempiere Server Lib                                  -->
 	<!-- ==================================================== -->
-	<target name="setupSLib" depends="setupInit" 
+	<target name="setupSLib" depends="setupInit"
 		description="Setup Adempiere Server Lib">
 
 		<!-- Delete Old		-->
@@ -307,28 +307,28 @@
 		</jar>
 
 		<!-- Sign AdempiereSLib Jar 		-->
-		<signjar jar="lib/AdempiereSLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/AdempiereSLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<delete dir="buildSLib" />
-		
+
 		<!-- Sign CompiereJasperReqs.jar for Java Web Start	-->
 		<signjar jar="lib/CompiereJasperReqs.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 		   	storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 
 	</target>
-	
+
 	<!-- Sign other application jars -->
 	<target name="signOtherJars" depends="setupInit" >
 		<!-- Sign AdempiereRoot Jar 		-->
 		<copy file="lib/adempiereRoot.jar" tofile="lib/adempiereRoot1.jar" overwrite="yes" />
-		<signjar jar="lib/adempiereRoot1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/adempiereRoot1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<copy file="lib/adempiereRoot1.jar" tofile="lib/adempiereRoot.jar" overwrite="yes" />
 		<delete file="lib/adempiereRoot1.jar"/>
-		
+
 		<!-- Sign AdempiereApps Jar 		-->
 		<copy file="lib/adempiereApps.jar" tofile="lib/adempiereApps1.jar" overwrite="yes" />
-		<signjar jar="lib/adempiereApps1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<signjar jar="lib/adempiereApps1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<copy file="lib/adempiereApps1.jar" tofile="lib/adempiereApps.jar" overwrite="yes" />
 		<delete file="lib/adempiereApps1.jar"/>
@@ -338,47 +338,47 @@
 	<!-- ==================================================== -->
 	<!-- Setup Lib                                            -->
 	<!-- ==================================================== -->
-	<target name="setupLib" depends="setupInit, setupWin, setupNonWin, setupCLib, setupSLib, setupALib, setupWLib, signOtherJars" 
+	<target name="setupLib" depends="setupInit, setupWin, setupNonWin, setupCLib, setupSLib, setupALib, setupWLib, signOtherJars"
 		description="Setup Adempiere Lib directory">
 
 		<!--	Filter files Overwrite			-->
-		<copy file="${basedir}/utils/ftpPutExportTemplate.txt" 
+		<copy file="${basedir}/utils/ftpPutExportTemplate.txt"
 			tofile="${basedir}/utils/ftpPutExport.txt" filtering="yes" overwrite="yes" />
-		<copy file="${basedir}/utils/ftpGetAdempiereTemplate.txt" 
+		<copy file="${basedir}/utils/ftpGetAdempiereTemplate.txt"
 			tofile="${basedir}/utils/ftpGetAdempiere.txt" filtering="yes" overwrite="yes" />
-		<copy file="${basedir}/utils/adempiereDirectTemplate.jnlp" 
+		<copy file="${basedir}/utils/adempiereDirectTemplate.jnlp"
 			tofile="${basedir}/lib/adempiereDirect.jnlp" filtering="yes" overwrite="yes" />
 
 		<!--	Create Client Zip		-->
 		<zip zipfile="${basedir}/lib/AdempiereClient.zip">
-			<zipfileset dir="." prefix="Adempiere" 
+			<zipfileset dir="." prefix="Adempiere"
 				includes="*.html" />
-			<zipfileset dir="." prefix="Adempiere" 
+			<zipfileset dir="." prefix="Adempiere"
 				includes="RUN_Adempiere.*" />
-			<zipfileset dir="utils" prefix="Adempiere" 
+			<zipfileset dir="utils" prefix="Adempiere"
 				includes="WinEnv.js" />
-			<zipfileset dir="lib" prefix="Adempiere/lib" 
+			<zipfileset dir="lib" prefix="Adempiere/lib"
 				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
 		</zip>
 
 		<!--	Save properties		-->
-		<copy file="AdempiereEnv.properties" 
+		<copy file="AdempiereEnv.properties"
 			tofile="AdempiereEnv.properties.save" />
-		<copy file="Adempiere.properties" 
+		<copy file="Adempiere.properties"
 			tofile="Adempiere.properties.save" />
 	</target>
-	
+
 	<!-- Update application library -->
 	<target name="updateLib" depends="setupInit, setupWin, setupNonWin, setupALib, setupWLib, signOtherJars">
 		<!--	Create Client Zip		-->
 		<zip zipfile="${basedir}/lib/AdempiereClient.zip">
-			<zipfileset dir="." prefix="Adempiere" 
+			<zipfileset dir="." prefix="Adempiere"
 				includes="*.html" />
-			<zipfileset dir="." prefix="Adempiere" 
+			<zipfileset dir="." prefix="Adempiere"
 				includes="RUN_Adempiere.*" />
-			<zipfileset dir="utils" prefix="Adempiere" 
+			<zipfileset dir="utils" prefix="Adempiere"
 				includes="WinEnv.js" />
-			<zipfileset dir="lib" prefix="Adempiere/lib" 
+			<zipfileset dir="lib" prefix="Adempiere/lib"
 				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
 		</zip>
 	</target>
@@ -389,8 +389,8 @@
 			<!-- copy Base	-->
 			<zipfileset src="${basedir}/lib/adempiereRootBase.war" />
 			<!-- copy to adempiereHome	-->
-			<zipfileset dir="${basedir}/lib" 
-				includes="AdempiereClient.zip,Adempiere.jar,AdempiereCLib.jar,*.jnlp,*.0,*.html,CompiereJasperReqs.jar,CompiereJasper.jar" 
+			<zipfileset dir="${basedir}/lib"
+				includes="AdempiereClient.zip,Adempiere.jar,AdempiereCLib.jar,*.jnlp,*.0,*.html,CompiereJasperReqs.jar,CompiereJasper.jar"
 				prefix="adempiereHome" />
 		</zip>
 
@@ -403,59 +403,59 @@
 		<antcall target="jbossEAR" inheritall="true"/>
 		<antcall target="glassfishEAR" inheritall="true"/>
 	</target>
-	
+
 	<target name="jbossEAR" if="isAppsJBoss">
 		<!-- bundle everything in one ear file for simpler deployment -->
 		<ear destfile="${basedir}/lib/adempiere.ear" appxml="${basedir}/lib/adempiereAll.xml" >
-			<fileset dir="${basedir}/lib" 
+			<fileset dir="${basedir}/lib"
 				includes="Adempiere.jar,AdempiereSLib.jar,adempiereRoot.jar,adempiereApps.jar,adempiereApps.war,adempiereRoot.war,adempiereWebStore.war,adempiereWebCM.war,posterita.war,posterita.jar,webui.war" />
 		</ear>
 	</target>
 
 	<target name="glassfishEAR" if="isAppsGlassfish">
-		
+
 		<unzip src="${basedir}/lib/webui.war" dest="${basedir}/lib/webui"/>
 		<copy file="${basedir}/lib/webui/WEB-INF/web-2.5.xml" tofile="${basedir}/lib/webui/WEB-INF/web.xml" overwrite="true" />
 		<delete file="${basedir}/lib/webui.war"/>
 		<zip destfile="${basedir}/lib/webui.war" basedir="${basedir}/lib/webui" />
 		<delete dir="${basedir}/lib/webui"/>
-		
+
 		<!-- bundle everything in one ear file for simpler deployment -->
 		<ear destfile="${basedir}/lib/adempiere.ear" appxml="${basedir}/lib/adempiereAll.xml" >
-			<fileset dir="${basedir}/lib" 
+			<fileset dir="${basedir}/lib"
 				includes="adempiereRoot.jar,adempiereApps.jar,adempiereApps.war,adempiereRoot.war,adempiereWebStore.war,adempiereWebCM.war,posterita.war,posterita.jar,webui.war" />
 			<metainf dir="${basedir}/glassfish" includes="sun-application.xml"/>
 		</ear>
 	</target>
-	
+
 	<!-- ==================================================== -->
 	<!-- Setup EAR Libraries                                  -->
 	<!-- ==================================================== -->
-	<target name="setupEAR" depends="setupLib" 
+	<target name="setupEAR" depends="setupLib"
 		description="Setup Adempiere EAR Libraries">
 
 		<antcall target="createEAR" inheritall="true"/>
 	</target>
-	
+
 	<target name="updateEAR" depends="updateLib">
 		<antcall target="createEAR" inheritall="true"/>
 	</target>
 
 	<!-- Update JBoss Server -->
-	<target name="updateJBoss" depends="updateEAR" if="isAppsJBoss" 
+	<target name="updateJBoss" depends="updateEAR" if="isAppsJBoss"
 		description="Update JBoss Application Server">
-		
+
 		<!-- Copy			-->
 		<echo message="AppsDeployment= ${ADEMPIERE_APPS_DEPLOY}" />
 		<!-- Deploy in exploded format for faster startup time -->
 		<unjar dest="${ADEMPIERE_APPS_DEPLOY}/adempiere.ear" src="${basedir}/lib/adempiere.ear" overwrite="true">
 		</unjar>
 	</target>
-	
+
     <!-- ==================================================== -->
 	<!-- Setup Glassfish (Sun Application Server)             -->
 	<!-- ==================================================== -->
-	<target name="setupGlassfish" depends="setupLib, setupEAR" if="isAppsGlassfish" 
+	<target name="setupGlassfish" depends="setupLib, setupEAR" if="isAppsGlassfish"
 		description="Setup Glassfish Application Server">
 		<copy file="${basedir}/lib/adempiere.ear" tofile="${basedir}/glassfish/adempiere.ear"/>
 		<copy file="${basedir}/lib/Adempiere.jar" tofile="${basedir}/glassfish/Adempiere.jar"/>
@@ -465,7 +465,7 @@
 	<!-- ==================================================== -->
 	<!-- Setup JBoss Server                                   -->
 	<!-- ==================================================== -->
-	<target name="setupJBoss" depends="setupEAR" if="isAppsJBoss" 
+	<target name="setupJBoss" depends="setupEAR" if="isAppsJBoss"
 		description="Setup JBoss Application Server">
 
 		<!-- Filter JBoss Templates Conf	-->
@@ -492,15 +492,15 @@
 	<!-- ==================================================== -->
 	<!-- Update J2EE Server                                   -->
 	<!-- ==================================================== -->
-	<target name="updateDeploy" depends="updateJBoss" 
+	<target name="updateDeploy" depends="updateJBoss"
 		description="Update Adempiere Application Server">
 		<echo message="AppsDeployment= ${ADEMPIERE_APPS_DEPLOY}" />
 	</target>
-	
+
 	<!-- ==================================================== -->
 	<!-- Deploy J2EE Server                                   -->
 	<!-- ==================================================== -->
-	<target name="setupDeploy" depends="setupJBoss, setupGlassfish" 
+	<target name="setupDeploy" depends="setupJBoss, setupGlassfish"
 		description="Deploy Adempiere Application Server">
 		<echo message="AppsDeployment= ${ADEMPIERE_APPS_DEPLOY}" />
 	</target>
@@ -508,14 +508,14 @@
 	<!-- ==================================================== -->
 	<!-- Update (Main)                                         -->
 	<!-- ==================================================== -->
-	<target name="update" depends="updateDeploy" 
+	<target name="update" depends="updateDeploy"
 		description="Update Adempiere Deployment">
 	</target>
-	
+
 	<!-- ==================================================== -->
 	<!-- Setup (Main)                                         -->
 	<!-- ==================================================== -->
-	<target name="setup" depends="setupDeploy" 
+	<target name="setup" depends="setupDeploy"
 		description="Setup Adempiere">
 	</target>
 
@@ -529,7 +529,7 @@
 		<delete dir="lib" />
 		<delete dir="jboss" />
 		<delete dir="log" />
-		<unzip src="\\\\Dev1\\Adempiere\\Install\\Adempiere_253d.zip" 
+		<unzip src="\\\\Dev1\\Adempiere\\Install\\Adempiere_253d.zip"
 			overwrite="true" />
 	</target>
 
@@ -538,7 +538,7 @@
 	<!-- ==================================================== -->
 	<target name="testsystemImport" depends="setup"
 		description="Import Adempiere DB">
-		
+
 		<exec command="${basedir}/lib/RUN_AdempiereImport" />
 	</target>
 
@@ -547,7 +547,7 @@
 	<!-- ==================================================== -->
 	<target name="testsystemSetup" depends="testsystemCopy, testsystemImport"
 		description="Set up Test System">
-		
+
 	</target>
 
 	<!-- ==================================================== -->
@@ -578,12 +578,12 @@
 		<delete dir="${env.ADEMPIERE_HOME}\log" />
 
 		<echo message="=========== ftp to nas and download the current build==============="/>
-		<ftp action= "get" 
-			server="${server}" 
-			userid="guest" 
+		<ftp action= "get"
+			server="${server}"
+			userid="guest"
 			password="">
 			<fileset  dir="${env.ADEMPIERE_HOME}">
-				<include name="**/Adempiere_253d.zip"/>	
+				<include name="**/Adempiere_253d.zip"/>
 			</fileset>
 		</ftp>
 
@@ -591,10 +591,10 @@
 		<unzip src="${env.ADEMPIERE_HOME}/Disk 1/Adempiere_253a.zip" dest="${env.ADEMPIERE_HOME}\..\"  overwrite="yes" />
 		<delete dir="${env.ADEMPIERE_HOME}/Disk 1"/>
 
-		<echo message="======================Setup adempiere==============================" /> 
+		<echo message="======================Setup adempiere==============================" />
 		<ant inheritAll="false" dir="${env.ADEMPIERE_HOME}" target="setup"/>
- 
-		<!-- Importing the database --> 
+
+		<!-- Importing the database -->
 		<exec dir="${env.ADEMPIERE_HOME}\utils" executable="cmd" os="Windows XP, Windows 2000, Windows NT" >
 		  <arg line="/c  RUN_ImportAdempiere.bat"/>
 		</exec>
@@ -602,7 +602,7 @@
 		  <arg value="-c" />
 		  <arg value="RUN_ImportAdempiere.sh" />
 		</exec>
- 
+
 	</target>
 
 </project>
\ No newline at end of file