midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
phib 2009-10-05 04:56:48 +00:00
parent d6a8042f08
commit e5d1116d94
13 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JasperReports/build.xml
View File

@ -55,7 +55,7 @@
<target name="compile" depends="makedir"> <target name="compile" depends="makedir">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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> <classpath>
<pathelement path="${classpath}"/> <pathelement path="${classpath}"/>
<pathelement path="../client/build"/> <pathelement path="../client/build"/>

2
JasperReportsWebApp/build.xml
View File

@ -27,7 +27,7 @@
<target name="compile"> <target name="compile">
<echo>------ Compiling webApp</echo> <echo>------ Compiling webApp</echo>
<mkdir dir="${build.dir}"/> <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"/> <classpath refid="project.class.path"/>
</javac> </javac>
</target> </target>

2
base/build.xml
View File

@ -52,7 +52,7 @@
<target name="compile" depends="makedir"> <target name="compile" depends="makedir">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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="${src}"/>
<src path="${looksSrc}"/> <src path="${looksSrc}"/>
<src path="../glassfishfacet/src"/> <src path="../glassfishfacet/src"/>

2
client/build.xml
View File

@ -63,7 +63,7 @@
<!-- =========================================== --> <!-- =========================================== -->
<target name="clientCompile" depends="clientMakedir"> <target name="clientCompile" depends="clientMakedir">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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"/> <classpath refid="project.class.path"/>
</javac> </javac>
<!-- copy all image & sound files from src to the build directory --> <!-- copy all image & sound files from src to the build directory -->

2
extend/build.xml
View File

@ -47,7 +47,7 @@
<target name="compile" depends="makedir"> <target name="compile" depends="makedir">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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"/> <classpath refid="project.class.path"/>
</javac> </javac>
<!-- copy all image & sound files from src to the build directory --> <!-- copy all image & sound files from src to the build directory -->

2
install/build.xml
View File

@ -61,7 +61,7 @@
<!-- ======================================================= --> <!-- ======================================================= -->
<target name="installCompile" depends="installInit"> <target name="installCompile" depends="installInit">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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"/> <classpath refid="project.class.path"/>
</javac> </javac>
<!-- copy all image & sound files from src to the build directory --> <!-- copy all image & sound files from src to the build directory -->

2
looks/build.xml
View File

@ -46,7 +46,7 @@
<target name="looksCompile" depends="makedir"> <target name="looksCompile" depends="makedir">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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"/> <classpath refid="project.class.path"/>
</javac> </javac>
<!-- copy all image & sound files from src to the build directory --> <!-- copy all image & sound files from src to the build directory -->

2
posterita/posterita/build.xml
View File

@ -46,7 +46,7 @@
<!-- Creating new posterita.jar --> <!-- Creating new posterita.jar -->
<target name="compile" depends="init"> <target name="compile" depends="init">
<!-- compile the java code from ${src} into ${build.dir} --> <!-- 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> <classpath>
<fileset dir="${src.web.dir}/WEB-INF/lib/"> <fileset dir="${src.web.dir}/WEB-INF/lib/">
<include name="*.jar" /> <include name="*.jar" />

4
serverRoot/src/web/adempiere.html
View File

@ -134,7 +134,7 @@ End If
insertLink ("adempiere.jnlp","Adempiere Web Start"); insertLink ("adempiere.jnlp","Adempiere Web Start");
// --> // -->
</script> </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> and press WebStart<br>
Check also WebStart <a href="http://www.adempiere.org/support/install/webStart.html" target="c">Details</a>.<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> <h2><font color="#000000">Local Install </font></h2>
</td> </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> Start Adempiere via RUN_Adempiere </td>

2
serverRoot/src/web/adempiere.jnlp
View File

@ -21,7 +21,7 @@
<all-permissions/> <all-permissions/>
</security> </security>
<resources> <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 = "Adempiere.jar" main = "true" download = "eager"/>
<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/> <jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/> <jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>

8
tools/build.xml
View File

@ -67,7 +67,7 @@
<!-- ============================================= --> <!-- ============================================= -->
<target name="toolsCompile" depends="toolsInit" unless="jars.uptodate"> <target name="toolsCompile" depends="toolsInit" unless="jars.uptodate">
<!-- compile the java code from ${src} into ${build.dir}S --> <!-- 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" /> <classpath refid="project.class.path" />
</javac> </javac>
<!-- copy all image & sound files from src to the build directory --> <!-- copy all image & sound files from src to the build directory -->
@ -229,6 +229,9 @@
<zipfileset src="lib/Verisign.jar"> <zipfileset src="lib/Verisign.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/payflow.jar">
<patternset refid="manifest.exclude" />
</zipfileset>
<zipfileset src="lib/jpayment.jar"> <zipfileset src="lib/jpayment.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
@ -371,6 +374,9 @@
<zipfileset src="lib/Verisign.jar"> <zipfileset src="lib/Verisign.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/payflow.jar">
<patternset refid="manifest.exclude" />
</zipfileset>
<zipfileset src="lib/jpayment.jar"> <zipfileset src="lib/jpayment.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>

2
utils/adempiereDirectTemplate.jnlp
View File

@ -20,7 +20,7 @@
<all-permissions/> <all-permissions/>
</security> </security>
<resources> <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 = "Adempiere.jar" main = "true" download = "eager"/>
<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/> <jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/> <jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>

2
zkwebui/build.xml
View File

@ -45,7 +45,7 @@
<target name="compile" depends="clean" description="Compile Java sources"> <target name="compile" depends="clean" description="Compile Java sources">
<mkdir dir="${classes.dir}"/> <mkdir dir="${classes.dir}"/>
<javac target="1.5" <javac target="1.6"
srcdir="WEB-INF/src" srcdir="WEB-INF/src"
destdir="${classes.dir}" destdir="${classes.dir}"
debug="${compile.debug}" debug="${compile.debug}"