Bug 1702: Removed directories jOTDB2 and MoM-OTDB-adapter and adapt CMakeLists.txt

.gitattributes

@@ -2382,66 +2382,6 @@ RTCP/Storage/src/MeasurementSetFormat.cc -text
 RTCP/Storage/src/OutputThread.cc -text
 RTCP/Storage/test/tDAL_HDF5.cc -text
 RTCP/Storage/test/tMeasurementSetFormat.parset -text
-SAS/OTB/MoM-OTDB-adapter/.cvsignore -text
-SAS/OTB/MoM-OTDB-adapter/.euml2 -text
-SAS/OTB/MoM-OTDB-adapter/.umlproject -text
-SAS/OTB/MoM-OTDB-adapter/config/config.xml -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/conf/config-otdb.xml -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/conf/config-stub.xml -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/conf/log4j.properties -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/keystores/adapter_lofar17_nfra_nl.cer -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/keystores/mom-otdb-adapter-keystore.jks -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/keystores/mom-otdb-adapter-trusted-keystore.jks -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/keystores/mom-otdb-adapter.cer -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/mom-otdb-adapter.bat -text
-SAS/OTB/MoM-OTDB-adapter/dist-sources/mom-otdb-adapter.sh -text
-SAS/OTB/MoM-OTDB-adapter/examples/mom-otdb-adapter-keystore.jks -text
-SAS/OTB/MoM-OTDB-adapter/examples/mom-otdb-adapter-trusted-keystore.jks -text
-SAS/OTB/MoM-OTDB-adapter/examples/mom-otdb-adapter.cer -text
-SAS/OTB/MoM-OTDB-adapter/examples/obs-50-active.xml -text
-SAS/OTB/MoM-OTDB-adapter/examples/obs-50-specified.xml -text
-SAS/OTB/MoM-OTDB-adapter/examples/obs-52-active.xml -text
-SAS/OTB/MoM-OTDB-adapter/examples/obs-52-finished.xml -text
-SAS/OTB/MoM-OTDB-adapter/examples/obs-52-specified.xml -text
-SAS/OTB/MoM-OTDB-adapter/lib/astron-http-utils.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/astron-utils.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/commons-codec-1.3.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/commons-logging.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/commons-validator.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/httpclient-4.0-beta2.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/httpcore-4.0.1.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/httpcore-nio-4.0.1.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/httpmime-4.0-beta2.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/log4j-1.2.15.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/mail.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/xercesImpl-2.8.1.jar -text
-SAS/OTB/MoM-OTDB-adapter/lib/xml-apis-1.3.03.jar -text
-SAS/OTB/MoM-OTDB-adapter/sharedlib/jOTDB2.jar -text
-SAS/OTB/MoM-OTDB-adapter/src/config.xsd -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/AdapterConfiguration.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/ConfigXMLParser.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/Configuration.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/Mom2Configuration.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/OTDBConfiguration.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/RepositoryConfiguration.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/config/StubConfiguration.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/data/Beam.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/data/Repository.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/data/RepositoryException.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/data/StubRepository.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/mom2listener/HttpServer.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/mom2listener/Mom2HttpRequestHandler.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/util/AbstractThread.java -text
-SAS/OTB/MoM-OTDB-adapter/src/nl/astron/lofar/odtb/mom2otdbadapter/util/XMLConstants.java -text
-SAS/OTB/MoM-OTDB-adapter/src/schemas/LofarMoM2.xsd -text
-SAS/OTB/MoM-OTDB-adapter/src/schemas/MoM2.xsd -text
-SAS/OTB/MoM-OTDB-adapter/test/nl/astron/lofar/odtb/mom2otdbadapter/data/OTDBRepositoryTest.java -text
-SAS/OTB/MoM-OTDB-adapter/test/nl/astron/lofar/odtb/mom2otdbadapter/mom2listener/Client.java -text
-SAS/OTB/MoM-OTDB-adapter/test/nl/astron/lofar/odtb/mom2otdbadapter/mom2listener/HttpServerTest.java -text
-SAS/OTB/MoM-OTDB-adapter/test/nl/astron/lofar/odtb/mom2otdbadapter/mom2listener/XMLParserTest.java -text
-SAS/OTB/MoM-OTDB-adapter/test/nl/astron/lofar/odtb/mom2otdbadapter/otdblistener/XMLGeneratorTest.java -text
-SAS/OTB/MoM-OTDB-adapter/uml/MoM-OTDB-adapter.usd -text
-SAS/OTB/MoM-OTDB-adapter/uml/momlistener.usd -text
 SAS/OTB/OTB/conf/ParmDBConfiguration.xml -text
 SAS/OTB/OTB/conf/Plotter-config-plottertest.jar -text
 SAS/OTB/OTB/doc/OTB.EAP -text
@@ -2523,16 +2463,6 @@ SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gi
 SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif -text
 SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.form -text
 SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.form -text
-SAS/OTB/jOTDB2/.cvsignore -text
-SAS/OTB/jOTDB2/include/jOTDB2/nl_astron_lofar_sas_otb_jotdb2_jCampaign.h -text
-SAS/OTB/jOTDB2/make_jar.sh -text svneol=native#application/octet-stream
-SAS/OTB/jOTDB2/src/nl/astron/lofar/sas/otb/jotdb2/jCampaign.java -text
-SAS/OTB/jOTDB2/src/nl/astron/lofar/sas/otb/jotdb2/jCampaignAdapter.java -text
-SAS/OTB/jOTDB2/src/nl/astron/lofar/sas/otb/jotdb2/jCampaignInfo.java -text
-SAS/OTB/jOTDB2/src/nl/astron/lofar/sas/otb/jotdb2/jCampaignInterface.java -text
-SAS/OTB/jOTDB2/src/nl_astron_lofar_sas_otb_jotdb2_jCampaign.cc -text
-SAS/OTB/jOTDB2/test/tCampaign.java -text
-SAS/OTB/jOTDB2/test/testStates.java -text
 SAS/OTB/jOTDB3/CMakeLists.txt -text
 SAS/OTB/jOTDB3/build.xml -text
 SAS/OTB/jOTDB3/include/jOTDB3/CMakeLists.txt -text

.gitignore

@@ -262,17 +262,9 @@ RTCP/Run/lofarconf
 RTCP/Storage/Makefile.common
 RTCP/Storage/autoconf_share
 RTCP/Storage/lofarconf
-SAS/OTB/MoM-OTDB-adapter/bin
-SAS/OTB/MoM-OTDB-adapter/tasks
 SAS/OTB/OTB/build
 SAS/OTB/OTB/dist
 SAS/OTB/OTB/nbproject
-SAS/OTB/jOTDB2/Makefile.common
-SAS/OTB/jOTDB2/autoconf_share
-SAS/OTB/jOTDB2/build
-SAS/OTB/jOTDB2/dist
-SAS/OTB/jOTDB2/lofarconf
-SAS/OTB/jOTDB2/nbproject
 SAS/OTB/jOTDB3/build
 SAS/OTB/jOTDB3/dist
 SAS/OTB/nbproject

SAS/OTB/CMakeLists.txt

 # $Id$
 
-lofar_add_package(jOTDB2)
 lofar_add_package(jOTDB3)
 add_subdirectory(scripts)
 

SAS/OTB/MoM-OTDB-adapter/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/commons-validator.jar"/>
-	<classpathentry kind="lib" path="sharedlib/jOTDB2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/astron-http-utils.jar"/>
-	<classpathentry kind="lib" path="lib/astron-utils.jar"/>
-	<classpathentry kind="lib" path="lib/httpclient-4.0-beta2.jar"/>
-	<classpathentry kind="lib" path="lib/httpcore-4.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/httpcore-nio-4.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/httpmime-4.0-beta2.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/xercesImpl-2.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/xml-apis-1.3.03.jar"/>
-	<classpathentry kind="lib" path="lib/mail.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

SAS/OTB/MoM-OTDB-adapter/.cvsignore

-bin
-tasks

SAS/OTB/MoM-OTDB-adapter/.euml2

-<?xml version="1.0" encoding="ASCII"?>
-<properties:ProjectDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:properties="properties.xmi" modelDir="" libraryDir="" profileDir="" templateDir="">
-  <profiles id="org.eclipse.uml2.uml.resources.StandardProfile" description="Standard Profile" uri="platform:/plugin/org.eclipse.uml2.uml.resources/profiles/Standard.profile.uml" exported="false" kind="system"/>
-  <profiles id="com.soyatec.uml.JavaProfile" description="Java Profile" uri="platform:/plugin/com.soyatec.core/profiles/Java.profile.uml" exported="false" kind="system"/>
-  <profiles id="com.soyatec.uml.SoyatecProfile" description="Soyatec Profile" uri="platform:/plugin/com.soyatec.core/profiles/Soyatec.profile.uml" exported="false" kind="system"/>
-  <profiles id="com.soyatec.uml.ArchetypeProfile" description="Archetype Profile" uri="platform:/plugin/com.soyatec.core/profiles/Archetype.profile.uml" exported="false" kind="system"/>
-</properties:ProjectDescription>

SAS/OTB/MoM-OTDB-adapter/.project

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MoM-OTDB-adapter</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

SAS/OTB/MoM-OTDB-adapter/.umlproject

-<?xml version="1.0" encoding="ASCII"?>
-<properties:ProjectDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:properties="properties.xmi" modelDir="" libraryDir="" profileDir="" templateDir="">
-  <profiles id="org.eclipse.uml2.uml.resources.StandardProfile" description="Standard Profile" uri="platform:/plugin/org.eclipse.uml2.uml.resources/profiles/Standard.profile.uml" exported="false" kind="system"/>
-  <profiles id="com.soyatec.uml.JavaProfile" description="Java Profile" uri="platform:/plugin/com.soyatec.core/profiles/Java.profile.uml" exported="false" kind="system"/>
-  <profiles id="com.soyatec.uml.SoyatecProfile" description="Soyatec Profile" uri="platform:/plugin/com.soyatec.core/profiles/Soyatec.profile.uml" exported="false" kind="system"/>
-  <profiles id="com.soyatec.uml.ArchetypeProfile" description="Archetype Profile" uri="platform:/plugin/com.soyatec.core/profiles/Archetype.profile.uml" exported="false" kind="system"/>
-</properties:ProjectDescription>

SAS/OTB/MoM-OTDB-adapter/build/build.xml

-<?xml version = '1.0' encoding = 'windows-1252'?>
-
-<project name="ant" default="jar" basedir=".">
-
-	<property name="projectDir" value=".." />	
-	<property name="buildDir" value="${projectDir}/build" />
-	<property name="destinationDir" value="${buildDir}/dist" />	
-	<property name="libDir" value="${destinationDir}/lib" />
-	<property name="srcDir" value="${projectDir}/src" />
-	<property name="classesDir" value="${destinationDir}/classes" />
-	<property name="jarFile" value="${destinationDir}/mom-otdb-adapter.jar" />
-
-	<property name="main.class" value="nl.astron.lofar.odtb.mom2otdbadapter.MomOtdbAdapter" />
-
-	<path id="classpath">
-		<fileset dir="${libDir}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-
-	<target name="init">
-		<tstamp>
-			<format property="TIMEDATE" pattern="hh:mm d-MM-yyyy" />
-		</tstamp>
-		<echo message="Current time and date = ${TIMEDATE}" />
-	</target>
-
-	<target name="prepare" depends="init">
-		<delete dir="${destinationDir}" />
-		<mkdir dir="${destinationDir}" />		
-		<mkdir dir="${libDir}" />
-		<mkdir dir="${classesDir}" />
-		<mkdir dir="${destinationDir}/logs" />
-		<copy todir="${libDir}">
-			<fileset dir="${projectDir}/lib">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${projectDir}/sharedlib">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
-			<copy todir="${destinationDir}">
-				<fileset dir="${projectDir}/dist-sources"/>
-			</copy>		
-	</target>
-
-
-	<target name="compile" depends="prepare">
-		<javac srcdir="${srcDir}" destdir="${classesDir}" debug="on" excludes="test/**">
-			<classpath refid="classpath" />
-		</javac>
-		<copy todir="${classesDir}">
-			<fileset dir="${srcDir}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="jar" depends="compile">
-		<manifestclasspath property="jar.classpath" jarfile="${jarFile}">
-			<classpath refid="classpath" />
-		</manifestclasspath>
-		<jar destfile="${jarFile}" basedir="${classesDir}">
-			<manifest>
-				<attribute name="Main-Class" value="${main.class}" />
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Class-Path" value="${jar.classpath}" />
-			</manifest>
-		</jar>
-		<delete dir="${classesDir}" />
-	</target>
-
-</project>
-
-

SAS/OTB/MoM-OTDB-adapter/config/config.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<config:config xmlns:config="http://www.astron.nl/MoM-OTDB-adapter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.astron.nl/MoM-OTDB-adapter config.xsd ">
-	<config:mom2>
-		<config:username>momotdbadapter</config:username>
-		<config:password>momotdbadapter</config:password>
-		<config:authurl>http://localhost:8080/useradministration</config:authurl>
-		<config:mom2-import-url>http://localhost:8080/mom3/interface/importXML2.do</config:mom2-import-url>
-		<config:mom2-schemas-url>http://localhost:8080/mom3/schemas/</config:mom2-schemas-url>
-	</config:mom2>
-	<config:stub>
-		<config:interval>5</config:interval>
-	</config:stub>
-	<config:adapter>
-		<config:httpport>8081</config:httpport>
-		<config:keystore-location>c:/mom-otdb-adapter-keystore.jks</config:keystore-location>
-		<config:keystore-password>adapter</config:keystore-password>
-		<config:trusted-keystore-location>c:/mom-otdb-adapter-trusted-keystore.jks</config:trusted-keystore-location>
-		<config:trusted-keystore-password>adapter-trusted</config:trusted-keystore-password>
-	</config:adapter>
-</config:config>

SAS/OTB/MoM-OTDB-adapter/dist-sources/conf/config-otdb.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<config:config xmlns:config="http://www.astron.nl/MoM-OTDB-adapter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.astron.nl/MoM-OTDB-adapter ../src/config.xsd ">
-	<!-- Section to configure the communication with MoM -->
-	<config:mom2>
-		<!-- The MoM-OTDB-adapter logs in with this given username/password. -->
-		<config:username>momotdbadapter</config:username>
-		<config:password>momotdbadapter</config:password>
-		<!-- The URL where the MoM-OTDB-adapter logs in. -->
-		<config:authurl>http://momhost:8080/useradministration</config:authurl>
-		<!-- The import XML URL of MoM -->
-		<config:mom2-import-url>http://momhost:8080/mom3/interface/importXML2.do</config:mom2-import-url>
-		<!-- The MoM schema's URL. This is not for validation of xml files in the MoM-OTDB-adapter. 
-			Validation of the xml files are agains the schemas in the jar.  
-			This URL is only used for generating xml files for the MoM import.
-			So if there are errors you can use it in eclipse with validition enabled-->
-		<config:mom2-schemas-url>http://momhost:8080/mom3/schemas/</config:mom2-schemas-url>
-	</config:mom2>
-	<!-- Section to configure the communication with OTDB -->
-	<config:otdb>
-		<!-- Interval in seconds that the MoM-OTDB-adapter checks OTDB for changes. Do not put this lower then 3 seconds. -->
-		<config:interval>5</config:interval>
-		<!-- Template ID for the UV Observation. This ID must be exists in OTDB.  -->
-		<config:uvObservationTemplateId>5001</config:uvObservationTemplateId>
-		<!-- RMI host of OTDB -->
-		<config:rmihost>lofar17.astron.nl</config:rmihost>
-		<!-- RMI port of OTDB -->
-		<config:rmiport>10399</config:rmiport>
-	</config:otdb>
-	<!-- Section to configure the MoM-OTDB-adapter -->
-	<config:adapter>
-		<!-- Port where the HTTP server of MoM-OTDB-adapter should run -->
-		<config:httpport>8082</config:httpport>
-		<!-- Keystore file for MoM-OTDB-adapter. This file should contain the MoM-OTDB-adapter public/private key -->
-		<config:keystore-location>./keystores/mom-otdb-adapter-keystore.jks</config:keystore-location>
-		<!-- Password of the Keystore file for MoM-OTDB-adapter.  -->
-		<config:keystore-password>adapter</config:keystore-password>
-		<!-- Trusted Keystore file for MoM-OTDB-adapter. This file should contain all client public keys -->
-		<config:trusted-keystore-location>./keystores/mom-otdb-adapter-trusted-keystore.jks</config:trusted-keystore-location>
-		<!-- Password of the Trusted Keystore file for MoM-OTDB-adapter.  -->
-		<config:trusted-keystore-password>adapter-trusted</config:trusted-keystore-password>
-	</config:adapter>
-</config:config>

SAS/OTB/MoM-OTDB-adapter/dist-sources/conf/config-stub.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<config:config xmlns:config="http://www.astron.nl/MoM-OTDB-adapter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.astron.nl/MoM-OTDB-adapter config.xsd ">
-	<!-- Section to configure the communication with MoM -->
-	<config:mom2>
-		<!-- The MoM-OTDB-adapter logs in with this given username/password. -->
-		<config:username>momotdbadapter</config:username>
-		<config:password>momotdbadapter</config:password>
-		<!-- The URL where the MoM-OTDB-adapter logs in. -->
-		<config:authurl>http://momhost:8080/useradministration</config:authurl>
-		<!-- The import XML URL of MoM -->
-		<config:mom2-import-url>http://momhost:8080/mom3/interface/importXML2.do</config:mom2-import-url>
-		<!-- The MoM schema's URL. This is not for validation of xml files in the MoM-OTDB-adapter. 
-			Validation of the xml files are agains the schemas in the jar.  
-			This URL is only used for generating xml files for the MoM import.
-			So if there are errors you can use it in eclipse with validition enabled-->
-		<config:mom2-schemas-url>http://momhost:8080/mom3/schemas/</config:mom2-schemas-url>
-	</config:mom2>
-	<!-- Section to configure the communication with the Stub -->
-	<config:stub>
-		<!-- Interval in seconds that the MoM-OTDB-adapter checks Stub for changes. Do not put this lower then 3 seconds. -->
-		<config:interval>5</config:interval>
-	</config:stub>
-	<!-- Section to configure the MoM-OTDB-adapter -->
-	<config:adapter>
-		<!-- Port where the HTTP server of MoM-OTDB-adapter should run -->
-		<config:httpport>8082</config:httpport>
-		<!-- Keystore file for MoM-OTDB-adapter. This file should contain the MoM-OTDB-adapter public/private key -->
-		<config:keystore-location>./keystores/mom-otdb-adapter-keystore.jks</config:keystore-location>
-		<!-- Password of the Keystore file for MoM-OTDB-adapter.  -->
-		<config:keystore-password>adapter</config:keystore-password>
-		<!-- Trusted Keystore file for MoM-OTDB-adapter. This file should contain all client public keys -->
-		<config:trusted-keystore-location>./keystores/mom-otdb-adapter-trusted-keystore.jks</config:trusted-keystore-location>
-		<!-- Password of the Trusted Keystore file for MoM-OTDB-adapter.  -->
-		<config:trusted-keystore-password>adapter-trusted</config:trusted-keystore-password>
-	</config:adapter>
-</config:config>

SAS/OTB/MoM-OTDB-adapter/dist-sources/conf/log4j.properties

-#
-# Configures Log4j as the Tomcat system logger
-#
-log4j.rootLogger=INFO, FILE, MAIL
-
-
-log4j.appender.MAIL=org.apache.log4j.net.SMTPAppender
-log4j.appender.MAIL.Threshold=FATAL
-log4j.appender.MAIL.BufferSize=10
-log4j.appender.MAIL.From=lofar17@astron.nl
-log4j.appender.MAIL.SMTPHost=127.0.0.1
-log4j.appender.MAIL.Subject=Error on mom2-otdb-adapter (Log4j)
-log4j.appender.MAIL.To=verhoef@astron.nl,vermaas@astron.nl,holties@astron.nl
-log4j.appender.MAIL.layout=org.apache.log4j.PatternLayout
-log4j.appender.MAIL.layout.ConversionPattern=%d %-5p %c{2}:%L - %m%n
-
-
-
-#
-# Configuration for a rolling log file ("mom2-otdb-adapter.log").
-#
-log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.FILE.File=./logs/mom-otdb-adapter.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d %-5p %c{2}:%L - %m%n
-
-
-log4j.appender.DEBUG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DEBUG.File=./logs/debug.log
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=%d %-5p %c{2}:%L - %m%n
-
-log4j.logger.nl.astron.lofar.odtb.mom2otdbadapter=DEBUG, DEBUG
\ No newline at end of file

SAS/OTB/MoM-OTDB-adapter/dist-sources/mom-otdb-adapter.bat

-java -jar ./mom-otdb-adapter.jar -c ./conf/config-otdb.xml -l ./conf/log4j.properties
\ No newline at end of file

SAS/OTB/MoM-OTDB-adapter/dist-sources/mom-otdb-adapter.sh

-
-export JAVAHOME=/usr/local/jdk1.6.0_01
-
-$JAVAHOME/bin/java -jar ./mom-otdb-adapter.jar -c ./conf/config-otdb.xml -l ./conf/log4j.properties