From 9c6ee1f363c57338fe5f6b52e8947cc56742aba3 Mon Sep 17 00:00:00 2001
From: tnowell <tnowell@37977431-3df6-0310-b722-df95706aa16b>
Date: Mon, 17 Sep 2007 08:35:02 +0000
Subject: [PATCH] - Added Java unitsync test program - Added 2 JNA tests to the
 existing 4 JNI tests (you'll need to download jna.jar from the JNA website,
 which is around 286kb)

git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4410 37977431-3df6-0310-b722-df95706aa16b
---
 tools/unitsync/JavaUnitsyncTest/build.xml     |  69 ++
 tools/unitsync/JavaUnitsyncTest/manifest.mf   |   3 +
 .../JavaUnitsyncTest/nbproject/build-impl.xml | 610 ++++++++++++++++++
 .../nbproject/genfiles.properties             |   8 +
 .../nbproject/private/config.properties       |   0
 .../nbproject/private/private.properties      |   6 +
 .../nbproject/private/private.xml             |   4 +
 .../nbproject/project.properties              |  63 ++
 .../JavaUnitsyncTest/nbproject/project.xml    |  16 +
 .../src/aflobby/CJNAUnitsync.java             |  28 +
 .../src/aflobby/CUnitSync.java                |  45 ++
 .../src/aflobby/CUnitSyncJNIBindings.java     | 157 +++++
 .../src/aflobby/CUnitSyncJNIVersion.java      |  47 ++
 .../src/unitsynctest/CGUI.form                | 113 ++++
 .../src/unitsynctest/CGUI.java                | 188 ++++++
 .../src/unitsynctest/Main.java                |  51 ++
 16 files changed, 1408 insertions(+)
 create mode 100644 tools/unitsync/JavaUnitsyncTest/build.xml
 create mode 100644 tools/unitsync/JavaUnitsyncTest/manifest.mf
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/build-impl.xml
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/genfiles.properties
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/private/config.properties
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/private/private.properties
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/private/private.xml
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/project.properties
 create mode 100644 tools/unitsync/JavaUnitsyncTest/nbproject/project.xml
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/aflobby/CJNAUnitsync.java
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSync.java
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIBindings.java
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIVersion.java
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.form
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.java
 create mode 100644 tools/unitsync/JavaUnitsyncTest/src/unitsynctest/Main.java

diff --git a/tools/unitsync/JavaUnitsyncTest/build.xml b/tools/unitsync/JavaUnitsyncTest/build.xml
new file mode 100644
index 00000000000..b00b4a3932d
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/build.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<project name="UnitsyncTest" default="default" basedir=".">
+    <description>Builds, tests, and runs the project UnitsyncTest.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="UnitsyncTest-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/tools/unitsync/JavaUnitsyncTest/manifest.mf b/tools/unitsync/JavaUnitsyncTest/manifest.mf
new file mode 100644
index 00000000000..1574df4a2de
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/build-impl.xml b/tools/unitsync/JavaUnitsyncTest/nbproject/build-impl.xml
new file mode 100644
index 00000000000..b7b777401d5
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/nbproject/build-impl.xml
@@ -0,0 +1,610 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="UnitsyncTest-impl">
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="" name="javac.compilerargs.jaxws"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="" srcdir="@{srcdir}" target="${javac.target}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <sequential>
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="**/*Test.java"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
+        <j2seproject3:depend/>
+        <j2seproject3:javac/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target depends="init,compile" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" destdir="${dist.javadoc.dir}" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <packageset dir="${src.dir}" excludes="${excludes}" includes="${includes}"/>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+        </javadoc>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+</project>
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/genfiles.properties b/tools/unitsync/JavaUnitsyncTest/nbproject/genfiles.properties
new file mode 100644
index 00000000000..8ee3c458c80
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=b8f0c183
+build.xml.script.CRC32=c545d1fa
+build.xml.stylesheet.CRC32=a12b3d02
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=b8f0c183
+nbproject/build-impl.xml.script.CRC32=f36f88b6
+nbproject/build-impl.xml.stylesheet.CRC32=295adcf5
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/private/config.properties b/tools/unitsync/JavaUnitsyncTest/nbproject/private/config.properties
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/private/private.properties b/tools/unitsync/JavaUnitsyncTest/nbproject/private/private.properties
new file mode 100644
index 00000000000..e0afc621e5f
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/nbproject/private/private.properties
@@ -0,0 +1,6 @@
+file.reference.jna.jar=C:\\Users\\AF-StandardUsr\\Documents\\NetBeansProjects\\UnitsyncTest\\jna.jar
+javac.debug=true
+javadoc.preview=true
+jaxws.endorsed.dir=C:\\Program Files (x86)\\NetBeans 6.0 200709120000\\java1\\modules\\ext\\jaxws21\\api
+user.properties.file=C:\\Users\\AF-StandardUsr\\.netbeans\\dev\\build.properties
+work.dir=D:\\Program Files (x86)\\Spring
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/private/private.xml b/tools/unitsync/JavaUnitsyncTest/nbproject/private/private.xml
new file mode 100644
index 00000000000..cc2c0e57c4f
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/nbproject/private/private.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/project.properties b/tools/unitsync/JavaUnitsyncTest/nbproject/project.properties
new file mode 100644
index 00000000000..7c04dcbdc7e
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/nbproject/project.properties
@@ -0,0 +1,63 @@
+application.title=UnitsyncTest
+application.vendor=AF-StandardUsr
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/UnitsyncTest.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.jna.jar=jna.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.jna.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=unitsynctest.Main
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/tools/unitsync/JavaUnitsyncTest/nbproject/project.xml b/tools/unitsync/JavaUnitsyncTest/nbproject/project.xml
new file mode 100644
index 00000000000..e66962140fe
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/nbproject/project.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>UnitsyncTest</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/tools/unitsync/JavaUnitsyncTest/src/aflobby/CJNAUnitsync.java b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CJNAUnitsync.java
new file mode 100644
index 00000000000..da903a8ec7d
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CJNAUnitsync.java
@@ -0,0 +1,28 @@
+/*
+ * CJNAUnitsync.java
+ * 
+ * Created on 17-Sep-2007, 09:07:13
+ * 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package aflobby;
+
+/**
+ *
+ * @author AF-StandardUsr
+ */
+
+import com.sun.jna.*;
+import com.sun.jna.win32.StdCallLibrary;
+ 
+ 
+public interface CJNAUnitsync extends StdCallLibrary  {
+	
+	CJNAUnitsync INSTANCE = (CJNAUnitsync) Native.loadLibrary("unitsync", CJNAUnitsync.class);
+        CJNAUnitsync INSTANCE2 = (CJNAUnitsync) Native.loadLibrary("unitsyncVS2005", CJNAUnitsync.class);
+		
+	public int Init(boolean isServer, int id);
+        String GetSpringVersion();
+}
\ No newline at end of file
diff --git a/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSync.java b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSync.java
new file mode 100644
index 00000000000..65e03a66d5c
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSync.java
@@ -0,0 +1,45 @@
+/*
+ * CUnitSync.java
+ * 
+ * Created on 15-Sep-2007, 13:49:19
+ * 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package aflobby;
+
+/**
+ *
+ * @author AF-StandardUsr
+ */
+public class CUnitSync {
+    // load up the UnitSync.dll/UnitSync.so library
+    public static boolean loaded = false;
+
+    public static boolean LoadUnitSync(String lib) {
+        try {
+            //intendedpath = System.getProperty ("user.dir");
+            //System.out.println ("working directory : " + intendedpath);
+            //System.out.println ();
+            //System.out.println (intendedpath+"\\libjavaunitsync.so");
+            //System.out.println ();
+                System.loadLibrary(lib);
+//                java.lang.Runtime.getRuntime ().load (intendedpath+System.getProperty ("file.separator")+"unitsync.dll");
+
+            loaded=true;
+        } catch (final java.lang.UnsatisfiedLinkError e) {
+            e.printStackTrace();
+            loaded=false;
+        } /*catch (Exception e){
+        //            java.awt.EventQueue.invokeLater (new Runnable () {
+        //                public void run () {
+        //                    new WarningWindow ("<font face=\"Arial\" color=\""+ColourHelper.ColourToHex (Color.WHITE)+"\"><font size=20>UnitSync Exception error</font><br><br> Make sure you have a JNI aware UnitSync library in the same folder as AFLobby, and that it is compiled correctly using the latest java bindings.<br><br> AFlobby needs the unitsync library to be able to use spring.<br><br>Linux users need libjavaunitsync.so<br><br> Windows users need javaunitsync.dll<br><br> Apple Mac users need libjavaunitsync.dylib (Mac is not entirely supported and upto date mac builds of unitsync arent included due to time restrictions)<br><br><br><br><b> path variable =</b> <i>"+ System.getProperty ("user.dir")+"</i><br> <b> library path = </b><i>"+System.getProperty("java.library.path")+"</i></font>",
+        //                        "UnitSync Error"
+        //                        ).setVisible (true);
+        //                }
+        //            });
+        //        }*/
+        return loaded;
+    }
+}
diff --git a/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIBindings.java b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIBindings.java
new file mode 100644
index 00000000000..50cc691b8fa
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIBindings.java
@@ -0,0 +1,157 @@
+/*
+ * CUnitSyncJNIBindings.java
+ *
+ * Created on 31 May 2006, 14:43
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package aflobby;
+
+/**
+ * CUnitSyncJNIBindings.java
+ *
+ *
+ *
+ * @author AF
+ */
+
+//CUnitSyncJNIBindings
+public class CUnitSyncJNIBindings {
+
+    /**
+     * Creates a new instance of CUnitSyncJNIBindings
+     */
+    public CUnitSyncJNIBindings() {
+    }
+
+    // load up the UnitSync.dll/UnitSync.so library
+    public static boolean loaded = false;
+
+    public static boolean LoadUnitSync(String lib) {
+        try {
+            //intendedpath = System.getProperty ("user.dir");
+            //System.out.println ("working directory : " + intendedpath);
+            //System.out.println ();
+            //System.out.println (intendedpath+"\\libjavaunitsync.so");
+            //System.out.println ();
+                System.loadLibrary(lib);
+//                java.lang.Runtime.getRuntime ().load (intendedpath+System.getProperty ("file.separator")+"unitsync.dll");
+
+            loaded=true;
+        } catch (final java.lang.UnsatisfiedLinkError e) {
+            e.printStackTrace();
+            loaded=false;
+        } /*catch (Exception e){
+        //            java.awt.EventQueue.invokeLater (new Runnable () {
+        //                public void run () {
+        //                    new WarningWindow ("<font face=\"Arial\" color=\""+ColourHelper.ColourToHex (Color.WHITE)+"\"><font size=20>UnitSync Exception error</font><br><br> Make sure you have a JNI aware UnitSync library in the same folder as AFLobby, and that it is compiled correctly using the latest java bindings.<br><br> AFlobby needs the unitsync library to be able to use spring.<br><br>Linux users need libjavaunitsync.so<br><br> Windows users need javaunitsync.dll<br><br> Apple Mac users need libjavaunitsync.dylib (Mac is not entirely supported and upto date mac builds of unitsync arent included due to time restrictions)<br><br><br><br><b> path variable =</b> <i>"+ System.getProperty ("user.dir")+"</i><br> <b> library path = </b><i>"+System.getProperty("java.library.path")+"</i></font>",
+        //                        "UnitSync Error"
+        //                        ).setVisible (true);
+        //                }
+        //            });
+        //        }*/
+        return loaded;
+    }
+
+
+    public static native String GetSpringVersion();
+
+    public static native void Message(String p_szMessage);
+
+    public static native int Init(boolean isServer, int id);
+
+    public static native void UnInit();
+
+    public static native int ProcessUnits();
+
+    public static native int ProcessUnitsNoChecksum();
+
+    public static native String GetCurrentList();
+
+    public static native void AddClient(int id, String unitList);
+
+    public static native void RemoveClient(int id);
+
+    public static native String GetClientDiff(int id);
+
+    public static native void InstallClientDiff(String diff);
+
+    public static native int GetUnitCount();
+
+    public static native String GetUnitName(int unit);
+
+    public static native String GetFullUnitName(int unit);
+
+    public static native int IsUnitDisabled(int unit);
+
+    public static native int IsUnitDisabledByClient(int unit, int clientId);
+
+    //public static native int InitArchiveScanner();
+    public static native void AddArchive(String name);
+
+    public static native void AddAllArchives(String root);
+
+    public static native String GetArchiveChecksum(String arname); //unsigned integer
+
+    public static native int GetMapCount();
+
+    public static native String GetMapName(int index);
+
+    //public static native int GetMapInfoEx(String name, MapInfo outInfo, int version);
+    //public static native int GetMapInfo(String name, MapInfo outInfo);
+    //public static native void* GetMinimap(String filename, int miplevel);
+    public static native int GetMapArchiveCount(String mapName);
+
+    public static native String GetMapArchiveName(int index);
+
+    public static native String GetMapChecksum(int index); // unsigned
+
+    public static native int GetPrimaryModCount();
+
+    public static native String GetPrimaryModName(int index);
+
+    public static native String GetPrimaryModArchive(int index);
+
+    public static native int GetPrimaryModArchiveCount(int index);
+
+    public static native String GetPrimaryModArchiveList(int arnr);
+
+    public static native int GetPrimaryModIndex(String name);
+
+    public static native String GetPrimaryModChecksum(int index); //unsigned
+
+    public static native int GetSideCount();
+
+    public static native String GetSideName(int side);
+
+
+    public static native int OpenFileVFS(String name);
+
+    public static native void CloseFileVFS(int handle);
+
+    public static native String ReadFileVFS(int handle);
+
+    public static native int FileSizeVFS(int handle);
+
+    public static native int InitFindVFS ();
+    public static native String SearchVFS (String pattern);////////////
+    public static native int OpenArchive(String name);
+
+    public static native void CloseArchive(int archive);
+
+    public static native int FindFilesArchive(int archive, int cur, String nameBuf, int size);
+
+    public static native int OpenArchiveFile(int archive, String name);
+
+    public static native String ReadArchiveFile(int archive, int handle);
+
+    public static native void CloseArchiveFile(int archive, int handle);
+
+    public static native int SizeArchiveFile(int archive, int handle);
+
+    public static native String GetDataDirs(boolean write);
+
+    public static native boolean WriteMiniMap(String mapfile, String imagename, int miplevel);
+}
diff --git a/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIVersion.java b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIVersion.java
new file mode 100644
index 00000000000..7a9d4c466c8
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/aflobby/CUnitSyncJNIVersion.java
@@ -0,0 +1,47 @@
+/*
+ * CUnitSyncJNIVersion.java
+ * 
+ * Created on 15-Sep-2007, 13:35:52
+ * 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package aflobby;
+
+/**
+ *
+ * @author AF-StandardUsr
+ */
+public class CUnitSyncJNIVersion {
+    // load up the UnitSync.dll/UnitSync.so library
+    public static boolean loaded = false;
+
+    public static boolean LoadUnitSync(String lib) {
+        try {
+            //intendedpath = System.getProperty ("user.dir");
+            //System.out.println ("working directory : " + intendedpath);
+            //System.out.println ();
+            //System.out.println (intendedpath+"\\libjavaunitsync.so");
+            //System.out.println ();
+                System.loadLibrary(lib);
+//                java.lang.Runtime.getRuntime ().load (intendedpath+System.getProperty ("file.separator")+"unitsync.dll");
+
+            loaded=true;
+        } catch (final java.lang.UnsatisfiedLinkError e) {
+            e.printStackTrace();
+            loaded=false;
+        } /*catch (Exception e){
+        //            java.awt.EventQueue.invokeLater (new Runnable () {
+        //                public void run () {
+        //                    new WarningWindow ("<font face=\"Arial\" color=\""+ColourHelper.ColourToHex (Color.WHITE)+"\"><font size=20>UnitSync Exception error</font><br><br> Make sure you have a JNI aware UnitSync library in the same folder as AFLobby, and that it is compiled correctly using the latest java bindings.<br><br> AFlobby needs the unitsync library to be able to use spring.<br><br>Linux users need libjavaunitsync.so<br><br> Windows users need javaunitsync.dll<br><br> Apple Mac users need libjavaunitsync.dylib (Mac is not entirely supported and upto date mac builds of unitsync arent included due to time restrictions)<br><br><br><br><b> path variable =</b> <i>"+ System.getProperty ("user.dir")+"</i><br> <b> library path = </b><i>"+System.getProperty("java.library.path")+"</i></font>",
+        //                        "UnitSync Error"
+        //                        ).setVisible (true);
+        //                }
+        //            });
+        //        }*/
+        return loaded;
+    }
+    
+    public static native int GetVersion();
+}
diff --git a/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.form b/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.form
new file mode 100644
index 00000000000..b4b4548b80f
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.form
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="3"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+  </SyntheticProperties>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="Test3" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="Test4" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="Test2" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace pref="122" max="32767" attributes="0"/>
+                      <Component id="jButton1" min="-2" max="-2" attributes="1"/>
+                  </Group>
+                  <Component id="Test1" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="Test5" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="Test6" alignment="0" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
+              <Component id="Test1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="Test2" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="Test3" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="Test4" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="Test5" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="Test6" min="-2" max="-2" attributes="0"/>
+              <EmptySpace pref="37" max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JButton" name="jButton1">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Run Tests"/>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JLabel" name="Test1">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Test 1 (mingw32)"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="Test2">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Test 2 (VS2005)"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="Test3">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Test 3 (JNI version bindings mingw32 (SVN only))"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Click on Run tests to the right."/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="Test4">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Test 4 (JNI version Bindings VS2005 (SVN only))"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="Test5">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Test 5 (JNA Mingw32)"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="Test6">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Test 6 (JNA VS2005)"/>
+      </Properties>
+    </Component>
+  </SubComponents>
+</Form>
diff --git a/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.java b/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.java
new file mode 100644
index 00000000000..cb3e07e58c6
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/CGUI.java
@@ -0,0 +1,188 @@
+/*
+ * CGUI.java
+ *
+ * Created on 15 September 2007, 12:47
+ */
+
+package unitsynctest;
+
+import aflobby.CJNAUnitsync;
+import aflobby.CUnitSyncJNIBindings;
+import aflobby.CUnitSyncJNIVersion;
+import java.awt.Color;
+
+/**
+ *
+ * @author  AF-StandardUsr
+ */
+public class CGUI extends javax.swing.JFrame {
+    
+    /** Creates new form CGUI */
+    public CGUI() {
+        initComponents();
+        javax.swing.SwingUtilities.invokeLater (new Runnable () {
+            public void run () {
+                setLocationRelativeTo(null);
+            }
+        });
+    }
+    
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        jButton1 = new javax.swing.JButton();
+        Test1 = new javax.swing.JLabel();
+        Test2 = new javax.swing.JLabel();
+        Test3 = new javax.swing.JLabel();
+        jLabel1 = new javax.swing.JLabel();
+        Test4 = new javax.swing.JLabel();
+        Test5 = new javax.swing.JLabel();
+        Test6 = new javax.swing.JLabel();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+
+        jButton1.setText("Run Tests");
+        jButton1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton1ActionPerformed(evt);
+            }
+        });
+
+        Test1.setText("Test 1 (mingw32)");
+
+        Test2.setText("Test 2 (VS2005)");
+
+        Test3.setText("Test 3 (JNI version bindings mingw32 (SVN only))");
+
+        jLabel1.setText("Click on Run tests to the right.");
+
+        Test4.setText("Test 4 (JNI version Bindings VS2005 (SVN only))");
+
+        Test5.setText("Test 5 (JNA Mingw32)");
+
+        Test6.setText("Test 6 (JNA VS2005)");
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(Test3)
+                    .addComponent(Test4)
+                    .addComponent(Test2)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel1)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 122, Short.MAX_VALUE)
+                        .addComponent(jButton1))
+                    .addComponent(Test1)
+                    .addComponent(Test5)
+                    .addComponent(Test6))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(jButton1))
+                .addGap(15, 15, 15)
+                .addComponent(Test1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(Test2)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(Test3)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(Test4)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(Test5)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(Test6)
+                .addContainerGap(37, Short.MAX_VALUE))
+        );
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+        jButton1.setEnabled(false);
+        
+        CUnitSyncJNIBindings.LoadUnitSync("unitsync");
+        if(CUnitSyncJNIBindings.loaded){
+            Test1.setForeground(Color.GREEN);
+        }else{
+            Test1.setForeground(Color.RED);
+        }
+        
+        CUnitSyncJNIVersion.LoadUnitSync("unitsync");
+        if(CUnitSyncJNIVersion.loaded){
+            Test3.setForeground(Color.GREEN);
+        }else{
+            Test3.setForeground(Color.RED);
+        }
+        
+        CUnitSyncJNIBindings.LoadUnitSync("unitsyncvs2005");
+        if(CUnitSyncJNIBindings.loaded){
+            Test2.setForeground(Color.GREEN);
+        }else{
+            Test2.setForeground(Color.RED);
+        }
+        
+        CUnitSyncJNIVersion.LoadUnitSync("unitsyncvs2005");
+        if(CUnitSyncJNIVersion.loaded){
+            Test4.setForeground(Color.GREEN);
+        }else{
+            Test4.setForeground(Color.RED);
+        }
+        
+        try{
+            CJNAUnitsync c1 = CJNAUnitsync.INSTANCE;
+            String s = c1.GetSpringVersion();
+            Test5.setForeground(Color.GREEN);
+            Test5.setText("Test 5 (JNA Mingw32) spring version: "+s);
+        } catch (Exception e){
+            Test5.setForeground(Color.RED);
+            Test5.setText("Test 5 (JNA Mingw32)");
+        }
+        
+        try{
+            CJNAUnitsync c1 = CJNAUnitsync.INSTANCE2;
+            String s = c1.GetSpringVersion();
+            Test6.setForeground(Color.GREEN);
+            Test6.setText("Test 6 (JNA VS2005) spring version: "+s);
+        } catch (Exception e){
+            Test6.setForeground(Color.RED);
+            Test6.setText("Test 6 (JNA VS2005)");
+        }
+    }//GEN-LAST:event_jButton1ActionPerformed
+    
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String args[]) {
+        java.awt.EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                new CGUI().setVisible(true);
+            }
+        });
+    }
+    
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel Test1;
+    private javax.swing.JLabel Test2;
+    private javax.swing.JLabel Test3;
+    private javax.swing.JLabel Test4;
+    private javax.swing.JLabel Test5;
+    private javax.swing.JLabel Test6;
+    private javax.swing.JButton jButton1;
+    private javax.swing.JLabel jLabel1;
+    // End of variables declaration//GEN-END:variables
+    
+}
diff --git a/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/Main.java b/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/Main.java
new file mode 100644
index 00000000000..139daeb7d86
--- /dev/null
+++ b/tools/unitsync/JavaUnitsyncTest/src/unitsynctest/Main.java
@@ -0,0 +1,51 @@
+/*
+ * Main.java
+ * 
+ * Created on 15-Sep-2007, 12:47:38
+ * 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package unitsynctest;
+
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+/**
+ *
+ * @author AF-StandardUsr
+ */
+public class Main {
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        javax.swing.SwingUtilities.invokeLater (new Runnable () {
+            public void run () {
+                CreateGUI ();
+            }
+        });
+    }
+    
+    /**
+     * Creates the programs GUI window
+     */
+    public static void CreateGUI() {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (ClassNotFoundException ex) {
+            ex.printStackTrace ();
+        } catch (UnsupportedLookAndFeelException ex) {
+            ex.printStackTrace ();
+        } catch (InstantiationException ex) {
+            ex.printStackTrace ();
+        } catch (IllegalAccessException ex) {
+            ex.printStackTrace ();
+        }
+        
+        CGUI c =new CGUI ();
+        c.setVisible (true);
+    }
+}