# HG changeset patch
# User Rafa Alonso <ral@openbravo.com>
# Date 1433882051 -7200
#      Tue Jun 09 22:34:11 2015 +0200
# Node ID 2e2b5275f8f935b4f058e97400bf497536ea9ae1
# Parent  ee157fef9c33de60041b07dca8c11dbe1bf2eb96
hack: JAVA_HOME is not required

diff -r ee157fef9c33 -r 2e2b5275f8f9 build.xml
--- a/build.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/build.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -353,7 +353,6 @@
   
   <target name="init" depends="code.rev">
     <fail if="root.user" message="Don't run ant tasks with the root user" />
-    <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." />
   </target>
 
   <target name="code.rev" depends="set.code.rev">
@@ -907,7 +906,7 @@
 	-->
   <target name="tomcat.reload" description="Reload the Openbravo context">
     <echo message="Reloading webapp..." />
-    <java classname="org.openbravo.service.system.ReloadContext" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}" spawn="true" fork="true">
+    <java classname="org.openbravo.service.system.ReloadContext" maxmemory="${build.maxmemory}" spawn="true" fork="true">
       <arg line="${base.src}" />
       <classpath refid="project.class.path" />
     </java>
@@ -1077,7 +1076,7 @@
   </target>
   
   <target name="UIrebuild" depends="core.lib">
-    <java classname="org.openbravo.base.BuildTask" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.base.BuildTask" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}/Openbravo.properties' ${logFileName}" />
       <classpath>
         <pathelement path="${build.core.lib}/openbravo-core.jar" />
diff -r ee157fef9c33 -r 2e2b5275f8f9 src-trl/build.xml
--- a/src-trl/build.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/src-trl/build.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -56,7 +56,7 @@
   </target>
 
   <target name="sqlc" depends="init">
-    <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ./src '${build.trl.sqlc}' null false"/>
       <classpath refid="trl.class.path"/>
       <syspropertyset>
diff -r ee157fef9c33 -r 2e2b5275f8f9 src-util/buildvalidation/build.xml
--- a/src-util/buildvalidation/build.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/src-util/buildvalidation/build.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -59,7 +59,7 @@
   </target>
 
   <target name="sqlcCore" depends="init" if="checkCore">
-    <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org '${build.validation.sqlc}' null false" />
       <classpath refid="buildvalidation.class.path" />
       <syspropertyset>
@@ -72,7 +72,7 @@
   </target>
 
   <target name="sqlcModules" depends="init" unless="checkCore">
-    <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/buildvalidation/src '${module}'/src-util/buildvalidation false" />
       <classpath refid="buildvalidation.class.path" />
       <syspropertyset>
@@ -100,7 +100,7 @@
   </target>
 
   <target name="buildvalidation" if="buildValidation.var">
-    <java classname="org.openbravo.buildvalidation.BuildValidationHandler" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}" failonerror="yes">
+    <java classname="org.openbravo.buildvalidation.BuildValidationHandler" fork="yes" maxmemory="${build.maxmemory}" failonerror="yes">
       <arg value="${base.src}/../"/>
       <arg value="${module}"/>
       <classpath refid="buildvalidation.class.path" />
diff -r ee157fef9c33 -r 2e2b5275f8f9 src-util/modulescript/build.xml
--- a/src-util/modulescript/build.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/src-util/modulescript/build.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -59,7 +59,7 @@
   </target>
 
   <target name="sqlcCore" depends="init" if="checkCore">
-    <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org '${build.module.sqlc}' null false" />
       <classpath refid="modulescript.class.path" />
       <syspropertyset>
@@ -72,7 +72,7 @@
   </target>
 
   <target name="sqlcModules" depends="init" unless="checkCore">
-    <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/modulescript/src '${module}'/src-util/modulescript false" />
       <classpath refid="modulescript.class.path" />
       <syspropertyset>
diff -r ee157fef9c33 -r 2e2b5275f8f9 src-wad/build.xml
--- a/src-wad/build.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/src-wad/build.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -58,7 +58,7 @@
   </target>
 
   <target name="sqlc" depends="init">
-    <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org '${build.wad.sqlc}' null false" />
       <classpath refid="wad.class.path" />
       <syspropertyset>
@@ -66,7 +66,7 @@
       </syspropertyset>
     </java>
   	
-  	<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+  	<java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${build.wad.sqlc}'/src */src-wad false" />
   	  <classpath refid="wad.class.path" />
       <syspropertyset>
diff -r ee157fef9c33 -r 2e2b5275f8f9 src/build.xml
--- a/src/build.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/src/build.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -118,7 +118,7 @@
   </target>
 
   <target name="trl.clean" if="translation">
-    <java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.translate.Translate" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="clean '${base.config}/Openbravo.properties'" />
       <classpath refid="project.class.path" />
       <syspropertyset>
@@ -128,7 +128,7 @@
   </target>
   
   <target name="trl.remove.unused" if="translation">
-    <java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.translate.Translate" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="remove '${base.config}/Openbravo.properties'" />
       <classpath refid="project.class.path" />
       <syspropertyset>
@@ -155,7 +155,7 @@
 
   <target name="compile.apply.module" depends="init">
     <mkdir dir="${build.apply.module}" />
-    <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}" failonerror="true">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.config}'/Openbravo.properties .xsql . '${build.sqlc}'/src" />
       <jvmarg value="-Dsqlc.listOfFiles=ApplyModule_data.xsql,PInstanceProcess_data.xsql,Translation_data.xsql,MessageBD_data.xsql"/>
       <classpath refid="project.class.path" />
@@ -172,14 +172,14 @@
   </target>
   
   <target name="sqlc">
-    <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}" failonerror="true">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.config}'/Openbravo.properties .xsql . '${build.sqlc}'/src" />
       <classpath refid="project.class.path" />
       <syspropertyset>
          <propertyref name="java.security.egd" />
       </syspropertyset>
     </java>
-    <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}" failonerror="true">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${build.sqlc}'/src */src" />
       <jvmarg value="-Dsqlc.queryExecutionStrategy=traditional"/>
       <classpath refid="project.class.path" />
@@ -229,7 +229,7 @@
 		is a source older than the last updated time of the Application Dictionary then the sources need to be regenerated.		
 	-->
   <target name="generate.entities.quick" depends="compile.src.gen">
-    <java classname="org.openbravo.base.gen.GenerateEntitiesTask" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}" failonerror="true">
+    <java classname="org.openbravo.base.gen.GenerateEntitiesTask" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.src}' '${friendlyWarnings}'" />
       <classpath refid="project.class.path" />
       <syspropertyset>
@@ -368,7 +368,7 @@
   </target>
   
   <target name="wad" depends="init, wadvalidation">
-    <java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
+    <java classname="org.openbravo.wad.Wad" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' 'dummyValueUnused' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}' '${module}' 'noquick' '${wad.generateAllClassic250Windows}'" />
       <classpath refid="wad.class.path" />
       <syspropertyset>
@@ -379,7 +379,7 @@
   </target>
 
   <target name="wad.quick" depends="init, wadvalidation">
-    <java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.wad.Wad" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' 'dummyValueUnused' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}' '${module}' 'quick' '${wad.generateAllClassic250Windows}'" />
       <classpath refid="wad.class.path" />
       <syspropertyset>
@@ -451,7 +451,7 @@
 
   <!-- FIXME: These tasks is only for development and testing purposes, remove it afterwards-->
   <target name="sqlcmod">
-    <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}" failonerror="true">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${build.sqlc}'/src */src" />
       <classpath refid="project.class.path" />
       <syspropertyset>
@@ -594,7 +594,7 @@
       <mapper type="regexp" from="(.*)(\${file.separator}web)(.*\${file.separator})(skins\${file.separator})(.*)" to="\3\5" />
     </copy>
 
-    <java classname="org.openbravo.translate.RTLSkin" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.translate.RTLSkin" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="${base.context}/web/skins/rtl ${base.context}/web/skins/ltr" />
       <classpath refid="project.class.path" />
     </java>
@@ -715,7 +715,7 @@
   </target>
 
   <target name="compile.translate.modules">
-    <java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.translate.Translate" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}/Openbravo.properties' ${extension} '${base.modules}' '*/src'" />
       <classpath refid="project.class.path" />
       <syspropertyset>
@@ -743,7 +743,7 @@
   </target>
 
   <target name="compile.translate">
-    <java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.translate.Translate" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}/Openbravo.properties' ${extension} '${basedir}'" />
       <classpath refid="project.class.path" />
       <syspropertyset>
diff -r ee157fef9c33 -r 2e2b5275f8f9 src/buildAD.xml
--- a/src/buildAD.xml	Tue Jun 09 18:14:54 2015 +0200
+++ b/src/buildAD.xml	Tue Jun 09 22:34:11 2015 +0200
@@ -23,7 +23,7 @@
   <property name="separator" value="/" />
 
   <target name="buildAD">
-    <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.data.Sqlc" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ../srcAD '${build.sqlc}'/src" />
       <jvmarg value="-Dsqlc.queryExecutionStrategy=traditional"/>
       <classpath refid="project.class.path" />