From 0c7183d6963e1eb787d81768e59e4cf76073b8ed Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Wed, 14 Jun 2006 09:15:02 +0000
Subject: [PATCH] BugID: 604

This was needed for the initial RMI/JNI test for OTB. Can be placed on the
Attic  now.
---
 SAS/OTB/OTBTest/Makefile.am                   |   3 -
 SAS/OTB/OTBTest/bootstrap                     |   3 -
 SAS/OTB/OTBTest/build.xml                     |  69 --
 SAS/OTB/OTBTest/configure.in                  |  64 --
 SAS/OTB/OTBTest/manifest.mf                   |   3 -
 SAS/OTB/OTBTest/nbproject/build-impl.xml      | 475 -----------
 SAS/OTB/OTBTest/nbproject/genfiles.properties |   8 -
 .../nbproject/private/private.properties      |   4 -
 SAS/OTB/OTBTest/nbproject/project.properties  |  53 --
 SAS/OTB/OTBTest/nbproject/project.xml         |  10 -
 SAS/OTB/OTBTest/package.dox                   |   2 -
 SAS/OTB/OTBTest/src/Makefile.am               |  40 -
 SAS/OTB/OTBTest/src/otbtest/ExitListener.java |  27 -
 SAS/OTB/OTBTest/src/otbtest/Main.java         |  29 -
 SAS/OTB/OTBTest/src/otbtest/OTDBImpl.cc       | 128 ---
 .../OTBTest/src/otbtest/WindowUtilities.java  | 155 ----
 SAS/OTB/OTBTest/src/otbtest/navigatorRMI.java |  23 -
 .../OTBTest/src/otbtest/navigatorRMIImpl.java |  99 ---
 .../src/otbtest/navigatorRMIServer.java       |  69 --
 .../src/otbtest/otb_navigatorRMIImpl.h        |  27 -
 SAS/OTB/OTBTest/src/otbtest/otbgui.form       | 467 -----------
 SAS/OTB/OTBTest/src/otbtest/otbgui.java       | 735 ------------------
 SAS/OTB/OTBTest/src/otbtest/personeel.lijst   | 105 ---
 SAS/OTB/OTBTest/test/Makefile.am              |  15 -
 24 files changed, 2613 deletions(-)
 delete mode 100644 SAS/OTB/OTBTest/Makefile.am
 delete mode 100755 SAS/OTB/OTBTest/bootstrap
 delete mode 100644 SAS/OTB/OTBTest/build.xml
 delete mode 100644 SAS/OTB/OTBTest/configure.in
 delete mode 100644 SAS/OTB/OTBTest/manifest.mf
 delete mode 100644 SAS/OTB/OTBTest/nbproject/build-impl.xml
 delete mode 100644 SAS/OTB/OTBTest/nbproject/genfiles.properties
 delete mode 100644 SAS/OTB/OTBTest/nbproject/private/private.properties
 delete mode 100644 SAS/OTB/OTBTest/nbproject/project.properties
 delete mode 100644 SAS/OTB/OTBTest/nbproject/project.xml
 delete mode 100644 SAS/OTB/OTBTest/package.dox
 delete mode 100644 SAS/OTB/OTBTest/src/Makefile.am
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/ExitListener.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/Main.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/OTDBImpl.cc
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/WindowUtilities.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/navigatorRMI.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/navigatorRMIImpl.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/navigatorRMIServer.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/otb_navigatorRMIImpl.h
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/otbgui.form
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/otbgui.java
 delete mode 100644 SAS/OTB/OTBTest/src/otbtest/personeel.lijst
 delete mode 100644 SAS/OTB/OTBTest/test/Makefile.am

diff --git a/SAS/OTB/OTBTest/Makefile.am b/SAS/OTB/OTBTest/Makefile.am
deleted file mode 100644
index 161f7455d02..00000000000
--- a/SAS/OTB/OTBTest/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src test
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/OTBTest/bootstrap b/SAS/OTB/OTBTest/bootstrap
deleted file mode 100755
index fd49f5826a5..00000000000
--- a/SAS/OTB/OTBTest/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/SAS/OTB/OTBTest/build.xml b/SAS/OTB/OTBTest/build.xml
deleted file mode 100644
index c53bed2455e..00000000000
--- a/SAS/OTB/OTBTest/build.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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="OTBTest" default="default" basedir=".">
-    <description>Builds, tests, and runs the project OTBTest.</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="OTBTest-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/SAS/OTB/OTBTest/configure.in b/SAS/OTB/OTBTest/configure.in
deleted file mode 100644
index 439034e1632..00000000000
--- a/SAS/OTB/OTBTest/configure.in
+++ /dev/null
@@ -1,64 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(OTBTest, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-dnl lofar_PACKAGE(LCS/Common)
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/SAS/OTB/OTBTest/manifest.mf b/SAS/OTB/OTBTest/manifest.mf
deleted file mode 100644
index 328e8e5bc3b..00000000000
--- a/SAS/OTB/OTBTest/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/SAS/OTB/OTBTest/nbproject/build-impl.xml b/SAS/OTB/OTBTest/nbproject/build-impl.xml
deleted file mode 100644
index c53d8c4119a..00000000000
--- a/SAS/OTB/OTBTest/nbproject/build-impl.xml
+++ /dev/null
@@ -1,475 +0,0 @@
-<?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 name="OTBTest-impl" default="build" basedir="..">
-    <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
-    <!-- 
-    ======================
-    INITIALIZATION SECTION 
-    ======================
-    -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init-private" depends="-pre-init">
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target name="-init-user" depends="-pre-init,-init-private">
-        <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 name="-init-project" depends="-pre-init,-init-private,-init-user">
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
-        <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>
-        <available property="have.tests" file="${test.src.dir}"/>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <isfalse value="${javadoc.preview}"/>
-        </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>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
-        <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/1">
-            <attribute name="srcdir" default="${src.dir}"/>
-            <attribute name="destdir" default="${build.classes.dir}"/>
-            <attribute name="classpath" default="${javac.classpath}"/>
-            <attribute name="debug" default="${javac.debug}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="includes" default="**/*Test.java"/>
-            <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <attribute name="stopclassname" default=""/>
-            <sequential>
-                <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="dir" default="${build.classes.dir}"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="classname" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <attribute name="args" default="${application.args}"/>
-            <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
-                    <jvmarg value="-Xdebug"/>
-                    <jvmarg value="-Xnoagent"/>
-                    <jvmarg value="-Djava.compiler=none"/>
-                    <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 type="glob" from="run-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <arg line="@{args}"/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="classname" default="${main.class}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar jarfile="${dist.jar}" compress="${jar.compress}">
-                <fileset dir="${build.classes.dir}" xmlns="http://www.netbeans.org/ns/j2se-project/1"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="init" 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"/>
-    <!--
-    ===================
-    COMPILATION SECTION
-    ===================
-    -->
-    <target name="deps-jar" depends="init" unless="no.deps"/>
-    <target name="-pre-pre-compile" depends="init,deps-jar">
-        <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 name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile">
-        <j2seproject:javac xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject:javac xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1">
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </j2seproject:javac>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
-    <!--
-    ====================
-    JAR BUILDING SECTION
-    ====================
-    -->
-    <target name="-pre-pre-jar" depends="init">
-        <dirname property="dist.jar.dir" file="${dist.jar}"/>
-        <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 name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
-        <j2seproject:jar xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
-        <j2seproject:jar manifest="${manifest.file}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class">
-        <j2seproject:jar manifest="${manifest.file}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1">
-            <manifest xmlns="http://www.netbeans.org/ns/j2se-project/1">
-                <attribute j2seproject:name="Main-Class" value="${main.class}"/>
-            </manifest>
-        </j2seproject:jar>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-post-jar" description="Build JAR."/>
-    <!--
-    =================
-    EXECUTION SECTION
-    =================
-    -->
-    <target name="run" depends="init,compile" description="Run a main class.">
-        <j2seproject:java xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1">
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject:java>
-    </target>
-    <target name="run-single" depends="init,compile-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject:java classname="${run.class}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <!--
-    =================
-    DEBUGGING SECTION
-    =================
-    -->
-    <target name="-debug-start-debugger" if="netbeans.home" depends="init">
-        <j2seproject:nbjpdastart name="${debug.class}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="-debug-start-debuggee" depends="init,compile">
-        <j2seproject:debug xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
-    <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
-        <j2seproject:nbjpdastart stopclassname="${main.class}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
-    <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject:debug classname="${debug.class}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
-    <target name="-pre-debug-fix" depends="init">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
-        <j2seproject:nbjpdareload xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
-    <!--
-    ===============
-    JAVADOC SECTION
-    ===============
-    -->
-    <target name="-javadoc-build" depends="init">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" failonerror="true">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <sourcepath>
-                <pathelement location="${src.dir}"/>
-            </sourcepath>
-            <fileset dir="${src.dir}"/>
-        </javadoc>
-    </target>
-    <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
-    <!--
-    =========================
-    JUNIT COMPILATION SECTION
-    =========================
-    -->
-    <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
-        <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 name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
-        <j2seproject:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-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 name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1">
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </j2seproject:javac>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
-    <!--
-    =======================
-    JUNIT EXECUTION SECTION
-    =======================
-    -->
-    <target name="-pre-test-run" if="have.tests" depends="init">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
-        <j2seproject:junit xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target name="test-report" if="have.tests" depends="init"/>
-    <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
-    <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
-    <target name="-pre-test-run-single" if="have.tests" depends="init">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject:junit includes="${test.includes}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
-    <!--
-    =======================
-    JUNIT DEBUGGING SECTION
-    =======================
-    -->
-    <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}" args="${test.class}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
-        <j2seproject:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
-    <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
-        <j2seproject:nbjpdareload dir="${build.test.classes.dir}" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
-    <!--
-    =========================
-    APPLET EXECUTION SECTION
-    =========================
-    -->
-    <target name="run-applet" depends="init,compile-single">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject:java classname="sun.applet.AppletViewer" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject:java>
-    </target>
-    <!--
-    =========================
-    APPLET DEBUGGING  SECTION
-    =========================
-    -->
-    <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject:debug classname="sun.applet.AppletViewer" args="&quot;${applet.url}&quot;" xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
-    </target>
-    <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
-    <!--
-    ===============
-    CLEANUP SECTION
-    ===============
-    -->
-    <target name="deps-clean" depends="init" unless="no.deps"/>
-    <target name="-do-clean" depends="init">
-        <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 name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
-</project>
diff --git a/SAS/OTB/OTBTest/nbproject/genfiles.properties b/SAS/OTB/OTBTest/nbproject/genfiles.properties
deleted file mode 100644
index a2d289b6716..00000000000
--- a/SAS/OTB/OTBTest/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=52b5b621
-build.xml.script.CRC32=7f478078
-build.xml.stylesheet.CRC32=ba5d3624
-# 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=52b5b621
-nbproject/build-impl.xml.script.CRC32=65051966
-nbproject/build-impl.xml.stylesheet.CRC32=1cf0b40c
diff --git a/SAS/OTB/OTBTest/nbproject/private/private.properties b/SAS/OTB/OTBTest/nbproject/private/private.properties
deleted file mode 100644
index a1d8b6b65a9..00000000000
--- a/SAS/OTB/OTBTest/nbproject/private/private.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-application.args=
-javac.debug=true
-javadoc.preview=true
-user.properties.file=/home/coolen/.netbeans/4.1/build.properties
diff --git a/SAS/OTB/OTBTest/nbproject/project.properties b/SAS/OTB/OTBTest/nbproject/project.properties
deleted file mode 100644
index f76ad0985d1..00000000000
--- a/SAS/OTB/OTBTest/nbproject/project.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-application.args=
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-# 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}/OTBTest.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=${default.javac.source}
-javac.target=${default.javac.target}
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}
-javadoc.author=false
-javadoc.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=otb.Main
-manifest.file=manifest.mf
-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}
-src.dir=src
-test.src.dir=test
diff --git a/SAS/OTB/OTBTest/nbproject/project.xml b/SAS/OTB/OTBTest/nbproject/project.xml
deleted file mode 100644
index 356c8f45e34..00000000000
--- a/SAS/OTB/OTBTest/nbproject/project.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/1">
-            <name>OTBTest</name>
-            <minimum-ant-version>1.6</minimum-ant-version>
-        </data>
-    </configuration>
-</project>
diff --git a/SAS/OTB/OTBTest/package.dox b/SAS/OTB/OTBTest/package.dox
deleted file mode 100644
index 63685e88a0f..00000000000
--- a/SAS/OTB/OTBTest/package.dox
+++ /dev/null
@@ -1,2 +0,0 @@
-// \defgroup OTBTest OTB OTB test directory to try out techniques
-
diff --git a/SAS/OTB/OTBTest/src/Makefile.am b/SAS/OTB/OTBTest/src/Makefile.am
deleted file mode 100644
index 34a7f0977eb..00000000000
--- a/SAS/OTB/OTBTest/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
-INSTHDRS =
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
-lib_LTLIBRARIES         = libotb.la
-
-libotb_la_SOURCES =
-
-# AM_YFLAGS               = -d -p KeyParse
-# AM_LFLAGS               = -PKeyTokenize
-# LEX_OUTPUT_ROOT         = lex.KeyTokenize
-
-# if HAVE_SHMEM
-# libotb_la_LIBADD     = shmem/libshmem.la
-# endif
-
-bin_PROGRAMS =
-
-glishdir = $(libexecdir)/glish
-dist_glish_SCRIPTS = 
-
-pythondir = $(bindir)
-dist_python_SCRIPTS = 
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/OTBTest/src/otbtest/ExitListener.java b/SAS/OTB/OTBTest/src/otbtest/ExitListener.java
deleted file mode 100644
index 02aea293fdb..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/ExitListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package otbtest;
-import java.awt.*;
-
-import java.awt.event.*;
-
-
-
-/** A listener that you attach to the top-level Frame or JFrame of
-
- *  your application, so quitting the frame exits the application.
-
- *  1998-99 Marty Hall, http://www.apl.jhu.edu/~hall/java/
-
- */
-
-
-
-public class ExitListener extends WindowAdapter {
-
-  public void windowClosing(WindowEvent event) {
-
-    System.exit(0);
-
-  }
-
-}
-
diff --git a/SAS/OTB/OTBTest/src/otbtest/Main.java b/SAS/OTB/OTBTest/src/otbtest/Main.java
deleted file mode 100644
index 5da953b8295..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/Main.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Main.java
- *
- * Created on April 26, 2005, 2:07 PM
- */
-
-package otbtest;
-
-/**
- *
- * @author alex
- */
-public class Main {
-    
-    /** Creates a new instance of Main */
-    public Main() {
-    }
-    
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        // TODO code application logic here
-        otbgui aGui = new otbgui();
-        aGui.setSize(800, 400);
-        aGui.setVisible(true);
-    }
-    
-}
diff --git a/SAS/OTB/OTBTest/src/otbtest/OTDBImpl.cc b/SAS/OTB/OTBTest/src/otbtest/OTDBImpl.cc
deleted file mode 100644
index 1cbd1b9dd77..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/OTDBImpl.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <jni.h>
-#include "otb_navigatorRMIImpl.h"
-
-
-JNIEXPORT jobjectArray JNICALL 
-Java_otb_navigatorRMIImpl_getDBList (JNIEnv *env, jobject obj) {
-
- jobjectArray ret;
- int i;
-
- char *DBList[105]= { 
-   "Departments.Administration.Cees_Boon.Salary=\"1500\"",
-   "Departments.Administration.Cees_Boon.Address=\"Randervoordestraat 6\"",
-   "Departments.Administration.Cees_Boon.PostalCode=\"7906HM\"",
-   "Departments.Administration.Cees_Boon.City=\"Hoogeveen\"",
-   "Departments.Administration.Cees_Boon.WorkPhone=\"0521-595117\"",
-   "Departments.Administration.Cees_Boon.PrivatePhone=\"0528-268049\"",
-   "Departments.Administration.Cees_Boon.Email=\"boon@astron.nl\"",
-   "Departments.Administration.Jaap_van_de_Spreng.Salary=\"1600\"",
-   "Departments.Administration.Jaap_van_de_Spreng.Address=\"Veenwijksweg 17\"",
-   "Departments.Administration.Jaap_van_de_Spreng.PostalCode=\"8427RS\"",
-   "Departments.Administration.Jaap_van_de_Spreng.City=\"Ravenswoud\"",
-   "Departments.Administration.Jaap_van_de_Spreng.WorkPhone=\"0521-595130\"",
-   "Departments.Administration.Jaap_van_de_Spreng.PrivatePhone=\"0516-433364\"",
-   "Departments.Administration.Jaap_van_de_Spreng.Email=\"spreng@astron.nl\"",
-   "Departments.Administration.Thijs_Zanders.Salary=\"1600\"",
-   "Departments.Administration.Thijs_Zanders.Address=\"Alexander Dubcekweg 49\"",
-   "Departments.Administration.Thijs_Zanders.PostalCode=\"9403XB\"",
-   "Departments.Administration.Thijs_Zanders.City=\"Assen\"",
-   "Departments.Administration.Thijs_Zanders.WorkPhone=\"0521-595148\"",
-   "Departments.Administration.Thijs_Zanders.PrivatePhone=\"06-55707136\"",
-   "Departments.Administration.Thijs_Zanders.Email=\"zanders@astron.nl\"",
-   "Departments.ICT.Chris_Broekema.Salary=\"2000\"",
-   "Departments.ICT.Chris_Broekema.Address=\"Aquamarijnstraat 309\"",
-   "Departments.ICT.Chris_Broekema.PostalCode=\"9743PH\"",
-   "Departments.ICT.Chris_Broekema.City=\"Groningen\"",
-   "Departments.ICT.Chris_Broekema.WorkPhone=\"0521-595215\"",
-   "Departments.ICT.Chris_Broekema.PrivatePhone=\"050-5714258\"",
-   "Departments.ICT.Chris_Broekema.Email=\"broekema@astron.nl\"",
-   "Departments.ICT.Arthur_Coolen.Salary=\"1900\"",
-   "Departments.ICT.Arthur_Coolen.Address=\"Hoofdstraat 78\"",
-   "Departments.ICT.Arthur_Coolen.PostalCode=\"9635AW\"",
-   "Departments.ICT.Arthur_Coolen.City=\"Noordbroek\"",
-   "Departments.ICT.Arthur_Coolen.WorkPhone=\"0521-595292\"",
-   "Departments.ICT.Arthur_Coolen.PrivatePhone=\"0598-451712\"",
-   "Departments.ICT.Arthur_Coolen.Email=\"coolen@astron.nl\"",
-   "Departments.ICT.Ger_van_Diepen.Salary=\"2200\"",
-   "Departments.ICT.Ger_van_Diepen.Address=\"Moleneinde 25\"",
-   "Departments.ICT.Ger_van_Diepen.PostalCode=\"7981AM\"",
-   "Departments.ICT.Ger_van_Diepen.City=\"Diever\"",
-   "Departments.ICT.Ger_van_Diepen.WorkPhone=\"0521-595241\"",
-   "Departments.ICT.Ger_van_Diepen.PrivatePhone=\"0521-592729\"",
-   "Departments.ICT.Ger_van_Diepen.Email=\"diepen@astron.nl\"",
-   "Departments.ICT.Alex_Gerdes.Salary=\"2100\"",
-   "Departments.ICT.Alex_Gerdes.Address=\"Westermaten 3\"",
-   "Departments.ICT.Alex_Gerdes.PostalCode=\"7854TS\"",
-   "Departments.ICT.Alex_Gerdes.City=\"Aalden\"",
-   "Departments.ICT.Alex_Gerdes.WorkPhone=\"0521-595272\"",
-   "Departments.ICT.Alex_Gerdes.PrivatePhone=\"0591-610421\"",
-   "Departments.ICT.Alex_Gerdes.Email=\"gerdes@astron.nl\"",
-   "Departments.ICT.Management.Marcel_Loose.Salary=\"2200\"",
-   "Departments.ICT.Management.Marcel_Loose.Address=\"De Goorn 58\"",
-   "Departments.ICT.Management.Marcel_Loose.PostalCode=\"7975BT\"",
-   "Departments.ICT.Management.Marcel_Loose.City=\"Uffelte\"",
-   "Departments.ICT.Management.Marcel_Loose.WorkPhone=\"0521-595243\"",
-   "Departments.ICT.Management.Marcel_Loose.PrivatePhone=\"0521-343338\"",
-   "Departments.ICT.Management.Marcel_Loose.Email=\"loose@astron.nl\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.Salary=\"2300\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.Address=\"Tiendweg West 2c\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.PostalCode=\"2941EP\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.City=\"Lekkerkerk\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.WorkPhone=\"0521-595265\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.PrivatePhone=\"06-29522776\"",
-   "Departments.ICT.Management.Ellen_van_Meijeren.Email=\"meijeren@astron.nl\"",
-   "Departments.Technical_Lab.Dion_Kant.Salary=\"2300\"",
-   "Departments.Technical_Lab.Dion_Kant.Address=\"de Stelling 48\"",
-   "Departments.Technical_Lab.Dion_Kant.PostalCode=\"8391ME\"",
-   "Departments.Technical_Lab.Dion_Kant.City=\"Noordwolde\"",
-   "Departments.Technical_Lab.Dion_Kant.WorkPhone=\"0521-595139\"",
-   "Departments.Technical_Lab.Dion_Kant.PrivatePhone=\"0561-431826\"",
-   "Departments.Technical_Lab.Dion_Kant.Email=\"kant@astron.nl\"",
-   "Departments.Technical_Lab.Gaby_Kroes.Salary=\"2100\"",
-   "Departments.Technical_Lab.Gaby_Kroes.Address=\"Korenmolen 20\"",
-   "Departments.Technical_Lab.Gaby_Kroes.PostalCode=\"9203VA\"",
-   "Departments.Technical_Lab.Gaby_Kroes.City=\"Drachten\"",
-   "Departments.Technical_Lab.Gaby_Kroes.WorkPhone=\"0521-595176\"",
-   "Departments.Technical_Lab.Gaby_Kroes.PrivatePhone=\"0512-518729\"",
-   "Departments.Technical_Lab.Gaby_Kroes.Email=\"kroes@astron.nl\"",
-   "Departments.Technical_Lab.Jan_Nijboer.Salary=\"1900\"",
-   "Departments.Technical_Lab.Jan_Nijboer.Address=\"Achterdiep NZ 29\"",
-   "Departments.Technical_Lab.Jan_Nijboer.PostalCode=\"9611BT\"",
-   "Departments.Technical_Lab.Jan_Nijboer.City=\"Sappemeer\"",
-   "Departments.Technical_Lab.Jan_Nijboer.WorkPhone=\"0521-595177\"",
-   "Departments.Technical_Lab.Jan_Nijboer.PrivatePhone=\"0598-398722\"",
-   "Departments.Technical_Lab.Jan_Nijboer.Email=\"nijboer@astron.nl\"",
-   "Departments.System_Management.Jan_Slagter.Salary=\"1800\"",
-   "Departments.System_Management.Jan_Slagter.Address=\"Bovenboer 18\"",
-   "Departments.System_Management.Jan_Slagter.PostalCode=\"7924PT\"",
-   "Departments.System_Management.Jan_Slagter.City=\"Veeningen\"",
-   "Departments.System_Management.Jan_Slagter.WorkPhone=\"0521-595238\"",
-   "Departments.System_Management.Jan_Slagter.PrivatePhone=\"0528-391570\"",
-   "Departments.System_Management.Jan_Slagter.Email=\"slagter@astron.nl\"",
-   "Departments.System_Management.Klaas_Stuurwold.Salary=\"2100\"",
-   "Departments.System_Management.Klaas_Stuurwold.Address=\"De Stroom 48\"",
-   "Departments.System_Management.Klaas_Stuurwold.PostalCode=\"9411MA\"",
-   "Departments.System_Management.Klaas_Stuurwold.City=\"Beilen\"",
-   "Departments.System_Management.Klaas_Stuurwold.WorkPhone=\"0521-595231\"",
-   "Departments.System_Management.Klaas_Stuurwold.PrivatePhone=\"0593-541930\"",
-   "Departments.System_Management.Klaas_Stuurwold.Email=\"stuurwold@astron.nl\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.Salary=\"2500\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.Address=\"Elzenhage 15\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.PostalCode=\"7943MA\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.City=\"Meppel\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.WorkPhone=\"0521-5952434\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.PrivatePhone=\"0522-244033\"",
-   "Departments.System_Management.Management.Roelof_Boesenkool.Email=\"boesenkool@astron.nl\""
- };
-
- ret= (jobjectArray)env->NewObjectArray(105,
-         env->FindClass("java/lang/String"),
-         env->NewStringUTF(""));
-
- for(i=0;i<105;i++) {
-   env->SetObjectArrayElement(
-      ret,i,env->NewStringUTF(DBList[i]));
-   }
-   return(ret);
-}
diff --git a/SAS/OTB/OTBTest/src/otbtest/WindowUtilities.java b/SAS/OTB/OTBTest/src/otbtest/WindowUtilities.java
deleted file mode 100644
index 94e3b499ba9..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/WindowUtilities.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package otbtest;
-import javax.swing.*;
-
-import java.awt.*;
-
-
-
-/** A few utilities that simplify using windows in Swing.
-
- *  1998-99 Marty Hall, http://www.apl.jhu.edu/~hall/java/
-
- */
-
-
-
-public class WindowUtilities {
-
-
-
-  /** Tell system to use native look and feel, as in previous
-
-   *  releases. Metal (Java) LAF is the default otherwise.
-
-   */
-
-
-
-  public static void setNativeLookAndFeel() {
-
-    try {
-
-      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-    } catch(Exception e) {
-
-      System.out.println("Error setting native LAF: " + e);
-
-    }
-
-  }
-
-
-
-  public static void setJavaLookAndFeel() {
-
-    try {
-
-      UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
-
-    } catch(Exception e) {
-
-      System.out.println("Error setting Java LAF: " + e);
-
-    }
-
-  }
-
-
-
-   public static void setMotifLookAndFeel() {
-
-    try {
-
-      UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
-
-    } catch(Exception e) {
-
-      System.out.println("Error setting Motif LAF: " + e);
-
-    }
-
-  }
-
-
-
-  /** A simplified way to see a JPanel or other Container.
-
-   *  Pops up a JFrame with specified Container as the content pane.
-
-   */
-
-
-
-  public static JFrame openInJFrame(Container content,
-
-                                    int width,
-
-                                    int height,
-
-                                    String title,
-
-                                    Color bgColor) {
-
-    JFrame frame = new JFrame(title);
-
-    frame.setBackground(bgColor);
-
-    content.setBackground(bgColor);
-
-    frame.setSize(width, height);
-
-    frame.setContentPane(content);
-
-    frame.addWindowListener(new ExitListener());
-
-    frame.setVisible(true);
-
-    return(frame);
-
-  }
-
-
-
-  /** Uses Color.white as the background color. */
-
-
-
-  public static JFrame openInJFrame(Container content,
-
-                                    int width,
-
-                                    int height,
-
-                                    String title) {
-
-    return(openInJFrame(content, width, height, title, Color.white));
-
-  }
-
-
-
-  /** Uses Color.white as the background color, and the
-
-   *  name of the Container's class as the JFrame title.
-
-   */
-
-
-
-  public static JFrame openInJFrame(Container content,
-
-                                    int width,
-
-                                    int height) {
-
-    return(openInJFrame(content, width, height,
-
-                        content.getClass().getName(),
-
-                        Color.white));
-
-  }
-
-}
-
diff --git a/SAS/OTB/OTBTest/src/otbtest/navigatorRMI.java b/SAS/OTB/OTBTest/src/otbtest/navigatorRMI.java
deleted file mode 100644
index bfb636a53fc..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/navigatorRMI.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * navigatorRMI.java
- *
- * Created on 7 juni 2005, 15:22
- *
- * To change this template, choose Tools | Options and locate the template under
- * the Source Creation and Management node. Right-click the template and choose
- * Open. You can then make changes to the template in the Source Editor.
- */
-
-package otbtest;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-
-/**
- *
- * @author Arthur Coolen
- */
-public interface navigatorRMI extends Remote {
-    ArrayList<String []> getList() throws RemoteException;
-}
diff --git a/SAS/OTB/OTBTest/src/otbtest/navigatorRMIImpl.java b/SAS/OTB/OTBTest/src/otbtest/navigatorRMIImpl.java
deleted file mode 100644
index 172cd137eeb..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/navigatorRMIImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * navigatorRMIImpl.java
- *
- * Created on 7 juni 2005, 15:35
- *
- * To change this template, choose Tools | Options and locate the template under
- * the Source Creation and Management node. Right-click the template and choose
- * Open. You can then make changes to the template in the Source Editor.
- */
-
-
-package otbtest;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.ArrayList;
-
-/**
- *
- * @author Arthur Coolen
- *
- * What to do to get RMI going.
- *
- * look at the server ip and port in navigatorRMIImpl.java and otbgui.java and change if you take another server ip
- *
- * make a subdir otb and place navigatorRMI.jave navigatorRMIServer.java and navigatorRMIImpl.java in it
- * go one dir below  the otb dir and say javac otb/navigatorRMI.java
- *                                       javac otb/navigatorRMIImpl.java
- *                                       javac otb/navigatorRMIServer.java
- *
- * from the same place make the stub by typing rmic otb.navigatorRMIImpl
- * this will create a navigatorRMIImpl_Stub.class
- *
- * ftp navigatorRMI.class  navigatorRMIImpl.class  navigatorRMIServer.class to the server to an otb subdir
- * login to the server and go to the directory and type rmiregistry &  this will start the rmi registry
- * then start the server with java otb/navigatorRMIServer 10099 &
- * 10099 represents the chosen port.
- *
- * ATTENTION:
- *
- * Make VERY sure that when you run the server side classes, that you use the same or a newer java version!
- * Make also VERY sure that the CLASSPATH is set to the place where your classes reside, ESPECIALLY BEFORE you
- * start rmiserver !!!!
- *
- * */
-
-public class navigatorRMIImpl extends UnicastRemoteObject implements navigatorRMI {
-
-    // JNI test with stringarraylist
-    public native String [] getDBList();
-
-    static {
-       System.loadLibrary("OTDB");
-   }
-
-
-    private ArrayList<String []> people = new ArrayList<String []>();
-
-    
-    /**
-     * Construct a remote object
-     * @param msg the message of the remote object, such as "Hello, world!".
-     * @exception RemoteException if the object handle cannot be constructed.
-     */
-    public navigatorRMIImpl() throws RemoteException {
-   }
-
-    /**
-     * Implementation of the remotely invocable method.
-     * @return the found data
-     * @exception RemoteException if the remote invocation fails.
-     */
-    public ArrayList<String []> getList() throws RemoteException {
-        return people;
-  }
-
-  public void setList(String [] aStrList) {
-     for (int j=0; j < aStrList.length;j++) {                  
-        // find the last aaa="bbb" combination
-        String [] aS1 = aStrList[j].split("[=]");
-        String [] aS2 = aS1[0].split("[.]");
-     
-        String [] saveString= new String[2];
-        for (int i=0; i< aS2.length-1;i++) {
-           if (i>0) {
-              saveString[0]+="."+aS2[i];
-           } else {
-              saveString[0]=aS2[i];
-           }
-        }
-        saveString[1]=aS2[aS2.length-1]+"="+aS1[1];
-        saveString[0]=saveString[0].replace('_',' ');
-        saveString[1]=saveString[1].replace('_',' ');
-        people.add(saveString);
-      }
-   }
-}
-    
-    
diff --git a/SAS/OTB/OTBTest/src/otbtest/navigatorRMIServer.java b/SAS/OTB/OTBTest/src/otbtest/navigatorRMIServer.java
deleted file mode 100644
index d3982b0fa4d..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/navigatorRMIServer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * navigatorRMIServer.java
- *
- * Created on June 10, 2005, 2:11 PM
- *
- * To change this template, choose Tools | Options and locate the template under
- * the Source Creation and Management node. Right-click the template and choose
- * Open. You can then make changes to the template in the Source Editor.
- */
-
-package otbtest;
-
-import java.rmi.Naming;
-
-/**
- *
- * @author Arthur Coolen
- *
- * How to build the JNI part (RMI is explained in navigatorRMIImpl.java)
- * 
- * On the server you need to following programs in subdir otb:
- * navigatorRMIImpl.java
- * navigatorRMIServer.java
- * OTDBImpl.cc
- * 
- * from withing otb do the following:
- * cd ..
- * javac otb/navigatorRMIImpl.java 
- * javac otb/navigatorRMIServer.java
- * javah -jni otb.navigatorRMIImpl this will build: otb_navigatorRMIImpl.h
- * mv otb_navigatorRMIImpl.h otb
- * cd otb
- * g++ -shared -I/opt/jdk1.5.0_03/include -I/opt/jdk1.5.0_03/include/linux \
- *      OTDBImpl.cc -o libOTDB.so
- *
- * Then Start the server with :
- * cd ..
- * java otb.navigatorRMIServer
- *
- * Requirement is that the rmiregistry 10099 &  as explained 
- * in navigatorRMIImpl.java should be running also
- *
- */
-
-public class navigatorRMIServer {
-    
-  /**
-   * Server program for the navigator example program
-   * @param argv The command line arguments which are ignored.
-   */
-
-    public static void main (String[] argv) {
-      try {
-	navigatorRMIImpl aNRI = new navigatorRMIImpl(); 
-
-        Naming.rebind("rmi://10.0.0.154:10099/navigatorRMItje", aNRI);
-//        Naming.rebind("rmi://dop32.astron.nl:10099/navigatorRMItje", aNRI);
-        System.out.println ("navigator Server is ready.");
-
-        //test the JNI binding
-	aNRI.setList(aNRI.getDBList());
-        System.out.println("People should be set now");
-
-    } catch (Exception e) {
-      System.out.println ("navigator Server failed: " + e);
-    }
-
-  }
-}
diff --git a/SAS/OTB/OTBTest/src/otbtest/otb_navigatorRMIImpl.h b/SAS/OTB/OTBTest/src/otbtest/otb_navigatorRMIImpl.h
deleted file mode 100644
index 8379a922463..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/otb_navigatorRMIImpl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class otb_navigatorRMIImpl */
-
-#ifndef _Included_otb_navigatorRMIImpl
-#define _Included_otb_navigatorRMIImpl
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef otb_navigatorRMIImpl_serialVersionUID
-#define otb_navigatorRMIImpl_serialVersionUID -3215090123894869218LL
-#undef otb_navigatorRMIImpl_serialVersionUID
-#define otb_navigatorRMIImpl_serialVersionUID -4100238210092549637LL
-#undef otb_navigatorRMIImpl_serialVersionUID
-#define otb_navigatorRMIImpl_serialVersionUID 4974527148936298033LL
-/*
- * Class:     otb_navigatorRMIImpl
- * Method:    getDBList
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_otb_navigatorRMIImpl_getDBList
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/SAS/OTB/OTBTest/src/otbtest/otbgui.form b/SAS/OTB/OTBTest/src/otbtest/otbgui.form
deleted file mode 100644
index 689de998fdb..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/otbgui.form
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.2" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <NonVisualComponents>
-    <Menu class="javax.swing.JMenuBar" name="jMenuBar1">
-      <SubComponents>
-        <Menu class="javax.swing.JMenu" name="jMenuFile">
-          <Properties>
-            <Property name="toolTipText" type="java.lang.String" value="File Menu"/>
-            <Property name="label" type="java.lang.String" value="File"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMenuFileExit">
-              <Properties>
-                <Property name="label" type="java.lang.String" value="Exit"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuFileExitActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-        <Menu class="javax.swing.JMenu" name="MenuInput">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Input"/>
-            <Property name="toolTipText" type="java.lang.String" value="Input selection Menu"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMenuInputFile">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="File"/>
-                <Property name="toolTipText" type="java.lang.String" value="Set input to file"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuInputFileActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMenuInputOTDB">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="OTDB"/>
-                <Property name="toolTipText" type="java.lang.String" value="Set input to file"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuInputOTDBActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-      </SubComponents>
-    </Menu>
-  </NonVisualComponents>
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="3"/>
-    <Property name="maximizedBounds" type="java.awt.Rectangle" editor="org.netbeans.beaninfo.editors.RectangleEditor">
-      <Rectangle value="[0, 0, 1000, 400]"/>
-    </Property>
-    <Property name="name" type="java.lang.String" value="mainFrame"/>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-  </SyntheticProperties>
-  <AuxValues>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <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"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-86,0,0,2,-70"/>
-  </AuxValues>
-
-  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-  <SubComponents>
-    <Container class="javax.swing.JTabbedPane" name="jTabbedPane2">
-      <Properties>
-        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[100, 300]"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[100, 300]"/>
-        </Property>
-      </Properties>
-      <AccessibilityProperties>
-        <Property name="AccessibleContext.accessibleName" type="java.lang.String" value=""/>
-      </AccessibilityProperties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-          <BorderConstraints direction="North"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
-      <SubComponents>
-        <Container class="javax.swing.JPanel" name="TreePanel">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Tree" toolTip="Treeview">
-                <Property name="tabTitle" type="java.lang.String" value="Tree"/>
-                <Property name="tabToolTip" type="java.lang.String" value="Treeview"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-          <SubComponents>
-            <Container class="javax.swing.JScrollPane" name="treeScrollPane">
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="West"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JTree" name="departmentTree">
-                  <Properties>
-                    <Property name="autoscrolls" type="boolean" value="true"/>
-                    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[25, 72]"/>
-                    </Property>
-                    <Property name="showsRootHandles" type="boolean" value="true"/>
-                    <Property name="toggleClickCount" type="int" value="1"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="valueChanged" listener="javax.swing.event.TreeSelectionListener" parameters="javax.swing.event.TreeSelectionEvent" handler="TreeSelectionListener"/>
-                  </Events>
-                  <AuxValues>
-                    <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JTree(root);"/>
-                    <AuxValue name="JavaCodeGenerator_SerializeTo" type="java.lang.String" value="otbgui_jTree1"/>
-                  </AuxValues>
-                </Component>
-              </SubComponents>
-            </Container>
-            <Container class="javax.swing.JTabbedPane" name="treeTabbedPane">
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="Center"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
-              <SubComponents>
-                <Container class="javax.swing.JPanel" name="SalarisPanel">
-                  <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-                      <JTabbedPaneConstraints tabName="Salary" toolTip="Show Salary">
-                        <Property name="tabTitle" type="java.lang.String" value="Salary"/>
-                        <Property name="tabToolTip" type="java.lang.String" value="Show Salary"/>
-                      </JTabbedPaneConstraints>
-                    </Constraint>
-                  </Constraints>
-
-                  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
-                  <SubComponents>
-                    <Component class="javax.swing.JLabel" name="salaryLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Salary"/>
-                        <Property name="requestFocusEnabled" type="boolean" value="false"/>
-                      </Properties>
-                      <AccessibilityProperties>
-                        <Property name="AccessibleContext.accessibleName" type="java.lang.String" value="SalarisLabel"/>
-                      </AccessibilityProperties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="salaryTextField">
-                      <Properties>
-                        <Property name="editable" type="boolean" value="false"/>
-                        <Property name="text" type="java.lang.String" value="0"/>
-                        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[100, 19]"/>
-                        </Property>
-                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[100, 19]"/>
-                        </Property>
-                      </Properties>
-                    </Component>
-                  </SubComponents>
-                </Container>
-                <Container class="javax.swing.JPanel" name="AddressPanel">
-                  <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-                      <JTabbedPaneConstraints tabName="Address" toolTip="toon adresgegevens">
-                        <Property name="tabTitle" type="java.lang.String" value="Address"/>
-                        <Property name="tabToolTip" type="java.lang.String" value="toon adresgegevens"/>
-                      </JTabbedPaneConstraints>
-                    </Constraint>
-                  </Constraints>
-
-                  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
-                    <Property name="columns" type="int" value="2"/>
-                    <Property name="rows" type="int" value="7"/>
-                  </Layout>
-                  <SubComponents>
-                    <Component class="javax.swing.JLabel" name="nameLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Name"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="nameTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[100, 19]"/>
-                        </Property>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JLabel" name="addressLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Address"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="addressTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JLabel" name="postalCodeLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Postal Code"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="postalCodeTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JLabel" name="cityLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="City"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="cityTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JLabel" name="phoneLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Phone"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="phoneTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JLabel" name="privatePhoneLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Private Phone"/>
-                      </Properties>
-                      <AuxValues>
-                        <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
-                        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
-                      </AuxValues>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="privatePhoneTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JLabel" name="emailLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="email"/>
-                        <Property name="autoscrolls" type="boolean" value="true"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="emailTextField">
-                      <Properties>
-                        <Property name="columns" type="int" value="50"/>
-                        <Property name="editable" type="boolean" value="false"/>
-                      </Properties>
-                    </Component>
-                  </SubComponents>
-                </Container>
-              </SubComponents>
-            </Container>
-          </SubComponents>
-        </Container>
-        <Container class="javax.swing.JPanel" name="QueryPanel">
-          <Properties>
-            <Property name="toolTipText" type="java.lang.String" value="Search on one or more of the given constraints"/>
-            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[500, 300]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[500, 300]"/>
-            </Property>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Query" toolTip="change tree search">
-                <Property name="tabTitle" type="java.lang.String" value="Query"/>
-                <Property name="tabToolTip" type="java.lang.String" value="change tree search"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-            <Property name="useNullLayout" type="boolean" value="false"/>
-          </Layout>
-          <SubComponents>
-            <Component class="javax.swing.JLabel" name="searchNameLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Name"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="60" y="100" width="80" height="20"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="searchNameTextField">
-              <Properties>
-                <Property name="columns" type="int" value="50"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="150" y="100" width="220" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="searchAddressLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Address"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="60" y="120" width="110" height="20"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="searchAddressTextField">
-              <Properties>
-                <Property name="columns" type="int" value="50"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="150" y="120" width="220" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="serachCityLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="City"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="60" y="140" width="100" height="20"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="searchCityTextField">
-              <Properties>
-                <Property name="columns" type="int" value="50"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="150" y="140" width="220" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JButton" name="search">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Search"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="searchActionPerformed"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="150" y="200" width="90" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JButton" name="selectButton">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Select"/>
-                <Property name="toolTipText" type="java.lang.String" value="place the given selection in the different fields"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="selectButtonActionPerformed"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="500" y="240" width="-1" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JButton" name="clearButton">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Clear"/>
-                <Property name="toolTipText" type="java.lang.String" value="Celar the selection fields"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="clearButtonActionPerformed"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="250" y="200" width="90" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Container class="javax.swing.JScrollPane" name="jScrollPane2">
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="380" y="30" width="310" height="200"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JList" name="resultList">
-                  <Properties>
-                    <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                      <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
-                        <EtchetBorder/>
-                      </Border>
-                    </Property>
-                    <Property name="selectionMode" type="int" value="0"/>
-                    <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 200]"/>
-                    </Property>
-                    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 200]"/>
-                    </Property>
-                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[200, 400]"/>
-                    </Property>
-                  </Properties>
-                </Component>
-              </SubComponents>
-            </Container>
-          </SubComponents>
-        </Container>
-      </SubComponents>
-    </Container>
-    <Container class="javax.swing.JPanel" name="infoPanel">
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-          <BorderConstraints direction="Center"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
-      <SubComponents>
-        <Component class="javax.swing.JLabel" name="SelectedLabel">
-          <Properties>
-            <Property name="horizontalAlignment" type="int" value="4"/>
-            <Property name="text" type="java.lang.String" value="Selected"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="selectedTextField">
-          <Properties>
-            <Property name="columns" type="int" value="25"/>
-            <Property name="editable" type="boolean" value="false"/>
-            <Property name="text" type="java.lang.String" value="None"/>
-            <Property name="opaque" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
-  </SubComponents>
-</Form>
diff --git a/SAS/OTB/OTBTest/src/otbtest/otbgui.java b/SAS/OTB/OTBTest/src/otbtest/otbgui.java
deleted file mode 100644
index eaf64749777..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/otbgui.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/*
- * otbgui.java
- *
- * Created on April 26, 2005, 2:09 PM
- */
-
-package otbtest;
-
-import java.awt.List;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.rmi.Naming;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import javax.swing.JFileChooser;
-import javax.swing.tree.*;
-
-
-/**
- *
- * @author  Alex Gerdes & Arthur Coolen
- */
-
-
-public class otbgui extends javax.swing.JFrame {
-
-    DefaultMutableTreeNode root = new DefaultMutableTreeNode();
-    DefaultMutableTreeNode aNode= new DefaultMutableTreeNode();
-    
-    static ArrayList<String []> people;
-    String [] data;
-    String [] treeLine;
-    boolean isTreeFilled = false;
-    
-    /** Creates new form otbgui */
-    public otbgui() {
-        initComponents();
-    }
-
-    
-    
-    /** 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() {
-        javax.swing.JLabel privatePhoneLabel;
-
-        jTabbedPane2 = new javax.swing.JTabbedPane();
-        TreePanel = new javax.swing.JPanel();
-        treeScrollPane = new javax.swing.JScrollPane();
-        departmentTree = new javax.swing.JTree(root);
-        treeTabbedPane = new javax.swing.JTabbedPane();
-        SalarisPanel = new javax.swing.JPanel();
-        salaryLabel = new javax.swing.JLabel();
-        salaryTextField = new javax.swing.JTextField();
-        AddressPanel = new javax.swing.JPanel();
-        nameLabel = new javax.swing.JLabel();
-        nameTextField = new javax.swing.JTextField();
-        addressLabel = new javax.swing.JLabel();
-        addressTextField = new javax.swing.JTextField();
-        postalCodeLabel = new javax.swing.JLabel();
-        postalCodeTextField = new javax.swing.JTextField();
-        cityLabel = new javax.swing.JLabel();
-        cityTextField = new javax.swing.JTextField();
-        phoneLabel = new javax.swing.JLabel();
-        phoneTextField = new javax.swing.JTextField();
-        privatePhoneLabel = new javax.swing.JLabel();
-        privatePhoneTextField = new javax.swing.JTextField();
-        emailLabel = new javax.swing.JLabel();
-        emailTextField = new javax.swing.JTextField();
-        QueryPanel = new javax.swing.JPanel();
-        searchNameLabel = new javax.swing.JLabel();
-        searchNameTextField = new javax.swing.JTextField();
-        searchAddressLabel = new javax.swing.JLabel();
-        searchAddressTextField = new javax.swing.JTextField();
-        serachCityLabel = new javax.swing.JLabel();
-        searchCityTextField = new javax.swing.JTextField();
-        search = new javax.swing.JButton();
-        selectButton = new javax.swing.JButton();
-        clearButton = new javax.swing.JButton();
-        jScrollPane2 = new javax.swing.JScrollPane();
-        resultList = new javax.swing.JList();
-        infoPanel = new javax.swing.JPanel();
-        SelectedLabel = new javax.swing.JLabel();
-        selectedTextField = new javax.swing.JTextField();
-        jMenuBar1 = new javax.swing.JMenuBar();
-        jMenuFile = new javax.swing.JMenu();
-        jMenuFileExit = new javax.swing.JMenuItem();
-        MenuInput = new javax.swing.JMenu();
-        jMenuInputFile = new javax.swing.JMenuItem();
-        jMenuInputOTDB = new javax.swing.JMenuItem();
-
-        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-        setMaximizedBounds(new java.awt.Rectangle(0, 0, 1000, 400));
-        setName("mainFrame");
-        jTabbedPane2.setMinimumSize(new java.awt.Dimension(100, 300));
-        jTabbedPane2.setPreferredSize(new java.awt.Dimension(100, 300));
-        TreePanel.setLayout(new java.awt.BorderLayout());
-
-        departmentTree.setAutoscrolls(true);
-        departmentTree.setMinimumSize(new java.awt.Dimension(25, 72));
-        departmentTree.setShowsRootHandles(true);
-        departmentTree.setToggleClickCount(1);
-        departmentTree.addTreeSelectionListener(new javax.swing.event.TreeSelectionListener() {
-            public void valueChanged(javax.swing.event.TreeSelectionEvent evt) {
-                TreeSelectionListener(evt);
-            }
-        });
-
-        treeScrollPane.setViewportView(departmentTree);
-
-        TreePanel.add(treeScrollPane, java.awt.BorderLayout.WEST);
-
-        salaryLabel.setText("Salary");
-        salaryLabel.setRequestFocusEnabled(false);
-        SalarisPanel.add(salaryLabel);
-        salaryLabel.getAccessibleContext().setAccessibleName("SalarisLabel");
-
-        salaryTextField.setEditable(false);
-        salaryTextField.setText("0");
-        salaryTextField.setMinimumSize(new java.awt.Dimension(100, 19));
-        salaryTextField.setPreferredSize(new java.awt.Dimension(100, 19));
-        SalarisPanel.add(salaryTextField);
-
-        treeTabbedPane.addTab("Salary", null, SalarisPanel, "Show Salary");
-
-        AddressPanel.setLayout(new java.awt.GridLayout(7, 2));
-
-        nameLabel.setText("Name");
-        AddressPanel.add(nameLabel);
-
-        nameTextField.setColumns(50);
-        nameTextField.setEditable(false);
-        nameTextField.setMinimumSize(new java.awt.Dimension(100, 19));
-        AddressPanel.add(nameTextField);
-
-        addressLabel.setText("Address");
-        AddressPanel.add(addressLabel);
-
-        addressTextField.setColumns(50);
-        addressTextField.setEditable(false);
-        AddressPanel.add(addressTextField);
-
-        postalCodeLabel.setText("Postal Code");
-        AddressPanel.add(postalCodeLabel);
-
-        postalCodeTextField.setColumns(50);
-        postalCodeTextField.setEditable(false);
-        AddressPanel.add(postalCodeTextField);
-
-        cityLabel.setText("City");
-        AddressPanel.add(cityLabel);
-
-        cityTextField.setColumns(50);
-        cityTextField.setEditable(false);
-        AddressPanel.add(cityTextField);
-
-        phoneLabel.setText("Phone");
-        AddressPanel.add(phoneLabel);
-
-        phoneTextField.setColumns(50);
-        phoneTextField.setEditable(false);
-        AddressPanel.add(phoneTextField);
-
-        privatePhoneLabel.setText("Private Phone");
-        AddressPanel.add(privatePhoneLabel);
-
-        privatePhoneTextField.setColumns(50);
-        privatePhoneTextField.setEditable(false);
-        AddressPanel.add(privatePhoneTextField);
-
-        emailLabel.setText("email");
-        emailLabel.setAutoscrolls(true);
-        AddressPanel.add(emailLabel);
-
-        emailTextField.setColumns(50);
-        emailTextField.setEditable(false);
-        AddressPanel.add(emailTextField);
-
-        treeTabbedPane.addTab("Address", null, AddressPanel, "toon adresgegevens");
-
-        TreePanel.add(treeTabbedPane, java.awt.BorderLayout.CENTER);
-
-        jTabbedPane2.addTab("Tree", null, TreePanel, "Treeview");
-
-        QueryPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        QueryPanel.setToolTipText("Search on one or more of the given constraints");
-        QueryPanel.setMinimumSize(new java.awt.Dimension(500, 300));
-        QueryPanel.setPreferredSize(new java.awt.Dimension(500, 300));
-        searchNameLabel.setText("Name");
-        QueryPanel.add(searchNameLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(60, 100, 80, 20));
-
-        searchNameTextField.setColumns(50);
-        QueryPanel.add(searchNameTextField, new org.netbeans.lib.awtextra.AbsoluteConstraints(150, 100, 220, -1));
-
-        searchAddressLabel.setText("Address");
-        QueryPanel.add(searchAddressLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(60, 120, 110, 20));
-
-        searchAddressTextField.setColumns(50);
-        QueryPanel.add(searchAddressTextField, new org.netbeans.lib.awtextra.AbsoluteConstraints(150, 120, 220, -1));
-
-        serachCityLabel.setText("City");
-        QueryPanel.add(serachCityLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(60, 140, 100, 20));
-
-        searchCityTextField.setColumns(50);
-        QueryPanel.add(searchCityTextField, new org.netbeans.lib.awtextra.AbsoluteConstraints(150, 140, 220, -1));
-
-        search.setText("Search");
-        search.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                searchActionPerformed(evt);
-            }
-        });
-
-        QueryPanel.add(search, new org.netbeans.lib.awtextra.AbsoluteConstraints(150, 200, 90, -1));
-
-        selectButton.setText("Select");
-        selectButton.setToolTipText("place the given selection in the different fields");
-        selectButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                selectButtonActionPerformed(evt);
-            }
-        });
-
-        QueryPanel.add(selectButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(500, 240, -1, -1));
-
-        clearButton.setText("Clear");
-        clearButton.setToolTipText("Celar the selection fields");
-        clearButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                clearButtonActionPerformed(evt);
-            }
-        });
-
-        QueryPanel.add(clearButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 200, 90, -1));
-
-        resultList.setBorder(new javax.swing.border.EtchedBorder());
-        resultList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
-        resultList.setMaximumSize(new java.awt.Dimension(150, 200));
-        resultList.setMinimumSize(new java.awt.Dimension(150, 200));
-        resultList.setPreferredSize(new java.awt.Dimension(200, 400));
-        jScrollPane2.setViewportView(resultList);
-
-        QueryPanel.add(jScrollPane2, new org.netbeans.lib.awtextra.AbsoluteConstraints(380, 30, 310, 200));
-
-        jTabbedPane2.addTab("Query", null, QueryPanel, "change tree search");
-
-        getContentPane().add(jTabbedPane2, java.awt.BorderLayout.NORTH);
-        jTabbedPane2.getAccessibleContext().setAccessibleName("");
-
-        SelectedLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
-        SelectedLabel.setText("Selected");
-        infoPanel.add(SelectedLabel);
-
-        selectedTextField.setColumns(25);
-        selectedTextField.setEditable(false);
-        selectedTextField.setText("None");
-        selectedTextField.setOpaque(false);
-        infoPanel.add(selectedTextField);
-
-        getContentPane().add(infoPanel, java.awt.BorderLayout.CENTER);
-
-        jMenuFile.setToolTipText("File Menu");
-        jMenuFile.setLabel("File");
-        jMenuFileExit.setLabel("Exit");
-        jMenuFileExit.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuFileExitActionPerformed(evt);
-            }
-        });
-
-        jMenuFile.add(jMenuFileExit);
-
-        jMenuBar1.add(jMenuFile);
-
-        MenuInput.setText("Input");
-        MenuInput.setToolTipText("Input selection Menu");
-        jMenuInputFile.setText("File");
-        jMenuInputFile.setToolTipText("Set input to file");
-        jMenuInputFile.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuInputFileActionPerformed(evt);
-            }
-        });
-
-        MenuInput.add(jMenuInputFile);
-
-        jMenuInputOTDB.setText("OTDB");
-        jMenuInputOTDB.setToolTipText("Set input to file");
-        jMenuInputOTDB.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuInputOTDBActionPerformed(evt);
-            }
-        });
-
-        MenuInput.add(jMenuInputOTDB);
-
-        jMenuBar1.add(MenuInput);
-
-        setJMenuBar(jMenuBar1);
-
-        pack();
-    }
-    // </editor-fold>//GEN-END:initComponents
-
-    private void jMenuInputOTDBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuInputOTDBActionPerformed
-        clearAll();
-        if (getServerList()) {
-           isTreeFilled=fillTree();
-       } else {
-           System.out.println("Error getting RMI Access, tree not filled");
-       }
-
-    }//GEN-LAST:event_jMenuInputOTDBActionPerformed
-
-    public static boolean getServerList() {
-        try {
-//            navigatorRMI aRMIInterface = (navigatorRMI) Naming.lookup ("rmi://coole372.speed.planet.nl:10099/navigatorRMItje");
-//            navigatorRMI aRMIInterface = (navigatorRMI) Naming.lookup ("rmi://10.0.0.154:10099/navigatorRMItje");
-            navigatorRMI aRMIInterface = (navigatorRMI) Naming.lookup ("rmi://dop32.astron.nl:10099/navigatorRMItje");
-            people = aRMIInterface.getList();
-            System.out.println("People should be filled now");
-            return true;
-        } catch (Exception e) {
-            System.out.println ("navigatorRMI exception: " + e);
-            return false;
-        }        
-    }
-    private void jMenuInputFileActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuInputFileActionPerformed
-        // clear all fields
-        clearAll();
-        JFileChooser fc = new JFileChooser();
-        int returnVal = fc.showOpenDialog(otbgui.this);
-        if (returnVal == JFileChooser.APPROVE_OPTION) {
-            File aFile = fc.getSelectedFile();
-            readFile(aFile);
-            isTreeFilled=fillTree();
-        }         
-    }//GEN-LAST:event_jMenuInputFileActionPerformed
-
-    private void clearAll() {
-       // empty people
-       if (people != null) {
-          people.clear();
-       }
-       people = new ArrayList<String []>();
-       
-       root.removeAllChildren();
-       
-       clearSalaryForm();
-       clearAddressForm();
-       clearSearchForm();
-       clearInfoForm();
-       
-       isTreeFilled=false;
-       departmentTree.updateUI();
-    }
-    
-    private void clearSalaryForm() {
-       salaryTextField.setText("");
-       SalarisPanel.updateUI();
-    }
-    
-    private void clearAddressForm() {
-       nameTextField.setText("");
-       addressTextField.setText("");
-       postalCodeTextField.setText("");
-       cityTextField.setText("");
-       phoneTextField.setText("");
-       privatePhoneTextField.setText("");
-       emailTextField.setText("");
-       AddressPanel.updateUI();
-    }
-    
-    private void clearSearchForm() {
-        searchNameTextField.setText("");
-        searchAddressTextField.setText("");
-        searchCityTextField.setText("");
-        resultList.removeAll();
-        String aS[]={};
-        resultList.setListData(aS);
-        QueryPanel.updateUI();
-    }
-    
-    private void clearInfoForm() {
-        selectedTextField.setText("");
-        infoPanel.updateUI();
-    }
-    private void clearButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clearButtonActionPerformed
-        clearSearchForm();
-    }//GEN-LAST:event_clearButtonActionPerformed
-
-    private void searchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchActionPerformed
-         /* Look if fields are filled to search the database for */
-        String aName     = searchNameTextField.getText();
-        String anAddress = searchAddressTextField.getText();
-        String aCity     = searchCityTextField.getText();
-        String oldPerson = "";
-        Boolean found    = false;
-        Boolean contSearch = true;
-        List aList = new List(10,false);
-        
-        if (!isTreeFilled) {
-            System.out.println("First fill the treeview");
-            return;
-        }
-        
-        for (Iterator<String[]> iter = people.iterator(); iter.hasNext();) {
-
-            String [] data=iter.next();
-            String [] aS=data[0].split("[.]");
-            String aSearchType=data[1].split("[=]")[0];
-            String aSearchString=data[1].split("[=]")[1];
-                    
-            String aPerson=aS[aS.length-1];
-            
-            // if person changes reset all flags
-            if (!oldPerson.equals(aPerson)) {
-                if (found && contSearch) {
-                   aList.addItem(oldPerson);                    
-                }
-                oldPerson=aPerson;
-                found = false;
-                contSearch=true;
-            }
-            
-            // check if person matches are needed and if this person qualifies
-            if (aName.length() > 0  && contSearch) {
-                if (aPerson.contains(aName)) {
-                    found=true;
-                } else {
-                    found = false;
-                    contSearch = false;
-                }
-            }
-            
-            // check if address matches are needed and if this address qualifies
-            if (anAddress.length() > 0  && contSearch) {
-                if (aSearchType.equals("Address")){
-                   if (aSearchString.contains(anAddress)) {
-                      found=true;
-                   } else {
-                      found = false;
-                      contSearch = false;
-                   }
-                }
-            }
-
-            // check if city matches are needed and if this city qualifies
-            if (aCity.length() > 0  && contSearch) {
-                if (aSearchType.equals("City")) {
-                    if (aSearchString.contains(aCity)) {
-                       found=true;
-                    } else {
-                       found = false;
-                       contSearch = false;
-                    }
-                }
-            }
-        }
-        resultList.setListData(aList.getItems());
-    }//GEN-LAST:event_searchActionPerformed
-
-    
-    private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed
-        if (resultList.getSelectedIndex() > -1) {
-            changeSelection(resultList.getSelectedValue().toString());
-              // TODO 
-        }
-    }//GEN-LAST:event_selectButtonActionPerformed
-
-    private void TreeSelectionListener(javax.swing.event.TreeSelectionEvent evt) {//GEN-FIRST:event_TreeSelectionListener
-        TreePath tp = evt.getNewLeadSelectionPath();
-        if (tp != null) {
-            changeTreeSelection(tp.getLastPathComponent());
-        }
-    }//GEN-LAST:event_TreeSelectionListener
-
-    private void jMenuFileExitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuFileExitActionPerformed
-        System.exit(0);
-    }//GEN-LAST:event_jMenuFileExitActionPerformed
-    
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String args[]) {
-        java.awt.EventQueue.invokeLater(new Runnable() {
-            public void run() {
-                new otbgui().setVisible(true);
-            }
-        });
-    }
-    
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPanel AddressPanel;
-    private javax.swing.JMenu MenuInput;
-    private javax.swing.JPanel QueryPanel;
-    private javax.swing.JPanel SalarisPanel;
-    private javax.swing.JLabel SelectedLabel;
-    private javax.swing.JPanel TreePanel;
-    private javax.swing.JLabel addressLabel;
-    private javax.swing.JTextField addressTextField;
-    private javax.swing.JLabel cityLabel;
-    private javax.swing.JTextField cityTextField;
-    private javax.swing.JButton clearButton;
-    private javax.swing.JTree departmentTree;
-    private javax.swing.JLabel emailLabel;
-    private javax.swing.JTextField emailTextField;
-    private javax.swing.JPanel infoPanel;
-    private javax.swing.JMenuBar jMenuBar1;
-    private javax.swing.JMenu jMenuFile;
-    private javax.swing.JMenuItem jMenuFileExit;
-    private javax.swing.JMenuItem jMenuInputFile;
-    private javax.swing.JMenuItem jMenuInputOTDB;
-    private javax.swing.JScrollPane jScrollPane2;
-    private javax.swing.JTabbedPane jTabbedPane2;
-    private javax.swing.JLabel nameLabel;
-    private javax.swing.JTextField nameTextField;
-    private javax.swing.JLabel phoneLabel;
-    private javax.swing.JTextField phoneTextField;
-    private javax.swing.JLabel postalCodeLabel;
-    private javax.swing.JTextField postalCodeTextField;
-    private javax.swing.JTextField privatePhoneTextField;
-    private javax.swing.JList resultList;
-    private javax.swing.JLabel salaryLabel;
-    private javax.swing.JTextField salaryTextField;
-    private javax.swing.JButton search;
-    private javax.swing.JLabel searchAddressLabel;
-    private javax.swing.JTextField searchAddressTextField;
-    private javax.swing.JTextField searchCityTextField;
-    private javax.swing.JLabel searchNameLabel;
-    private javax.swing.JTextField searchNameTextField;
-    private javax.swing.JButton selectButton;
-    private javax.swing.JTextField selectedTextField;
-    private javax.swing.JLabel serachCityLabel;
-    private javax.swing.JScrollPane treeScrollPane;
-    private javax.swing.JTabbedPane treeTabbedPane;
-    // End of variables declaration//GEN-END:variables
-    
-    private boolean fillTree() {
-        boolean status = false;
-        boolean skip = false;
-        String lastName="";
-        
-        String aTreeLevelName="";
-        status = true;
-        /** 
-         *fill the treeview. In this case from the array, but later it can be a file or database
-         *
-         */
-       
-        for (Iterator<String[]> iter = people.iterator(); iter.hasNext();) {                      
-           // data contains every single new line from the inputfile
-           data=iter.next();
-           // treeLine contains the usenet Treelist
-           treeLine = data[0].split("[.]");
-           if (aTreeLevelName == "") {
-              root.setUserObject(new DefaultMutableTreeNode(treeLine[0]));
-              aTreeLevelName=treeLine[0];
-           }
-           
-           
-           aNode = root;
-           DefaultMutableTreeNode oldNode = aNode;              
-
-           if (! treeLine[treeLine.length-1].equals(lastName)) {
-              for (int i=1; i < treeLine.length;i++) {
-                 if (!findChild(aNode, treeLine[i])){
-                    aNode = new DefaultMutableTreeNode(treeLine[i]);
-                    oldNode.add(aNode);
-                 }
-                 oldNode=aNode;
-              }
-              lastName=treeLine[treeLine.length-1];
-           }
-        }
-        departmentTree.updateUI();
-        return status;
-    }
-    
-    boolean findChild(DefaultMutableTreeNode aRoot, String aName){
-        Enumeration e = aRoot.children();
-        DefaultMutableTreeNode aNewNode;
-        while (e.hasMoreElements()){
-           aNewNode= (DefaultMutableTreeNode)e.nextElement();
-           if (aNewNode.getUserObject().toString().equals(aName)) {
-               aNode=aNewNode;
-               return true;
-           }
-        }
-        return false;
-    }
-    
-    private void changeTreeSelection(Object aO) {
-        String aS = aO.toString();
-        changeSelection(aS);
-    }
-    
-    private void changeSelection(String aPerson){
-        boolean found = false;
-        
-        // No reason to do this when Tree is not filled yet anyway
-        if (! isTreeFilled) return;
-        
-        //find arrayindex that contains this person
-        Enumeration e = ((DefaultMutableTreeNode)departmentTree.getModel().getRoot()).breadthFirstEnumeration();
-        
-        DefaultMutableTreeNode aFoundNode;
-        boolean personDone=false;
-        while (e.hasMoreElements()) {
-            aFoundNode=(DefaultMutableTreeNode)e.nextElement();
-            if (aFoundNode.getUserObject().toString().equals(aPerson) && aFoundNode.isLeaf()) {
-                for (Iterator<String []>  iter = people.iterator(); iter.hasNext();) {
-                    String [] data=iter.next();
-                    String [] aS=data[0].split("[.]");
-                    if (aPerson.equals(aS[aS.length-1])){
-                        if (!personDone){
-                            personDone=true;
-                            changePerson(aPerson);
-                        }
-                        String [] aTarget=data[1].split("[=]");
-                        changeTextField(aTarget);
-                    }
-                 }
-                 selectedTextField.setText(aPerson);
-                 selectedTextField.setColumns(aPerson.length());
-                 selectedTextField.updateUI();
-                 
-                 found = true;
-                 TreePath aTreePath = new TreePath(aFoundNode.getPath());
-                 departmentTree.scrollPathToVisible(aTreePath);
-                 departmentTree.expandPath(aTreePath);
-                 departmentTree.setSelectionPath(aTreePath);
-            }
-        }
-    }
-
-    private void changeTextField(String [] aS) {
-        aS[1]=aS[1].replaceAll("\"","");
-        if (aS[0].equals("Salary")) {
-            changeSalary(aS[1]);
-        } else if (aS[0].equals("Address")) {
-            changeAddress(aS[1]);
-        } else if (aS[0].equals("PostalCode")) {
-            changePostalCode(aS[1]);
-        } else if (aS[0].equals("City")) {
-            changeCity(aS[1]);
-        } else if (aS[0].equals("WorkPhone")) {
-            changeWorkPhone(aS[1]);
-        } else if (aS[0].equals("PrivatePhone")) {
-            changePrivatePhone(aS[1]);
-        } else if (aS[0].equals("Email")) {
-            changeEmail(aS[1]);
-        } else {
-            System.out.println("Unknown target in list: "+aS[0]);
-        }
-
-    }
-
-    private void changeSalary(String data){
-        salaryTextField.setText(data);
-    }
-   
-    private void changePerson(String data){
-        nameTextField.setText(data);
-    }
-    private void changeAddress(String data){
-        addressTextField.setText(data);
-    }
-    private void changePostalCode(String data){
-        postalCodeTextField.setText(data);
-    }
-    private void changeCity(String data){
-        cityTextField.setText(data);
-    }
-    private void changeWorkPhone(String data){
-        phoneTextField.setText(data);
-    }
-    private void changePrivatePhone(String data){
-        privatePhoneTextField.setText(data);
-    }
-    
-    private void changeEmail(String data){
-        emailTextField.setText(data);
-    }
-    
-   
-    private boolean readFile(File aFile){
-        people.clear();
-        boolean status=true;
-        try {
-            BufferedReader in = new BufferedReader(new FileReader(aFile));
-            String aStr;
-            while ((aStr = in.readLine()) != null) {
-                status=processLine(aStr);
-            }
-            in.close();        
-        } catch (IOException e) {
-            System.out.println("Error reading from file: "+aFile.getName());
-            e.printStackTrace();
-            status=false;
-        }
-        return status;
-    }
-
-    private boolean processLine(String aStr){
-     boolean status = true;
-     // find the last aaa="bbb" combination
-     String [] aS1 = aStr.split("[=]");
-     String [] aS2 = aS1[0].split("[.]");
-     
-     String [] saveString= new String[2];
-     for (int i=0; i< aS2.length-1;i++) {
-         if (i>0) {
-             saveString[0]+="."+aS2[i];
-         } else {
-             saveString[0]=aS2[i];
-         }
-     }
-     saveString[1]=aS2[aS2.length-1]+"="+aS1[1];
-     saveString[0]=saveString[0].replace('_',' ');
-     saveString[1]=saveString[1].replace('_',' ');
-     people.add(saveString);
-     
-     
-     return status;
-    }
-}
diff --git a/SAS/OTB/OTBTest/src/otbtest/personeel.lijst b/SAS/OTB/OTBTest/src/otbtest/personeel.lijst
deleted file mode 100644
index a88589b41bf..00000000000
--- a/SAS/OTB/OTBTest/src/otbtest/personeel.lijst
+++ /dev/null
@@ -1,105 +0,0 @@
-Departments.Administration.Cees_Boon.Salary="1500"
-Departments.Administration.Cees_Boon.Address="Randervoordestraat 6"
-Departments.Administration.Cees_Boon.PostalCode="7906HM"
-Departments.Administration.Cees_Boon.City="Hoogeveen"
-Departments.Administration.Cees_Boon.WorkPhone="0521-595117"
-Departments.Administration.Cees_Boon.PrivatePhone="0528-268049"
-Departments.Administration.Cees_Boon.Email="boon@astron.nl"
-Departments.Administration.Jaap_van_de_Spreng.Salary="1600"
-Departments.Administration.Jaap_van_de_Spreng.Address="Veenwijksweg 17"
-Departments.Administration.Jaap_van_de_Spreng.PostalCode="8427RS"
-Departments.Administration.Jaap_van_de_Spreng.City="Ravenswoud"
-Departments.Administration.Jaap_van_de_Spreng.WorkPhone="0521-595130"
-Departments.Administration.Jaap_van_de_Spreng.PrivatePhone="0516-433364"
-Departments.Administration.Jaap_van_de_Spreng.Email="spreng@astron.nl"
-Departments.Administration.Thijs_Zanders.Salary="1600"
-Departments.Administration.Thijs_Zanders.Address="Alexander Dubcekweg 49"
-Departments.Administration.Thijs_Zanders.PostalCode="9403XB"
-Departments.Administration.Thijs_Zanders.City="Assen"
-Departments.Administration.Thijs_Zanders.WorkPhone="0521-595148"
-Departments.Administration.Thijs_Zanders.PrivatePhone="06-55707136"
-Departments.Administration.Thijs_Zanders.Email="zanders@astron.nl"
-Departments.ICT.Chris_Broekema.Salary="2000"
-Departments.ICT.Chris_Broekema.Address="Aquamarijnstraat 309"
-Departments.ICT.Chris_Broekema.PostalCode="9743PH"
-Departments.ICT.Chris_Broekema.City="Groningen"
-Departments.ICT.Chris_Broekema.WorkPhone="0521-595215"
-Departments.ICT.Chris_Broekema.PrivatePhone="050-5714258"
-Departments.ICT.Chris_Broekema.Email="broekema@astron.nl"
-Departments.ICT.Arthur_Coolen.Salary="1900"
-Departments.ICT.Arthur_Coolen.Address="Hoofdstraat 78"
-Departments.ICT.Arthur_Coolen.PostalCode="9635AW"
-Departments.ICT.Arthur_Coolen.City="Noordbroek"
-Departments.ICT.Arthur_Coolen.WorkPhone="0521-595292"
-Departments.ICT.Arthur_Coolen.PrivatePhone="0598-451712"
-Departments.ICT.Arthur_Coolen.Email="coolen@astron.nl"
-Departments.ICT.Ger_van_Diepen.Salary="2200"
-Departments.ICT.Ger_van_Diepen.Address="Moleneinde 25"
-Departments.ICT.Ger_van_Diepen.PostalCode="7981AM"
-Departments.ICT.Ger_van_Diepen.City="Diever"
-Departments.ICT.Ger_van_Diepen.WorkPhone="0521-595241"
-Departments.ICT.Ger_van_Diepen.PrivatePhone="0521-592729"
-Departments.ICT.Ger_van_Diepen.Email="diepen@astron.nl"
-Departments.ICT.Alex_Gerdes.Salary="2100"
-Departments.ICT.Alex_Gerdes.Address="Westermaten 3"
-Departments.ICT.Alex_Gerdes.PostalCode="7854TS"
-Departments.ICT.Alex_Gerdes.City="Aalden"
-Departments.ICT.Alex_Gerdes.WorkPhone="0521-595272"
-Departments.ICT.Alex_Gerdes.PrivatePhone="0591-610421"
-Departments.ICT.Alex_Gerdes.Email="gerdes@astron.nl"
-Departments.ICT.Management.Marcel_Loose.Salary="2200"
-Departments.ICT.Management.Marcel_Loose.Address="De Goorn 58"
-Departments.ICT.Management.Marcel_Loose.PostalCode="7975BT"
-Departments.ICT.Management.Marcel_Loose.City="Uffelte"
-Departments.ICT.Management.Marcel_Loose.WorkPhone="0521-595243"
-Departments.ICT.Management.Marcel_Loose.PrivatePhone="0521-343338"
-Departments.ICT.Management.Marcel_Loose.Email="loose@astron.nl"
-Departments.ICT.Management.Ellen_van_Meijeren.Salary="2300"
-Departments.ICT.Management.Ellen_van_Meijeren.Address="Tiendweg West 2c"
-Departments.ICT.Management.Ellen_van_Meijeren.PostalCode="2941EP"
-Departments.ICT.Management.Ellen_van_Meijeren.City="Lekkerkerk"
-Departments.ICT.Management.Ellen_van_Meijeren.WorkPhone="0521-595265"
-Departments.ICT.Management.Ellen_van_Meijeren.PrivatePhone="06-29522776"
-Departments.ICT.Management.Ellen_van_Meijeren.Email="meijeren@astron.nl"
-Departments.Technical_Lab.Dion_Kant.Salary="2300"
-Departments.Technical_Lab.Dion_Kant.Address="de Stelling 48"
-Departments.Technical_Lab.Dion_Kant.PostalCode="8391ME"
-Departments.Technical_Lab.Dion_Kant.City="Noordwolde"
-Departments.Technical_Lab.Dion_Kant.WorkPhone="0521-595139"
-Departments.Technical_Lab.Dion_Kant.PrivatePhone="0561-431826"
-Departments.Technical_Lab.Dion_Kant.Email="kant@astron.nl"
-Departments.Technical_Lab.Gaby_Kroes.Salary="2100"
-Departments.Technical_Lab.Gaby_Kroes.Address="Korenmolen 20"
-Departments.Technical_Lab.Gaby_Kroes.PostalCode="9203VA"
-Departments.Technical_Lab.Gaby_Kroes.City="Drachten"
-Departments.Technical_Lab.Gaby_Kroes.WorkPhone="0521-595176"
-Departments.Technical_Lab.Gaby_Kroes.PrivatePhone="0512-518729"
-Departments.Technical_Lab.Gaby_Kroes.Email="kroes@astron.nl"
-Departments.Technical_Lab.Jan_Nijboer.Salary="1900"
-Departments.Technical_Lab.Jan_Nijboer.Address="Achterdiep NZ 29"
-Departments.Technical_Lab.Jan_Nijboer.PostalCode="9611BT"
-Departments.Technical_Lab.Jan_Nijboer.City="Sappemeer"
-Departments.Technical_Lab.Jan_Nijboer.WorkPhone="0521-595177"
-Departments.Technical_Lab.Jan_Nijboer.PrivatePhone="0598-398722"
-Departments.Technical_Lab.Jan_Nijboer.Email="nijboer@astron.nl"
-Departments.System_Management.Jan_Slagter.Salary="1800"
-Departments.System_Management.Jan_Slagter.Address="Bovenboer 18"
-Departments.System_Management.Jan_Slagter.PostalCode="7924PT"
-Departments.System_Management.Jan_Slagter.City="Veeningen"
-Departments.System_Management.Jan_Slagter.WorkPhone="0521-595238"
-Departments.System_Management.Jan_Slagter.PrivatePhone="0528-391570"
-Departments.System_Management.Jan_Slagter.Email="slagter@astron.nl"
-Departments.System_Management.Klaas_Stuurwold.Salary="2100"
-Departments.System_Management.Klaas_Stuurwold.Address="De Stroom 48"
-Departments.System_Management.Klaas_Stuurwold.PostalCode="9411MA"
-Departments.System_Management.Klaas_Stuurwold.City="Beilen"
-Departments.System_Management.Klaas_Stuurwold.WorkPhone="0521-595231"
-Departments.System_Management.Klaas_Stuurwold.PrivatePhone="0593-541930"
-Departments.System_Management.Klaas_Stuurwold.Email="stuurwold@astron.nl"
-Departments.System_Management.Management.Roelof_Boesenkool.Salary="2500"
-Departments.System_Management.Management.Roelof_Boesenkool.Address="Elzenhage 15"
-Departments.System_Management.Management.Roelof_Boesenkool.PostalCode="7943MA"
-Departments.System_Management.Management.Roelof_Boesenkool.City="Meppel"
-Departments.System_Management.Management.Roelof_Boesenkool.WorkPhone="0521-5952434"
-Departments.System_Management.Management.Roelof_Boesenkool.PrivatePhone="0522-244033"
-Departments.System_Management.Management.Roelof_Boesenkool.Email="boesenkool@astron.nl"
\ No newline at end of file
diff --git a/SAS/OTB/OTBTest/test/Makefile.am b/SAS/OTB/OTBTest/test/Makefile.am
deleted file mode 100644
index 80b078babfc..00000000000
--- a/SAS/OTB/OTBTest/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-TESTS	              =
-
-XFAIL_TESTS           =
-
-
-TESTS_ENVIRONMENT     = lofar_sharedir=$(lofar_sharedir)
-
-
-include $(top_srcdir)/Makefile.common
-- 
GitLab