Changeset: f523727db392 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=f523727db392
Added Files:
src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
src/main/java/org/monetdb/client/JMonetDB.java
src/main/java/org/monetdb/client/JdbcClient.java
src/main/java/org/monetdb/jdbc/MonetBlob.java
src/main/java/org/monetdb/jdbc/MonetCallableStatement.java
src/main/java/org/monetdb/jdbc/MonetClob.java
src/main/java/org/monetdb/jdbc/MonetConnection.java
src/main/java/org/monetdb/jdbc/MonetDataSource.java
src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
src/main/java/org/monetdb/jdbc/MonetDriver.java.in
src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java
src/main/java/org/monetdb/jdbc/MonetResultSet.java
src/main/java/org/monetdb/jdbc/MonetSavepoint.java
src/main/java/org/monetdb/jdbc/MonetStatement.java
src/main/java/org/monetdb/jdbc/MonetWrapper.java
src/main/java/org/monetdb/jdbc/types/INET.java
src/main/java/org/monetdb/jdbc/types/URL.java
src/main/java/org/monetdb/mcl/MCLException.java
src/main/java/org/monetdb/mcl/io/BufferedMCLReader.java
src/main/java/org/monetdb/mcl/io/BufferedMCLWriter.java
src/main/java/org/monetdb/mcl/net/MapiSocket.java
src/main/java/org/monetdb/mcl/parser/HeaderLineParser.java
src/main/java/org/monetdb/mcl/parser/MCLParseException.java
src/main/java/org/monetdb/mcl/parser/MCLParser.java
src/main/java/org/monetdb/mcl/parser/StartOfHeaderParser.java
src/main/java/org/monetdb/mcl/parser/TupleLineParser.java
src/main/java/org/monetdb/merovingian/Control.java
src/main/java/org/monetdb/merovingian/MerovingianException.java
src/main/java/org/monetdb/merovingian/SabaothDB.java
src/main/java/org/monetdb/util/CmdLineOpts.java
src/main/java/org/monetdb/util/Exporter.java
src/main/java/org/monetdb/util/Extract.java
src/main/java/org/monetdb/util/MDBvalidator.java
src/main/java/org/monetdb/util/OptionsException.java
src/main/java/org/monetdb/util/SQLExporter.java
src/main/java/org/monetdb/util/SQLRestore.java
src/main/java/org/monetdb/util/XMLExporter.java
Removed Files:
src/main/java/nl/cwi/monetdb/client/JMonetDB.java
src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
src/main/java/nl/cwi/monetdb/jdbc/MonetCallableStatement.java
src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
src/main/java/nl/cwi/monetdb/mcl/MCLException.java
src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java
src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
src/main/java/nl/cwi/monetdb/merovingian/Control.java
src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
src/main/java/nl/cwi/monetdb/util/Exporter.java
src/main/java/nl/cwi/monetdb/util/Extract.java
src/main/java/nl/cwi/monetdb/util/MDBvalidator.java
src/main/java/nl/cwi/monetdb/util/OptionsException.java
src/main/java/nl/cwi/monetdb/util/SQLExporter.java
src/main/java/nl/cwi/monetdb/util/SQLRestore.java
src/main/java/nl/cwi/monetdb/util/XMLExporter.java
Modified Files:
ChangeLog
Makefile
build.xml
pom.xml
release.txt
src/main/java/nl/cwi/monetdb/client/JdbcClient.java
src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
tests/BugConcurrent_clients_SF_1504657.java
tests/BugConcurrent_sequences.java
tests/BugDatabaseMetaData_Bug_3356.java
tests/BugDecimalRound_Bug_3561.java
tests/BugExecuteUpdate_Bug_3350.java
tests/BugResultSetMetaData_Bug_6183.java
tests/BugSetQueryTimeout_Bug_3357.java
tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.java
tests/Bug_IsValid_Timeout_Bug_6782.java
tests/Bug_PrepStmtSetObject_CLOB_6349.java
tests/Bug_PrepStmtSetString_6382.java
tests/Bug_PrepStmt_With_Errors_Jira292.java
tests/SQLcopyinto.java
tests/Test_Cautocommit.java
tests/Test_Cforkbomb.java
tests/Test_CisValid.java
tests/Test_Clargequery.java
tests/Test_Cmanycon.java
tests/Test_Creplysize.java
tests/Test_Csavepoints.java
tests/Test_Csendthread.java
tests/Test_Ctransaction.java
tests/Test_Dobjects.java
tests/Test_FetchSize.java
tests/Test_Int128.java
tests/Test_PSgeneratedkeys.java
tests/Test_PSgetObject.java
tests/Test_PSlargeamount.java
tests/Test_PSlargebatchval.java
tests/Test_PSlargeresponse.java
tests/Test_PSmanycon.java
tests/Test_PSmetadata.java
tests/Test_PSsomeamount.java
tests/Test_PSsqldata.java
tests/Test_PStimedate.java
tests/Test_PStimezone.java
tests/Test_PStypes.java
tests/Test_Rbooleans.java
tests/Test_Rmetadata.java
tests/Test_Rpositioning.java
tests/Test_Rsqldata.java
tests/Test_Rtimedate.java
tests/Test_Sbatching.java
tests/Test_Smoreresults.java
tests/Test_Wrapper.java
Branch: default
Log Message:
Moved Java classes from packages starting with nl.cwi.monetdb.* to package
org.monetdb.*
This naming complies to the Java Package Naming convention as MonetDB's main
website is www.monetdb.org.
diffs (truncated from 4436 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,22 @@
# ChangeLog file for monetdb-java
# This file is updated with Maddlog
+* Thu Nov 12 2020 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- Moved Java classes from packages starting with nl.cwi.monetdb.*
+ to package org.monetdb.* This naming complies to the Java Package
+ Naming convention as MonetDB's main website is www.monetdb.org.
+ To prevent problems with existing Java programs and JDBC driver
+ configurations we still support usage of the following classes:
+ nl.cwi.monetdb.jdbc.MonetDriver
+ nl.cwi.monetdb.jdbc.types.INET
+ nl.cwi.monetdb.jdbc.types.URL
+ nl.cwi.monetdb.mcl.net.MapiSocket
+ nl.cwi.monetdb.client.JdbcClient
+ They are implemented as simple wrappers of their org.monetdb.* equivalents.
+ Note: These nl.cwi.monetdb.* classes are now marked as deprecated and may be
+ removed in a future release. If you still use them in your Java code,
+ update them to use the new package names.
+
* Thu Oct 29 2020 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- Extended JdbcClient program with 3 new commands to quickly validate
data integrity:
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-all: src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+all: src/main/java/org/monetdb/jdbc/MonetDriver.java
ant -f build.xml distjdbc distmerocontrol
cd tests; ant -f build.xml jar_jdbctests
-src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java: build.properties
src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
- . ./build.properties; sed -e
"s/@MCL_MAJOR@/$$MCL_MAJOR/g;s/@MCL_MINOR@/$$MCL_MINOR/g;s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX
$$buildno/g;s/@JDBC_DEF_PORT@/$$JDBC_DEF_PORT/g"
src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in >
src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+src/main/java/org/monetdb/jdbc/MonetDriver.java: build.properties
src/main/java/org/monetdb/jdbc/MonetDriver.java.in
+ . ./build.properties; sed -e
"s/@MCL_MAJOR@/$$MCL_MAJOR/g;s/@MCL_MINOR@/$$MCL_MINOR/g;s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX
$$buildno/g;s/@JDBC_DEF_PORT@/$$JDBC_DEF_PORT/g"
src/main/java/org/monetdb/jdbc/MonetDriver.java.in >
src/main/java/org/monetdb/jdbc/MonetDriver.java
doc:
ant -f build.xml doc
clean:
- rm -f src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+ rm -f src/main/java/org/monetdb/jdbc/MonetDriver.java
rm -rf build tests/build jars doc
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -19,16 +19,21 @@ Copyright 1997 - July 2008 CWI, August 2
<!-- set global properties for this build -->
- <property name="srcdir" value="src/main/java" />
- <property name="libdir" value="lib" />
- <property name="jardir" value="jars" />
- <property name="builddir" value="build" />
- <property name="docdir" value="doc" />
- <property name="jdbc-package" value="nl/cwi/monetdb/jdbc" />
- <property name="mcl-package" value="nl/cwi/monetdb/mcl" />
- <property name="client-package" value="nl/cwi/monetdb/client" />
- <property name="util-package" value="nl/cwi/monetdb/util" />
- <property name="mero-control-package" value="nl/cwi/monetdb/merovingian" />
+ <property name="srcdir" value="src/main/java" />
+ <property name="libdir" value="lib" />
+ <property name="jardir" value="jars" />
+ <property name="builddir" value="build" />
+ <property name="docdir" value="doc" />
+ <property name="jdbc-package" value="org/monetdb/jdbc" />
+ <property name="mcl-package" value="org/monetdb/mcl" />
+ <property name="client-package" value="org/monetdb/client" />
+ <property name="util-package" value="org/monetdb/util" />
+ <property name="mero-control-package" value="org/monetdb/merovingian" />
+
+ <!-- old nl/cwi/monetdb packages for some deprecated classes as of nov2020
-->
+ <property name="nl-cwi-jdbc-package" value="nl/cwi/monetdb/jdbc" />
+ <property name="nl-cwi-mcl-package" value="nl/cwi/monetdb/mcl" />
+ <property name="nl-cwi-client-package" value="nl/cwi/monetdb/client" />
<property file="build.local.properties" />
<property file="build.properties" />
@@ -94,12 +99,15 @@ Copyright 1997 - July 2008 CWI, August 2
<!-- jar targets -->
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
unless="uptodate.jdbc-jar">
- <echo file="${builddir}/META-INF/services/java.sql.Driver"
append="false">nl.cwi.monetdb.jdbc.MonetDriver</echo>
+ <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="${nl-cwi-jdbc-package}/MonetDriver.class" />
+ <include name="${nl-cwi-jdbc-package}/types/*.class" />
<include name="${mcl-package}/**/*.class" />
- <include name="META-INF/services/java.sql.Driver" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
</fileset>
</jar>
</target>
@@ -108,6 +116,7 @@ Copyright 1997 - July 2008 CWI, August 2
<jar jarfile="${mcl-jar}">
<fileset dir="${builddir}">
<include name="${mcl-package}/**/*.class" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
</fileset>
</jar>
</target>
@@ -116,6 +125,7 @@ Copyright 1997 - July 2008 CWI, August 2
<jar jarfile="${jardir}/monetdb-clients.jar">
<fileset dir="${builddir}">
<include name="${client-package}/**/*.class" />
+ <include name="${nl-cwi-client-package}/JdbcClient.class" />
<include name="${util-package}/**/*.class" />
</fileset>
</jar>
@@ -128,15 +138,19 @@ Copyright 1997 - July 2008 CWI, August 2
<echo message="Building jdbcclient + JDBC driver convenience jar" />
<jar jarfile="${jdbcclient-jar}">
<fileset dir="${builddir}">
- <include name="${jdbc-package}/**/*.class" />
- <include name="${mcl-package}/**/*.class" />
<include name="${client-package}/**/*.class" />
+ <include name="${nl-cwi-client-package}/JdbcClient.class" />
<include name="${util-package}/**/*.class" />
<include name="META-INF/services/java.sql.Driver" />
+ <include name="${jdbc-package}/**/*.class" />
+ <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
+ <include name="${nl-cwi-jdbc-package}/types/*.class" />
+ <include name="${mcl-package}/**/*.class" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
- <attribute name="Main-Class" value="nl.cwi.monetdb.client.JdbcClient"
/>
+ <attribute name="Main-Class" value="org.monetdb.client.JdbcClient" />
</manifest>
</jar>
</target>
@@ -150,12 +164,12 @@ Copyright 1997 - July 2008 CWI, August 2
<fileset dir="${builddir}">
<include name="${mero-control-package}/**/*.class" />
<include name="${mcl-package}/**/*.class" />
- <include name="${client-package}/**/JMonetDB.class" />
+ <include name="${client-package}/JMonetDB.class" />
<include name="${util-package}/**/*.class" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
- <attribute name="Main-Class" value="nl.cwi.monetdb.client.JMonetDB" />
+ <attribute name="Main-Class" value="org.monetdb.client.JMonetDB" />
</manifest>
</jar>
</target>
@@ -186,6 +200,9 @@ Copyright 1997 - July 2008 CWI, August 2
>
<src path="${srcdir}" />
<include name="${jdbc-package}/**/*.java" />
+ <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
+ <include name="${nl-cwi-jdbc-package}/types/*.java" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
<compilerarg line="${javac.flags}" />
</javac>
</target>
@@ -203,6 +220,7 @@ Copyright 1997 - July 2008 CWI, August 2
target="${jvm.version}"
>
<include name="${mcl-package}/**/*.java" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
<compilerarg line="${javac.flags}" />
</javac>
</target>
@@ -220,6 +238,7 @@ Copyright 1997 - July 2008 CWI, August 2
target="${jvm.version}"
>
<include name="${client-package}/**/*.java" />
+ <include name="${nl-cwi-client-package}/JdbcClient.java" />
<compilerarg line="${javac.flags}" />
</javac>
</target>
@@ -312,14 +331,21 @@ Copyright 1997 - July 2008 CWI, August 2
<uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
<srcfiles dir="${srcdir}">
<include name="${jdbc-package}/**/*.java" />
+ <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
+ <include name="${nl-cwi-jdbc-package}/types/*.java" />
<include name="${mcl-package}/**/*.java" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
</srcfiles>
</uptodate>
<uptodate targetfile="${jdbcclient-jar}"
property="uptodate.jdbcclient-jar">
<srcfiles dir="${srcdir}">
<include name="${client-package}/**/*.java" />
+ <include name="${nl-cwi-client-package}/JdbcClient.java" />
<include name="${jdbc-package}/**/*.java" />
+ <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
+ <include name="${nl-cwi-jdbc-package}/types/*.java" />
<include name="${mcl-package}/**/*.java" />
+ <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
</srcfiles>
</uptodate>
<uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
diff --git a/pom.xml b/pom.xml
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jdbc.sources>nl/cwi/monetdb/jdbc/**/*.java</jdbc.sources>
- <mcl.sources>nl/cwi/monetdb/mcl/**/*.java</mcl.sources>
+ <jdbc.sources>org/monetdb/jdbc/**/*.java</jdbc.sources>
+ <mcl.sources>org/monetdb/mcl/**/*.java</mcl.sources>
</properties>
<build>
diff --git a/release.txt b/release.txt
--- a/release.txt
+++ b/release.txt
@@ -146,8 +146,8 @@ Currently implemented JDBC 4.2 interface
- setCharacterStream
* java.sql.SQLData
- implemented by class: nl.cwi.monetdb.jdbc.types.INET
- and by class: nl.cwi.monetdb.jdbc.types.URL
+ implemented by class: org.monetdb.jdbc.types.INET
+ and by class: org.monetdb.jdbc.types.URL
* javax.sql.DataSource (not tested)
diff --git a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
b/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
--- a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
+++ b/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
@@ -8,1317 +8,12 @@
package nl.cwi.monetdb.client;
-import nl.cwi.monetdb.util.CmdLineOpts;
-import nl.cwi.monetdb.util.Exporter;
-import nl.cwi.monetdb.util.MDBvalidator;
-import nl.cwi.monetdb.util.OptionsException;
-import nl.cwi.monetdb.util.SQLExporter;
-import nl.cwi.monetdb.util.XMLExporter;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.File;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager; // import is required as it will load the
nl.cwi.monetdb.jdbc.MonetDriver class
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
+import java.sql.DriverManager; // import is required as it will load the
org.monetdb.jdbc.MonetDriver class
/**
- * This program acts like an extended client program for MonetDB. Its
- * look and feel is very much like PostgreSQL's interactive terminal
- * program. Although it looks like this client is designed for MonetDB,
- * it demonstrates the power of the JDBC interface since it built on top
- * of JDBC only.
- *
- * @author Fabian Groffen
- * @author Martin van Dinther
- * @version 1.6
+ * a wrapper class for old programs who still depend on
+ * class nl.cwi.monetdb.client.JdbcClient to work.
+ * This class is deprecated since nov 2020 and will be removed in a future
release.
*/
-
-public final class JdbcClient {
-
- private static Connection con;
- private static DatabaseMetaData dbmd;
- private static Statement stmt;
- private static BufferedReader in;
- private static PrintWriter out;
- private static Exporter exporter;
-
- /**
- * JdbcClient is a command line query tool for MonetDB, similar to
mclient.
- * It uses the JDBC API and the MonetDB JDBC driver to communicate with
a
- * MonetDB server. The MonetDB JDBC driver is included in the
jdbcclient.jre8.jar
- * for ease of use, so only 1 jar file is needed to use it.
- *
- * <pre>Usage java -jar jdbcclient.jre8.jar
- * [-h host[:port]] [-p port] [-f file] [-u user]
- * [-l language] [-d database] [-e] [-D [table]]
[-X<opt>]
- * | [--help] | [--version]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
