Mercurial > hg > monetdb-java
changeset 942:45c26b1a0677
Include all of JdbcClient in the jdbc jar
| author | Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> |
|---|---|
| date | Wed, 08 Jan 2025 17:30:48 +0100 (2 months ago) |
| parents | 8dca959599c8 |
| children | ff075ed5ce81 |
| files | ChangeLog build.xml build_jre17.xml build_jre21.xml |
| diffstat | 4 files changed, 46 insertions(+), 105 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog file for monetdb-java # This file is updated with Maddlog +* Wed Jan 8 2025 Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> +- The JDBC jar now includes JdbcClient. For backward compatibility the jar + is still also available as jdbcclient.jreX.jar. + * Thu Nov 7 2024 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - In JdbcClient when running the \vsci or \vdbi or \vsi commands, we now suppress "42000 SELECT: insufficient privileges for ..." and
--- a/build.xml +++ b/build.xml @@ -69,13 +69,12 @@ Copyright 1997 - July 2008 CWI. </target> <target name="default"> - <antcall target="jar_jdbcclient" /> + <antcall target="jar_jdbc" /> <antcall target="jar_jmonetdb" /> </target> <target name="distjdbc"> <antcall target="jar_jdbc" /> - <antcall target="jar_jdbcclient" /> </target> <target name="distmerocontrol"> @@ -83,35 +82,12 @@ Copyright 1997 - July 2008 CWI. </target> <!-- jar targets --> - <target name="jar_jdbc" depends="compile_mcl,compile_jdbc" + <target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client" unless="uptodate.jdbc-jar"> <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo> <jar jarfile="${jdbc-jar}"> <fileset dir="${builddir}"> <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> - <include name="${util-package}/FileTransferHandler.class" /> - </fileset> - </jar> - </target> - - <target name="jar_client" depends="compile_util,compile_client"> - <jar jarfile="${jardir}/monetdb-clients.jar"> - <fileset dir="${builddir}"> - <include name="${client-package}/**/*.class" /> - <include name="${util-package}/**/*.class" /> - </fileset> - </jar> - </target> - - <!-- a convenience jar of jdbcclient command line program plus JDBC driver --> - <target name="jar_jdbcclient" - depends="compile_mcl,compile_jdbc,compile_util,compile_client" - unless="uptodate.jdbcclient-jar"> - <echo message="Building jdbcclient + JDBC driver convenience jar" /> - <jar jarfile="${jdbcclient-jar}"> - <fileset dir="${builddir}"> <include name="${client-package}/**/*.class" /> <include name="${util-package}/**/*.class" /> <include name="META-INF/services/java.sql.Driver" /> @@ -125,6 +101,13 @@ Copyright 1997 - July 2008 CWI. </jar> </target> + <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> + <target name="jar_jdbcclient" + depends="jar_jdbc"> + <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> + <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> + </target> + <!-- a convenience jar of MeroControl plus the JMonetDB utility --> <target name="jar_jmonetdb" depends="compile_mcl,compile_util,compile_mero_control,compile_client" @@ -292,15 +275,11 @@ Copyright 1997 - July 2008 CWI. <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> <srcfiles dir="${srcdir}"> - <include name="${jdbc-package}/**/*.java" /> - <include name="${mcl-package}/**/*.java" /> - </srcfiles> - </uptodate> - <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar"> - <srcfiles dir="${srcdir}"> - <include name="${client-package}/**/*.java" /> - <include name="${jdbc-package}/**/*.java" /> - <include name="${mcl-package}/**/*.java" /> + <include name="${client-package}/**/*.class" /> + <include name="${util-package}/**/*.class" /> + <include name="META-INF/services/java.sql.Driver" /> + <include name="${jdbc-package}/**/*.class" /> + <include name="${mcl-package}/**/*.class" /> </srcfiles> </uptodate> <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
--- a/build_jre17.xml +++ b/build_jre17.xml @@ -72,13 +72,12 @@ Copyright 1997 - July 2008 CWI. </target> <target name="default"> - <antcall target="jar_jdbcclient" /> + <antcall target="jar_jdbc" /> <antcall target="jar_jmonetdb" /> </target> <target name="distjdbc"> <antcall target="jar_jdbc" /> - <antcall target="jar_jdbcclient" /> </target> <target name="distmerocontrol"> @@ -86,35 +85,12 @@ Copyright 1997 - July 2008 CWI. </target> <!-- jar targets --> - <target name="jar_jdbc" depends="compile_mcl,compile_jdbc" + <target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client" unless="uptodate.jdbc-jar"> <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo> <jar jarfile="${jdbc-jar}"> <fileset dir="${builddir}"> <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> - <include name="${util-package}/FileTransferHandler.class" /> - </fileset> - </jar> - </target> - - <target name="jar_client" depends="compile_util,compile_client"> - <jar jarfile="${jardir}/monetdb-clients.jar"> - <fileset dir="${builddir}"> - <include name="${client-package}/**/*.class" /> - <include name="${util-package}/**/*.class" /> - </fileset> - </jar> - </target> - - <!-- a convenience jar of jdbcclient command line program plus JDBC driver --> - <target name="jar_jdbcclient" - depends="compile_mcl,compile_jdbc,compile_util,compile_client" - unless="uptodate.jdbcclient-jar"> - <echo message="Building jdbcclient + JDBC driver convenience jar" /> - <jar jarfile="${jdbcclient-jar}"> - <fileset dir="${builddir}"> <include name="${client-package}/**/*.class" /> <include name="${util-package}/**/*.class" /> <include name="META-INF/services/java.sql.Driver" /> @@ -128,6 +104,13 @@ Copyright 1997 - July 2008 CWI. </jar> </target> + <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> + <target name="jar_jdbcclient" + depends="jar_jdbc"> + <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> + <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> + </target> + <!-- a convenience jar of MeroControl plus the JMonetDB utility --> <target name="jar_jmonetdb" depends="compile_mcl,compile_util,compile_mero_control,compile_client" @@ -295,15 +278,11 @@ Copyright 1997 - July 2008 CWI. <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> <srcfiles dir="${srcdir}"> - <include name="${jdbc-package}/**/*.java" /> - <include name="${mcl-package}/**/*.java" /> - </srcfiles> - </uptodate> - <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar"> - <srcfiles dir="${srcdir}"> - <include name="${client-package}/**/*.java" /> - <include name="${jdbc-package}/**/*.java" /> - <include name="${mcl-package}/**/*.java" /> + <include name="${client-package}/**/*.class" /> + <include name="${util-package}/**/*.class" /> + <include name="META-INF/services/java.sql.Driver" /> + <include name="${jdbc-package}/**/*.class" /> + <include name="${mcl-package}/**/*.class" /> </srcfiles> </uptodate> <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
--- a/build_jre21.xml +++ b/build_jre21.xml @@ -75,13 +75,12 @@ Copyright 1997 - July 2008 CWI. </target> <target name="default"> - <antcall target="jar_jdbcclient" /> + <antcall target="jar_jdbc" /> <antcall target="jar_jmonetdb" /> </target> <target name="distjdbc"> <antcall target="jar_jdbc" /> - <antcall target="jar_jdbcclient" /> </target> <target name="distmerocontrol"> @@ -89,35 +88,12 @@ Copyright 1997 - July 2008 CWI. </target> <!-- jar targets --> - <target name="jar_jdbc" depends="compile_mcl,compile_jdbc" + <target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client" unless="uptodate.jdbc-jar"> <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo> <jar jarfile="${jdbc-jar}"> <fileset dir="${builddir}"> <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> - <include name="${util-package}/FileTransferHandler.class" /> - </fileset> - </jar> - </target> - - <target name="jar_client" depends="compile_util,compile_client"> - <jar jarfile="${jardir}/monetdb-clients.jar"> - <fileset dir="${builddir}"> - <include name="${client-package}/**/*.class" /> - <include name="${util-package}/**/*.class" /> - </fileset> - </jar> - </target> - - <!-- a convenience jar of jdbcclient command line program plus JDBC driver --> - <target name="jar_jdbcclient" - depends="compile_mcl,compile_jdbc,compile_util,compile_client" - unless="uptodate.jdbcclient-jar"> - <echo message="Building jdbcclient + JDBC driver convenience jar" /> - <jar jarfile="${jdbcclient-jar}"> - <fileset dir="${builddir}"> <include name="${client-package}/**/*.class" /> <include name="${util-package}/**/*.class" /> <include name="META-INF/services/java.sql.Driver" /> @@ -131,6 +107,13 @@ Copyright 1997 - July 2008 CWI. </jar> </target> + <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> + <target name="jar_jdbcclient" + depends="jar_jdbc"> + <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> + <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> + </target> + <!-- a convenience jar of MeroControl plus the JMonetDB utility --> <target name="jar_jmonetdb" depends="compile_mcl,compile_util,compile_mero_control,compile_client" @@ -298,15 +281,11 @@ Copyright 1997 - July 2008 CWI. <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> <srcfiles dir="${srcdir}"> - <include name="${jdbc-package}/**/*.java" /> - <include name="${mcl-package}/**/*.java" /> - </srcfiles> - </uptodate> - <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar"> - <srcfiles dir="${srcdir}"> - <include name="${client-package}/**/*.java" /> - <include name="${jdbc-package}/**/*.java" /> - <include name="${mcl-package}/**/*.java" /> + <include name="${client-package}/**/*.class" /> + <include name="${util-package}/**/*.class" /> + <include name="META-INF/services/java.sql.Driver" /> + <include name="${jdbc-package}/**/*.class" /> + <include name="${mcl-package}/**/*.class" /> </srcfiles> </uptodate> <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">