From 1fdb133d2fe9d61fc0958ae44742388ba495d5bf Mon Sep 17 00:00:00 2001
From: schuemie <schuemie@ohdsi.org>
Date: Wed, 10 May 2017 09:19:39 +0200
Subject: [PATCH] Updated Oracle driver. Fixes #125

---
 .classpath | 55 +++++++++++++++++++++++++++---------------------------
 build.xml  |  7 +++----
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/.classpath b/.classpath
index 870518be..e9de6f36 100644
--- a/.classpath
+++ b/.classpath
@@ -1,28 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/ojdbc5.jar"/>
-	<classpathentry kind="lib" path="lib/ojdbc6.jar"/>
-	<classpathentry kind="lib" path="lib/sqljdbc4.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/poi-3.9-20121203.jar"/>
-	<classpathentry kind="lib" path="lib/poi-excelant-3.9-20121203.jar"/>
-	<classpathentry kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
-	<classpathentry kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar"/>
-	<classpathentry kind="lib" path="lib/stax-api-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/jtds-1.3.1-v20140512.jar"/>
-	<classpathentry kind="lib" path="lib/json-io-3.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-csv-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/postgresql-9.4-1201.jdbc4.jar"/>
-	<classpathentry kind="lib" path="lib/postgresql-9.4-1201.jdbc41.jar"/>
-	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.37-bin.jar"/>
-	<classpathentry kind="lib" path="lib/ucanaccess-3.0.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb-2.2.5.jar"/>
-	<classpathentry kind="lib" path="lib/jackcess-2.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="lib/RedshiftJDBC4-1.1.10.1010.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/sqljdbc4.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/poi-3.9-20121203.jar"/>
+	<classpathentry kind="lib" path="lib/poi-excelant-3.9-20121203.jar"/>
+	<classpathentry kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
+	<classpathentry kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar"/>
+	<classpathentry kind="lib" path="lib/stax-api-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
+	<classpathentry kind="lib" path="lib/jtds-1.3.1-v20140512.jar"/>
+	<classpathentry kind="lib" path="lib/json-io-3.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-csv-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/postgresql-9.4-1201.jdbc4.jar"/>
+	<classpathentry kind="lib" path="lib/postgresql-9.4-1201.jdbc41.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.37-bin.jar"/>
+	<classpathentry kind="lib" path="lib/ucanaccess-3.0.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/hsqldb-2.2.5.jar"/>
+	<classpathentry kind="lib" path="lib/jackcess-2.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
+	<classpathentry kind="lib" path="lib/RedshiftJDBC4-1.1.10.1010.jar"/>
+	<classpathentry kind="lib" path="lib/ojdbc7.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/build.xml b/build.xml
index 4fc9938c..48dbef8e 100644
--- a/build.xml
+++ b/build.xml
@@ -22,7 +22,7 @@
 		<jar destfile="${build.dir}/WhiteRabbit.jar">
 			<manifest>
 				<attribute name="Main-Class" value="org.ohdsi.utilities.WhiteRabbitLauncher"/>
-				<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.3.1-v20140512.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar WhiteRabbit_lib/commons-lang-2.0.jar WhiteRabbit_lib/commons-logging-1.2.jar WhiteRabbit_lib/hsqldb-2.2.5.jar WhiteRabbit_lib/jackcess-2.1.3.jar WhiteRabbit_lib/ucanaccess-3.0.3.1.jar WhiteRabbit_lib/RedshiftJDBC4-1.1.10.1010.jar"/>
+				<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc7.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.3.1-v20140512.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar WhiteRabbit_lib/commons-lang-2.0.jar WhiteRabbit_lib/commons-logging-1.2.jar WhiteRabbit_lib/hsqldb-2.2.5.jar WhiteRabbit_lib/jackcess-2.1.3.jar WhiteRabbit_lib/ucanaccess-3.0.3.1.jar WhiteRabbit_lib/RedshiftJDBC4-1.1.10.1010.jar"/>
 			</manifest>
 			<fileset dir="${build.dir}"/>
 			<fileset dir="${src.dir}" includes="**/*.csv,**/*.png" />
@@ -30,7 +30,7 @@
 		<jar destfile="${build.dir}/RabbitInAHat.jar">
 			<manifest>
 				<attribute name="Main-Class" value="org.ohdsi.utilities.RabbitInAHatLauncher"/>
-				<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.3.1-v20140512.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar"/>
+				<attribute name="Class-Path" value=". WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar"/>
 			</manifest>
 			<fileset dir="${build.dir}"/>
 			<fileset dir="${src.dir}" includes="**/*.csv,**/*.png" />
@@ -40,8 +40,7 @@
 		</copy>
 		<delete dir="${build.dir}/WhiteRabbit_lib"/>
 		<mkdir dir="${build.dir}/WhiteRabbit_lib"/>
-		<copy file="lib/ojdbc5.jar" todir="${build.dir}/WhiteRabbit_lib"/>
-		<copy file="lib/ojdbc6.jar" todir="${build.dir}/WhiteRabbit_lib"/>
+		<copy file="lib/ojdbc7.jar" todir="${build.dir}/WhiteRabbit_lib"/>
 		<copy file="lib/sqljdbc4.jar" todir="${build.dir}/WhiteRabbit_lib"/>
 		<copy file="lib/mysql-connector-java-5.1.37-bin.jar" todir="${build.dir}/WhiteRabbit_lib"/>
 		<copy file="lib/dom4j-1.6.1.jar" todir="${build.dir}/WhiteRabbit_lib"/>