From e5d1116d94df8c3cc7266d7724c8ed35aae444d7 Mon Sep 17 00:00:00 2001
From: phib <devnull@localhost>
Date: Mon, 5 Oct 2009 04:56:48 +0000
Subject: [PATCH] 2872728 Move Adempiere  to Java 6
 https://sourceforge.net/tracker/?func=detail&atid=879335&aid=2872728&group_id=176962

Developers: please ensure your trunk build environments are updated to use jdk6.
---
 JasperReports/build.xml            | 2 +-
 JasperReportsWebApp/build.xml      | 2 +-
 base/build.xml                     | 2 +-
 client/build.xml                   | 2 +-
 extend/build.xml                   | 2 +-
 install/build.xml                  | 2 +-
 looks/build.xml                    | 2 +-
 posterita/posterita/build.xml      | 2 +-
 serverRoot/src/web/adempiere.html  | 4 ++--
 serverRoot/src/web/adempiere.jnlp  | 2 +-
 tools/build.xml                    | 8 +++++++-
 utils/adempiereDirectTemplate.jnlp | 2 +-
 zkwebui/build.xml                  | 2 +-
 13 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/JasperReports/build.xml b/JasperReports/build.xml
index 07a4b630a1..4b4891714f 100644
--- a/JasperReports/build.xml
+++ b/JasperReports/build.xml
@@ -55,7 +55,7 @@
 
   <target name="compile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac srcdir="${src}" destdir="${build.dir}" deprecation="on" source="1.5" target="1.5" debug="on">
+    <javac srcdir="${src}" destdir="${build.dir}" deprecation="on" source="1.6" target="1.6" debug="on">
       <classpath>
 	      <pathelement path="${classpath}"/>
 		  <pathelement path="../client/build"/>
diff --git a/JasperReportsWebApp/build.xml b/JasperReportsWebApp/build.xml
index 3f70251643..c3cd911600 100644
--- a/JasperReportsWebApp/build.xml
+++ b/JasperReportsWebApp/build.xml
@@ -27,7 +27,7 @@
   <target name="compile">
   	<echo>------ Compiling webApp</echo>
   	<mkdir dir="${build.dir}"/>
-    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
   </target>
diff --git a/base/build.xml b/base/build.xml
index 1aec966937..5112f12526 100644
--- a/base/build.xml
+++ b/base/build.xml
@@ -52,7 +52,7 @@
   
   <target name="compile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac target="1.5" fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
+    <javac target="1.6" fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
       <src path="${src}"/>
       <src path="${looksSrc}"/>
       <src path="../glassfishfacet/src"/>
diff --git a/client/build.xml b/client/build.xml
index d50ec51b7f..49eaad85c4 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -63,7 +63,7 @@
   <!-- =========================================== -->
   <target name="clientCompile" depends="clientMakedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
diff --git a/extend/build.xml b/extend/build.xml
index 5dbb8a95b5..de2530b5f1 100644
--- a/extend/build.xml
+++ b/extend/build.xml
@@ -47,7 +47,7 @@
   
   <target name="compile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
diff --git a/install/build.xml b/install/build.xml
index 5ce5f18e44..3c9ff1bd8e 100644
--- a/install/build.xml
+++ b/install/build.xml
@@ -61,7 +61,7 @@
   <!-- ======================================================= -->
   <target name="installCompile" depends="installInit">
 	<!-- compile the java code from ${src} into ${build.dir} -->
-	<javac target="1.5" srcdir="${src}" destdir="${compile.dir}" deprecation="on" debug="on">
+	<javac target="1.6" srcdir="${src}" destdir="${compile.dir}" deprecation="on" debug="on">
 	  <classpath refid="project.class.path"/>
 	</javac>
 	<!-- copy all image & sound files from src to the build directory -->
diff --git a/looks/build.xml b/looks/build.xml
index 1e468f3ecd..548b273ce9 100644
--- a/looks/build.xml
+++ b/looks/build.xml
@@ -46,7 +46,7 @@
 
   <target name="looksCompile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
diff --git a/posterita/posterita/build.xml b/posterita/posterita/build.xml
index 67e6c4fa29..b677994693 100644
--- a/posterita/posterita/build.xml
+++ b/posterita/posterita/build.xml
@@ -46,7 +46,7 @@
 	<!-- Creating new posterita.jar -->
 	<target name="compile" depends="init">
 		<!-- compile the java code from ${src} into ${build.dir} -->
-		<javac srcdir="${src.main.dir}" destdir="${src.web.dir}/WEB-INF/classes" deprecation="on" source="1.5" target="1.5" debug="on">
+		<javac srcdir="${src.main.dir}" destdir="${src.web.dir}/WEB-INF/classes" deprecation="on" source="1.6" target="1.6" debug="on">
 			<classpath>
 				<fileset dir="${src.web.dir}/WEB-INF/lib/">
 					<include name="*.jar" />
diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/src/web/adempiere.html
index 3619363a23..ba4bc3e226 100644
--- a/serverRoot/src/web/adempiere.html
+++ b/serverRoot/src/web/adempiere.html
@@ -134,7 +134,7 @@ End If
 insertLink ("adempiere.jnlp","Adempiere Web Start");
 // -->
             </script>
-Install &nbsp;<a href="http://java.sun.com/j2se/1.5.0/download.html" target="sun">Java 1.5.0 JRE (Runtime)</a>
+Install &nbsp;<a href="http://java.sun.com/javase/downloads/index.jsp" target="sun">Java 6 JRE (Runtime)</a>
 and press WebStart<br>
 
 Check also WebStart <a href="http://www.adempiere.org/support/install/webStart.html" target="c">Details</a>.<br>
@@ -153,7 +153,7 @@ If you have trouble starting, try <a href="/admin/adempiereHome/adempiereDirect.
             <h2><font color="#000000">Local Install </font></h2>
             </td>
 
-            <td bgcolor="#fbf8f1"><a href="/admin/adempiereHome/AdempiereClient.zip"><img src="zip.gif" alt="Adempiere Client Zip" align="right" border="0" height="32" width="32"></a>Install &nbsp;<a href="http://java.sun.com/j2se/1.5.0/download.html" target="sun">Java 1.5.0 JRE (Runtime)</a>; Download and extract the Adempiere Client <a href="/admin/adempiereHome/AdempiereClient.zip" title="Download Adempiere Client">zip</a> file on your Client;. <br>
+            <td bgcolor="#fbf8f1"><a href="/admin/adempiereHome/AdempiereClient.zip"><img src="zip.gif" alt="Adempiere Client Zip" align="right" border="0" height="32" width="32"></a>Install &nbsp;<a href="http://java.sun.com/javase/downloads/index.jsp" target="sun">Java 6 JRE (Runtime)</a>; Download and extract the Adempiere Client <a href="/admin/adempiereHome/AdempiereClient.zip" title="Download Adempiere Client">zip</a> file on your Client;. <br>
 
 Start Adempiere via RUN_Adempiere </td>
 
diff --git a/serverRoot/src/web/adempiere.jnlp b/serverRoot/src/web/adempiere.jnlp
index 03b2926299..6700c46970 100644
--- a/serverRoot/src/web/adempiere.jnlp
+++ b/serverRoot/src/web/adempiere.jnlp
@@ -21,7 +21,7 @@
 		<all-permissions/>  
 	</security>
 	<resources>
-		<j2se version = "1.5+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
+		<j2se version = "1.6+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
 		<jar href = "Adempiere.jar" main = "true" download = "eager"/>
 		<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
 		<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>
diff --git a/tools/build.xml b/tools/build.xml
index eb199dbab4..1d54e970dd 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -67,7 +67,7 @@
 	<!-- ============================================= -->
 	<target name="toolsCompile" depends="toolsInit" unless="jars.uptodate">
 		<!-- compile the java code from ${src} into ${build.dir}S -->
-		<javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+		<javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
 			<classpath refid="project.class.path" />
 		</javac>
 		<!-- copy all image & sound files from src to the build directory -->
@@ -229,6 +229,9 @@
 			<zipfileset src="lib/Verisign.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
+			<zipfileset src="lib/payflow.jar">
+							<patternset refid="manifest.exclude" />
+			</zipfileset>
 			<zipfileset src="lib/jpayment.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
@@ -371,6 +374,9 @@
 			<zipfileset src="lib/Verisign.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
+			<zipfileset src="lib/payflow.jar">
+				<patternset refid="manifest.exclude" />
+			</zipfileset>
 			<zipfileset src="lib/jpayment.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
diff --git a/utils/adempiereDirectTemplate.jnlp b/utils/adempiereDirectTemplate.jnlp
index 39bd4b22b9..8c5dcf9295 100644
--- a/utils/adempiereDirectTemplate.jnlp
+++ b/utils/adempiereDirectTemplate.jnlp
@@ -20,7 +20,7 @@
 		<all-permissions/>  
 	</security>
 	<resources>
-		<j2se version = "1.5+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
+		<j2se version = "1.6+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
 		<jar href = "Adempiere.jar" main = "true" download = "eager"/>
 		<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
 		<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>
diff --git a/zkwebui/build.xml b/zkwebui/build.xml
index fb5ed365d6..e5e4ceb508 100644
--- a/zkwebui/build.xml
+++ b/zkwebui/build.xml
@@ -45,7 +45,7 @@
 
 	<target name="compile" depends="clean" description="Compile Java sources">
 	    <mkdir dir="${classes.dir}"/>
-	    <javac target="1.5" 
+	    <javac target="1.6" 
 	    	   srcdir="WEB-INF/src"
 	           destdir="${classes.dir}"
 	           debug="${compile.debug}"