--- config_office/configure.in.orig	Mon Dec 11 23:32:38 2006
+++ config_office/configure.in	Mon Dec 11 23:35:24 2006
@@ -409,6 +409,17 @@
                           or XML filters. Use --with-java=gij to enable gij/gcj
                           as java/javac replacements
 ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
+AC_ARG_WITH(java_target_version,
+[  --with-java-target-version   Generate class files that will work on JVMs with
+			  the specified version. For example, use
+			  --with-java-target-version=1.4 to make sure that the
+			  application will work with JVM 1.4 even when compiled
+			  with JDK 1.5.
+			  
+			  This option is ignored when you compile with gcj/gij.
+ 
+                          Usage: --with-java-target-version=<jvm version>
+],,)
 AC_ARG_ENABLE(gcjaot,
 [  --enable-gcjaot        Build with[[out]] using Ahead of Time java compilation support. 
                           If you have gcj installed then --enable-gcjaot will enable gcj ahead of time
@@ -2186,7 +2197,44 @@
    JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
 fi
 
+_java_target_ver=""
 dnl ===================================================================
+dnl Check for target java bytecode version
+dnl ===================================================================
+if test "$SOLAR_JAVA" != ""; then
+    AC_MSG_CHECKING([for target java bytecode version])
+    if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
+	AC_MSG_RESULT([default by $JDK])
+	if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
+	    AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
+	fi
+    else
+	if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
+	    _java_target_ver="$with_java_target_version"
+	    AC_MSG_RESULT([$_java_target_ver])
+	elif test $_jdk_ver -gt 10000 ; then
+	    _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
+	    AC_MSG_RESULT([$_java_target_ver])
+	else
+    	    AC_MSG_ERROR([Unable to guess java bytecode version from java version!])
+	fi
+    fi
+
+    if ! test -z "$_java_target_ver" -o \
+	    "$_java_target_ver" = "1.1" -o \
+            "$_java_target_ver" = "1.2" -o \
+	    "$_java_target_ver" = "1.3" -o \
+	    "$_java_target_ver" = "1.4" -o \
+	    "$_java_target_ver" = "1.5" -o \
+	    "$_java_target_ver" = "5" ; then
+    	AC_MSG_ERROR([$_java_target_ver is not supported java bytecode version!])
+    fi
+
+    JAVA_SOURCE_VER="$_java_target_ver"
+    JAVA_TARGET_VER="$_java_target_ver"
+fi
+
+dnl ===================================================================
 dnl Checks for javac
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
@@ -2227,7 +2275,18 @@
 fi
 AC_SUBST(JAVACISGCJ)
 
+JAVACISKAFFE=""
 dnl ===================================================================
+dnl Checks that javac is kaffe
+dnl ===================================================================
+if test "$SOLAR_JAVA" != ""; then
+    if test `$JAVACOMPILER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
+        JAVACISKAFFE="yes"
+    fi
+fi
+AC_SUBST(JAVACISKAFFE)
+
+dnl ===================================================================
 dnl Checks for javadoc
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
@@ -2343,6 +2402,8 @@
 
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JDK)
+AC_SUBST(JAVA_SOURCE_VER)
+AC_SUBST(JAVA_TARGET_VER)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVAAOTCOMPILER)
--- config_office/set_soenv.in.orig	Mon Dec 11 23:32:38 2006
+++ config_office/set_soenv.in	Mon Dec 11 23:35:24 2006
@@ -1761,6 +1761,7 @@
 if ( $JDK ne "gcj" ) {
    ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
    ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
+   ToFile( "JAVACISKAFFE",     '@JAVACISKAFFE@',    "e" );
 }
 else {
    ToFile( "JAVACISGCJ",       '@JAVACISGCJ@',      "e" );
@@ -1769,6 +1770,8 @@
 if ( '@JDK@' ne '' )
 { 
    ToFile( "JDK",             "@JDK@",           "e" );
+   ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
+   ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
    ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
    ToFile( "JAVAAOTCOMPILER", "@JAVAAOTCOMPILER@","e" );
--- solenv/inc/antsettings.mk.orig	Fri Dec  1 18:57:06 2006
+++ solenv/inc/antsettings.mk	Mon Dec 11 23:35:24 2006
@@ -48,6 +48,18 @@
 ANT*:=$(ANT_HOME)$/bin$/ant
 ANT_BUILDFILE*=build.xml
 
+.IF "$(ANT_COMPILER_FLAGS)"==""
+.IF "$(JAVACISGCJ)" == "yes"
+ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
+.ENDIF
+.ENDIF
+
+.IF "$(ANT_JAVA_VER_FLAGS)"==""
+.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
+ANT_JAVA_VER_FLAGS=-Djava.source.ver=$(JAVA_SOURCE_VER) -Djava.target.ver=$(JAVA_TARGET_VER)
+.ENDIF
+.ENDIF
+
 .IF "$(ANT_DEBUG)"==""
 .IF "$(debug)"==""
 ANT_DEBUG=off
@@ -69,22 +81,13 @@
 .EXPORT : JAVA_HOME
 .ENDIF
 
-.IF "$(JAVACISGCJ)" == "yes"
-ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
+ -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
+ -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
+ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
-.ELSE
-ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
- -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
- -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
- -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
- -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
-.ENDIF
+
 .ELSE # No java
 ANT=
 ANT_FLAGS=
 .ENDIF
- 
- 
--- solenv/inc/settings.mk.orig	Mon Dec 11 23:32:45 2006
+++ solenv/inc/settings.mk	Mon Dec 11 23:35:24 2006
@@ -169,6 +169,9 @@
 .IF "$(JAVACISGCJ)" == "yes"
 JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
 .ENDIF
+.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
+JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
+.ENDIF
 
 #classpath and response
 .IF "$(JDK)" == "J++"
--- beanshell/bsh-2.0b1-src.patch.orig	Fri Dec  1 18:51:42 2006
+++ beanshell/bsh-2.0b1-src.patch	Mon Dec 11 23:35:24 2006
@@ -1,5 +1,5 @@
-*** misc/BeanShell/build.xml	Fri Dec 19 17:14:27 2003
---- misc/build/BeanShell/build.xml	Mon May 30 15:47:00 2005
+*** misc/BeanShell/build.xml	2003-12-19 17:14:27.000000000 +0100
+--- misc/build/BeanShell/build.xml	2006-10-11 15:46:05.000000000 +0200
 ***************
 *** 17,23 ****
   		up the build dir!  It has to be done manually the first time (or put
@@ -41,6 +41,17 @@
   	<!-- Legacy excludes.  Comment this *out* to build these legacy items -->
   	<property name="legacy-excludes" 
   		value="bsh/JThis.java"/>
+***************
+*** 165,170 ****
+--- 171,178 ----
+  			deprecation="${deprecation}"
+  			optimize="on"
+  			debug="off"
++ 			source="${java.source.ver}"
++ 			target="${java.target.ver}"
+  			includes="**/*.java"
+  			excludes="${excludes},**/bak/**"
+  		>
 *** misc/BeanShell/makefile.mk	Mon May 30 15:55:35 2005
 --- misc/build/BeanShell/makefile.mk	Mon May 30 15:47:00 2005
 ***************
--- hsqldb/makefile.mk.orig	Fri Dec  1 18:55:03 2006
+++ hsqldb/makefile.mk	Mon Dec 11 23:40:45 2006
@@ -38,18 +38,16 @@
 PRJNAME=so_hsqldb
 TARGET=so_hsqldb
 
+.IF "$(SOLAR_JAVA)" != ""
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
 
 # override buildfile
-ANT_BUILDFILE=build$/build.xml
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
-.INCLUDE : antsettings.mk
-
 .INCLUDE :  version.mk
 
-.IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
@@ -61,28 +59,22 @@
 		src/org/hsqldb/resources/sql-error-messages.properties
 PATCH_FILE_NAME=hsqldb_1_8_0
 
+ADDITIONAL_FILES=makefile.mk
+
 # ADDITIONAL_FILES=   src$/org$/hsqldb$/Collation.java \
 #                     src$/org$/hsqldb$/TxManager.java \
 #                     src$/org$/hsqldb$/lib$/LongKeyIntValueHashMap.java \
 #                     src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \
 #                     src$/org$/hsqldb$/test$/TestCollation.java
 
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
+.INCLUDE : tg_ext.mk	
 
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
+.ELSE
+all:
+	@echo java disabled
 
+.ENDIF
--- hsqldb/hsqldb_1_8_0.orig	Fri Dec  1 18:55:03 2006
+++ hsqldb/hsqldb_1_8_0	Mon Dec 11 23:35:24 2006
@@ -1,3 +1,56 @@
+*** misc/hsqldb/makefile.mk	2006-10-11 20:13:37.000000000 +0200
+--- misc/build/hsqldb/makefile.mk	2006-10-11 20:25:37.000000000 +0200
+***************
+*** 1 ****
+! dummy
+--- 1,47 ----
+! #*************************************************************************
+! #
+! #   OpenOffice.org - a multi-platform office productivity suite
+! #
+! #   $RCSfile: build-java-target.diff,v $
+! #
+! #   $Revision: 1.3 $
+! #
+! #   last change: $Author: brosenk $ $Date: 2006/11/02 11:20:57 $
+! #
+! #   The Contents of this file are made available subject to
+! #   the terms of GNU Lesser General Public License Version 2.1.
+! #
+! #
+! #     GNU Lesser General Public License Version 2.1
+! #     =============================================
+! #     Copyright 2005 by Sun Microsystems, Inc.
+! #     901 San Antonio Road, Palo Alto, CA 94303, USA
+! #
+! #     This library is free software; you can redistribute it and/or
+! #     modify it under the terms of the GNU Lesser General Public
+! #     License version 2.1, as published by the Free Software Foundation.
+! #
+! #     This library is distributed in the hope that it will be useful,
+! #     but WITHOUT ANY WARRANTY; without even the implied warranty of
+! #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+! #     Lesser General Public License for more details.
+! #
+! #     You should have received a copy of the GNU Lesser General Public
+! #     License along with this library; if not, write to the Free Software
+! #     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+! #     MA  02111-1307  USA
+! #
+! #*************************************************************************
+! 
+! PRJ=..$/..$/..$/..
+! PRJNAME=so_hsqldb
+! TARGET=so_hsqldb
+! 
+! # buildfile is in a subdirectory
+! ANT_BUILDFILE=build$/build.xml
+! 
+! .INCLUDE : ant.mk
+! 
+! ANT_FLAGS+=-Dbuild.label="build-$(RSCREVISION)" jar
+! 
+! ALLTAR : ANTBUILD
 Files misc/hsqldb/lib/hsqldb.jar and misc/build/hsqldb/lib/hsqldb.jar differ
 *** misc/hsqldb/src/org/hsqldb/Constraint.java	Tue Apr 11 16:40:53 2006
 --- misc/build/hsqldb/src/org/hsqldb/Constraint.java	Mon Aug  7 10:48:26 2006
--- qadevOOo/build.xml.orig	Fri Dec  1 18:55:42 2006
+++ qadevOOo/build.xml	Mon Dec 11 23:35:24 2006
@@ -19,7 +19,8 @@
 
   <!-- target for building the runner -->
   <target name="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}">
+    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}"
+		source="${java.source.ver}" target="${java.target.ver}">
 		<classpath>
 		    <pathelement location="${qadevOOo.class}"/>
 			<fileset dir="${qadevOOo.office_jars}">
@@ -31,7 +32,9 @@
   
   <!-- target for building the tests -->
   <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}">
+    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}"
+		includes="**/*.java" debug="${debug}"
+		source="${java.source.ver}" target="${java.target.ver}">
 		<classpath>
 		    <pathelement location="${qadevOOo.class}"/>
 			<fileset dir="${qadevOOo.office_jars}">
--- rhino/rhino1_5R4.patch.orig	Fri Dec  1 18:56:13 2006
+++ rhino/rhino1_5R4.patch	Mon Dec 11 23:35:24 2006
@@ -2731,3 +2731,45 @@
           PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
           return new ProtectionDomain(cs, pc);
       }
+*** misc/rhino1_5R4/src/build.xml	2005-03-22 13:23:46.000000000 +0100
+--- misc/build/rhino1_5R4/src/build.xml	2006-10-11 18:45:53.000000000 +0200
+***************
+*** 15,21 ****
+             destdir="${nest}/${build.dest}"
+             includes="org/**/*.java"
+             deprecation="on"
+!            debug="${debug}">
+      </javac>
+    </target>
+  
+--- 15,23 ----
+             destdir="${nest}/${build.dest}"
+             includes="org/**/*.java"
+             deprecation="on"
+!            debug="${debug}"
+!            source="${java.source.ver}"
+!            target="${java.target.ver}">
+      </javac>
+    </target>
+  
+*** misc/rhino1_5R4/toolsrc/build.xml	2005-03-22 13:23:46.000000000 +0100
+--- misc/build/rhino1_5R4/toolsrc/build.xml	2006-10-11 18:44:33.000000000 +0200
+***************
+*** 65,71 ****
+             destdir="${nest}/${build.dest}"
+             includes="org/**/*.java"
+             deprecation="on"
+!            debug="${debug}">
+      </javac>
+    </target>
+  
+--- 65,73 ----
+             destdir="${nest}/${build.dest}"
+             includes="org/**/*.java"
+             deprecation="on"
+!            debug="${debug}"
+!            source="${java.source.ver}"
+!            target="${java.target.ver}">
+      </javac>
+    </target>
+  
--- scripting/examples/java/build.xml.orig	Fri Dec  1 18:56:42 2006
+++ scripting/examples/java/build.xml	Mon Dec 11 23:35:24 2006
@@ -55,7 +55,8 @@
 
     <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
            includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on"/>
+           debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
 
     <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
     <copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/>
@@ -77,7 +78,8 @@
 
     <javac srcdir="Highlight" destdir="${outdir}/Highlight"
            includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on"/>
+           debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
 
     <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
     <copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/>
@@ -99,7 +101,8 @@
 
     <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
            includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on"/>
+           debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
 
     <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>
     <copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/>
@@ -121,7 +124,8 @@
 
     <javac srcdir="selector" destdir="${outdir}/selector"
        	   includes="**/*.java" classpathref="idlclasspath"
-	       debug="${debug}" optimize="${optimize}" deprecation="on"/>
+       	   debug="${debug}" optimize="${optimize}" deprecation="on"
+       	   source="${java.source.ver}" target="${java.target.ver}"/>
 
     <copy todir="${outdir}/selector">
         <fileset dir="selector">
--- scripting/java/build.xml.orig	Fri Dec  1 18:56:42 2006
+++ scripting/java/build.xml	Mon Dec 11 23:35:24 2006
@@ -89,16 +89,19 @@
   <target name="compile" depends="prepare">
     <javac srcdir="com" destdir="${jardir}"
          includes="**/*.java" classpathref="idlclasspath"
-         debug="${debug}" optimize="${optimize}" deprecation="off"/>
+         debug="${debug}" optimize="${optimize}" deprecation="off"
+	 source="${java.source.ver}" target="${java.target.ver}"/>
     <javac srcdir="Framework/" destdir="${jardir}"
          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
-         optimize="${optimize}" deprecation="off">
+         optimize="${optimize}" deprecation="off"
+	 source="${java.source.ver}" target="${java.target.ver}">
     </javac>
   </target>
 
   <target name="idesupport.compile" depends="compile, prepare">
     <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
+           debug="${debug}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}">
       <classpath refid="idesupport.class.path"/>
       <exclude name="${idesupport.dir}/**/.*/*"/>
       <exclude name="${idesupport.dir}/localoffice/**/*"/>
@@ -110,7 +113,8 @@
 
   <target name="localoffice.compile" depends="prepare">
     <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
+           debug="${debug}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}">
       <classpath refid="idlclasspath"/>
       <exclude name="${idesupport.dir}/localoffice/.*/*"/>
       <include name="${idesupport.dir}/localoffice/*.java"/>
@@ -119,7 +123,8 @@
 
   <target name="netbeans.compile" depends="idesupport.compile, prepare">
     <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
+           debug="${debug}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}">
       <classpath refid="openide.class.path"/>
       <exclude name="${netbeans.dir}/**/.*/*"/>
       <include name="${netbeans.dir}/**/*.java"/>
@@ -128,7 +133,8 @@
 
   <target name="netbeans.editor.support" depends="prepare">
     <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
+           debug="${debug}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}">
       <classpath refid="netbeans.editor.support.classpath"/>
       <include name="org/openoffice/netbeans/editor/*.java"/>
     </javac>
--- scripting/workben/build.xml.orig	Fri Dec  1 18:56:44 2006
+++ scripting/workben/build.xml	Mon Dec 11 23:35:24 2006
@@ -117,7 +117,8 @@
            destdir="${out}/class/examples/java/debugger"
        	   includes="*.java"
            classpathref="debuggerclasspath"
-	   debug="${debug}" optimize="${optimize}" deprecation="on"/>
+	   debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
 
     <copy todir="${out}/class/examples/java/debugger">
         <fileset dir="${prj}/examples/java/debugger">
@@ -141,7 +142,8 @@
     <mkdir dir="${out}/class/examples/java/Highlight"/>
     <javac srcdir="${prj}/examples/java/" destdir="${out}/class/examples/java/Highlight/"
        	   includes="**/Highlight*.java" classpathref="idlclasspath"
-	   debug="${debug}" optimize="${optimize}" deprecation="on"/>
+	   debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
     <copy todir="${out}/class/examples/java/Highlight/">
         <fileset dir="${prj}/examples/java/">
             <include name="**/Highlight*.java"/>
@@ -160,7 +162,8 @@
     <mkdir dir="${out}/class/examples/java/MemoryUsage"/>
     <javac srcdir="${prj}/examples/java/" destdir="${out}/class/examples/java/MemoryUsage/"
        	   includes="**/MemoryUsage.java" classpathref="idlclasspath"
-	   debug="${debug}" optimize="${optimize}" deprecation="on"/>
+	   debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
     <copy file="${prj}/examples/java/MemoryUsage.java" todir="${out}/class/examples/java/MemoryUsage/"/>
     <copy file="${prj}/examples/java/MemoryUsageParcel.xml" tofile="${out}/class/examples/java/MemoryUsage/parcel-descriptor.xml"/>
     <copy file="${prj}/examples/java/MemoryUsage.java" todir="${out}/class/examples/java/MemoryUsage/"/>
@@ -169,7 +172,8 @@
     <mkdir dir="${out}/class/examples/java/ScriptFrmwrkHelper"/>
     <javac srcdir="${prj}/examples/java/" destdir="${out}/class/examples/java/ScriptFrmwrkHelper/"
        	   includes="**/ScriptFrmwrkHelper.java" classpathref="scriptexampleclasspath"
-	   debug="${debug}" optimize="${optimize}" deprecation="on"/>
+	   debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
     <copy todir="${out}/class/examples/java/ScriptFrmwrkHelper/">
         <fileset dir="${prj}/examples/java/">
             <include name="**/ScriptFrmwrkHelper.java"/>
@@ -319,7 +323,8 @@
     <javac srcdir="${prj}/examples/java/debugger"
            destdir="${out}/class/jsruntimetmp"
        	   includes="rhino/Main.java" classpathref="debuggerclasspath"
-	   debug="${debug}" optimize="${optimize}" deprecation="on"/>
+	   debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
 
     <zip destfile="${out}/class/jsruntime/skip_registration/js.jar"
         basedir="${out}/class/jsruntimetmp" includes="**"/>
@@ -377,7 +382,8 @@
     <mkdir dir="${installerclasses}"/>
     <javac srcdir="installer/" destdir="${installerclasses}"
        	   includes="**/*.java" classpathref="idlclasspath"
-	   debug="${debug}" optimize="${optimize}" deprecation="on"/>
+	   debug="${debug}" optimize="${optimize}" deprecation="on"
+	   source="${java.source.ver}" target="${java.target.ver}"/>
     <copy file="installer/sidebar.jpg" todir="${out}/class/sframeworkinstall/installer"/>
   </target>
 
--- xmerge/java/org/openoffice/xmerge/build.xml.orig	Fri Dec  1 18:58:09 2006
+++ xmerge/java/org/openoffice/xmerge/build.xml	Mon Dec 11 23:35:24 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/Convert.java"/>
             <include name="${package}/ConverterCapabilities.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/dom/build.xml.orig	Fri Dec  1 18:58:09 2006
+++ xmerge/java/org/openoffice/xmerge/converter/dom/build.xml	Mon Dec 11 23:35:24 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/DOMDocument.java"/>
         </javac>
--- xmerge/java/org/openoffice/xmerge/converter/palm/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/palm/build.xml	Mon Dec 11 23:35:25 2006
@@ -111,7 +111,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/PalmDB.java"/>
             <include name="${package}/PdbDecoder.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
                         <include name="${package}/EmbeddedObject.java"/>
                         <include name="${package}/EmbeddedBinaryObject.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/CellStyle.java"/>
             <include name="${package}/ColumnStyle.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml	Mon Dec 11 23:35:25 2006
@@ -115,7 +115,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/MinicalcConstants.java"/>
             <include name="${package}/MinicalcDecoder.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/PocketExcelConstants.java"/>
             <include name="${package}/PocketExcelDecoder.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
 			<include name="${package}/BIFFRecord.java"/>
 			<include name="${package}/CellValue.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
 			<include name="${package}/FormulaCompiler.java"/>
 			<include name="${package}/FormulaHelper.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/DocConstants.java"/>
             <include name="${package}/DocDecoder.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
 			<include name="${package}/SxwDocument.java"/>
 			<include name="${package}/SxwPluginFactory.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
 			<include name="${package}/DocumentDescriptor.java"/>
                         <include name="${package}/DocumentDeserializerImpl.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/DOCConstants.java"/>
             <include name="${package}/textRecord.java"/>
--- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml	Mon Dec 11 23:35:25 2006
@@ -115,7 +115,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/DocumentDeserializerImpl.java"/>
             <include name="${package}/DocumentSerializerImpl.java"/>
--- xmerge/java/org/openoffice/xmerge/merger/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/merger/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/DiffAlgorithm.java"/>
             <include name="${package}/Difference.java"/>
--- xmerge/java/org/openoffice/xmerge/merger/diff/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/merger/diff/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/CharacterParser.java"/>
             <include name="${package}/CharArrayLCSAlgorithm.java"/>
--- xmerge/java/org/openoffice/xmerge/merger/merge/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/merger/merge/build.xml	Mon Dec 11 23:35:25 2006
@@ -114,7 +114,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/CharacterBaseParagraphMerge.java"/>
             <include name="${package}/PositionBaseRowMerge.java"/>
--- xmerge/java/org/openoffice/xmerge/test/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/test/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/ConverterInfoList.java"/>
             <include name="${package}/Driver.java"/>
--- xmerge/java/org/openoffice/xmerge/util/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/util/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/IntArrayList.java"/>
             <include name="${package}/Resources.java"/>
--- xmerge/java/org/openoffice/xmerge/util/registry/build.xml.orig	Fri Dec  1 18:58:10 2006
+++ xmerge/java/org/openoffice/xmerge/util/registry/build.xml	Mon Dec 11 23:35:25 2006
@@ -113,7 +113,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/ConverterInfo.java"/>
             <include name="${package}/ConverterInfoMgr.java"/>
--- xmerge/source/aportisdoc/build.xml.orig	Fri Dec  1 18:58:11 2006
+++ xmerge/source/aportisdoc/build.xml	Mon Dec 11 23:35:25 2006
@@ -55,7 +55,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/bridge/build.xml.orig	Fri Dec  1 18:58:11 2006
+++ xmerge/source/bridge/build.xml	Mon Dec 11 23:35:25 2006
@@ -62,7 +62,9 @@
                destdir="${target.dir}"
 			   debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/minicalc/build.xml.orig	Fri Dec  1 18:58:11 2006
+++ xmerge/source/minicalc/build.xml	Mon Dec 11 23:35:25 2006
@@ -55,7 +55,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/pexcel/build.xml.orig	Fri Dec  1 18:58:12 2006
+++ xmerge/source/pexcel/build.xml	Mon Dec 11 23:35:25 2006
@@ -55,7 +55,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/pocketword/build.xml.orig	Fri Dec  1 18:58:12 2006
+++ xmerge/source/pocketword/build.xml	Mon Dec 11 23:35:25 2006
@@ -55,7 +55,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/wordsmith/build.xml.orig	Fri Dec  1 18:58:12 2006
+++ xmerge/source/wordsmith/build.xml	Mon Dec 11 23:35:25 2006
@@ -55,7 +55,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/writer2latex/build.xml.orig	Fri Dec  1 18:58:12 2006
+++ xmerge/source/writer2latex/build.xml	Mon Dec 11 23:35:25 2006
@@ -85,7 +85,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/xmerge/build.xml.orig	Fri Dec  1 18:58:13 2006
+++ xmerge/source/xmerge/build.xml	Mon Dec 11 23:35:25 2006
@@ -64,7 +64,9 @@
                destdir="${target.dir}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
         </javac>
     </target>
--- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml.orig	Fri Dec  1 18:58:13 2006
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	Mon Dec 11 23:35:25 2006
@@ -118,7 +118,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="${package}/ConverterInfo.java"/>
             <include name="${package}/ConverterInfoMgr.java"/>
--- xmerge/workben/build.xml.orig	Fri Dec  1 18:58:13 2006
+++ xmerge/workben/build.xml	Mon Dec 11 23:35:25 2006
@@ -116,7 +116,9 @@
                destdir="${build.class}"
                debug="${debug}"
                deprecation="${deprecation}"
-               optimize="${optimize}">
+               optimize="${optimize}"
+	       source="${java.source.ver}"
+	       target="${java.target.ver}">
             <classpath refid="classpath"/>
             <include name="XmlDiff.java"/>
         </javac>