Skip to content

Commit

Permalink
Updated Oracle driver. Fixes #125
Browse files Browse the repository at this point in the history
  • Loading branch information
@schuemie
schuemie committed May 10, 2017
1 parent 5556679 commit 1fdb133
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 32 deletions.
55 changes: 27 additions & 28 deletions .classpath
View file
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 3 additions & 4 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<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" />
</jar>
<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" />
Expand All @@ -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"/>
Expand Down

0 comments on commit 1fdb133

Please sign in to comment.