Changeset: 0411a8e304a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0411a8e304a0
Added Files:
java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
java/src/main/java/nl/cwi/monetdb/util/Exporter.java
java/src/main/java/nl/cwi/monetdb/util/Extract.java
java/src/main/java/nl/cwi/monetdb/util/OptionsException.java
java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java
java/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
java/src/main/java/nl/cwi/monetdb/util/XMLExporter.java
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.sql
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.err
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/dump.timeout
sql/test/testdb-upgrade-chain-hge/Tests/package.py
sql/test/testdb-upgrade-chain-hge/Tests/package.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/package.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.reqtests
sql/test/testdb-upgrade-hge/Tests/dump.stable.err
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.timeout
sql/test/testdb-upgrade-hge/Tests/unpackage.py
sql/test/testdb-upgrade-hge/Tests/unpackage.stable.err
sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-hge/Tests/upgrade.reqtests
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.err
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb/Tests/testdb-package-hge.py
sql/test/testdb/Tests/testdb-package-hge.stable.err
sql/test/testdb/Tests/testdb-package-hge.stable.out
Removed Files:
java/src/nl/cwi/monetdb/client/JMonetDB.java
java/src/nl/cwi/monetdb/client/JdbcClient.java
java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/nl/cwi/monetdb/jdbc/types/INET.java
java/src/nl/cwi/monetdb/jdbc/types/URL.java
java/src/nl/cwi/monetdb/mcl/MCLException.java
java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java
java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
java/src/nl/cwi/monetdb/merovingian/Control.java
java/src/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/nl/cwi/monetdb/merovingian/SabaothDB.java
java/src/nl/cwi/monetdb/util/CmdLineOpts.java
java/src/nl/cwi/monetdb/util/Exporter.java
java/src/nl/cwi/monetdb/util/Extract.java
java/src/nl/cwi/monetdb/util/OptionsException.java
java/src/nl/cwi/monetdb/util/SQLExporter.java
java/src/nl/cwi/monetdb/util/SQLRestore.java
java/src/nl/cwi/monetdb/util/XMLExporter.java
sql/test/mergetables/Tests/mergequery.stable.out.single
Modified Files:
.hgignore
clients/mapiclient/mclient.c
java/build.xml
java/example/MJDBCTest.java
java/example/PreparedExample.java
java/example/SQLImport.java
java/example/SQLcopyinto.java
java/pom.xml
monetdb5/modules/mal/pcre.c
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
sql/test/mergetables/Tests/All
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb/Tests/All
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 211882 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -65,7 +65,10 @@ lex.yy.c
*.gem
# java:
*.jar
-java/target/classes/nl/cwi/monetdb/jdbc/MonetDriver.java.in
+java/build
+java/target
+java/bin
+java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
# python:
dist
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3055,7 +3055,7 @@ main(int argc, char **argv)
* ".OCP" if we knew for sure that we were running in a cmd
* window) */
#ifdef HAVE_SETLOCALE
- setlocale(LC_ALL, "");
+ setlocale(LC_CTYPE, "");
#endif
#endif
toConsole = stdout_stream = file_wastream(stdout, "stdout");
diff --git a/java/build.xml b/java/build.xml
--- a/java/build.xml
+++ b/java/build.xml
@@ -20,7 +20,7 @@ Copyright 2008-2015 MonetDB B.V.
<!-- set global properties for this build -->
- <property name="srcdir" value="src" />
+ <property name="srcdir" value="src/main/java" />
<property name="libdir" value="lib" />
<property name="jardir" value="jars" />
<property name="builddir" value="build" />
@@ -184,7 +184,6 @@ Copyright 2008-2015 MonetDB B.V.
target="${jvm.version}"
>
<src path="${srcdir}" />
- <src path="${builddir}/src" />
<include name="${jdbc-package}/**/*.java" />
<compilerarg line="${javac.flags}" />
</javac>
@@ -281,10 +280,10 @@ Copyright 2008-2015 MonetDB B.V.
<fail unless="JDBC_VER_SUFFIX" message="'JDBC_VER_SUFFIX' undefined.
Please follow the directions in build.properties."/>
<!-- now copy and filter the file -->
- <copy file="${srcdir}/${jdbc-package}/MonetDriver.java.in"
- overwrite="true"
- tofile="${builddir}/src/${jdbc-package}/MonetDriver.java"
- filtering="yes" />
+ <copy file="${srcdir}/${jdbc-package}/MonetDriver.java.in"
+ overwrite="true"
+ tofile="${srcdir}/${jdbc-package}/MonetDriver.java"
+ filtering="yes" />
<echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR}
(${JDBC_VER_SUFFIX}) edition driver" />
</target>
diff --git a/java/example/MJDBCTest.java b/java/example/MJDBCTest.java
--- a/java/example/MJDBCTest.java
+++ b/java/example/MJDBCTest.java
@@ -13,7 +13,7 @@ import java.sql.*;
* On these tables some queries are executed and the JDBC driver is tested
* on it's accuracy and robustness against 'users'.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class MJDBCTest {
public static void main(String[] args) throws Exception {
diff --git a/java/example/PreparedExample.java
b/java/example/PreparedExample.java
--- a/java/example/PreparedExample.java
+++ b/java/example/PreparedExample.java
@@ -11,7 +11,7 @@ import java.sql.*;
/**
* This example shows the use of the PreparedStatement
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class PreparedExample {
public static void main(String[] args) throws Exception {
diff --git a/java/example/SQLImport.java b/java/example/SQLImport.java
--- a/java/example/SQLImport.java
+++ b/java/example/SQLImport.java
@@ -24,7 +24,7 @@ import java.io.*;
* JDBC driver and Mserver is reported. The log file is put in the current
* working directory and names like monet_[unix timestamp].log
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class SQLImport {
diff --git a/java/example/SQLcopyinto.java b/java/example/SQLcopyinto.java
--- a/java/example/SQLcopyinto.java
+++ b/java/example/SQLcopyinto.java
@@ -17,7 +17,7 @@ import nl.cwi.monetdb.mcl.io.*;
* in performing COPY INTO sequences. This is mainly meant to show how
* a quick load can be performed from Java.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class SQLcopyinto {
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,31 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Copyright 2008-2015 MonetDB B.V.
--->
-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
+
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
<version>2.17</version>
- <name>monetdb-jdbc</name>
+ <name>${project.groupId}:${project.artifactId}</name>
<description>MonetDB JDBC driver</description>
- <repositories>
+ <url>https://www.monetdb.org</url>
+
+ <licenses>
+ <license>
+ <name>Mozilla Public License, Version 2.0</name>
+ <url>https://www.mozilla.org/MPL/2.0/</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Sjoerd Mullender</name>
+ <email>sjo...@monetdb.org</email>
+ <organization>MonetDB</organization>
+
<organizationUrl>https://www.monetdb.org</organizationUrl>
+ </developer>
+ <developer>
+ <name>Dimitar Nedev</name>
+ <email>dimitar.ne...@monetdbsolutions.com</email>
+ <organization>MonetDB Solutions</organization>
+
<organizationUrl>https://www.monetdbsolutions.com</organizationUrl>
+ </developer>
+ </developers>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
<repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2</url>
+ <id>ossrh</id>
+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
- <repository>
- <id>clojars</id>
- <url>http://clojars.org/repo/</url>
- </repository>
- </repositories>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:hg:https://dev.monetdb.org/hg/MonetDB/</connection>
+
<developerConnection>scm:hg:ssh://h...@dev.monetdb.org/MonetDB/</developerConnection>
+ <url>https://dev.monetdb.org/hg/MonetDB/</url>
+ </scm>
+
+ <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>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <includes>
+
<include>${jdbc.sources}</include>
+
<include>${mcl.sources}</include>
+ </includes>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+
<include>${jdbc.sources}</include>
+
<include>${mcl.sources}</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceFileIncludes>
+
<include>${jdbc.sources}</include>
+
<include>${mcl.sources}</include>
+ </sourceFileIncludes>
+
<additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+
<artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+
<autoVersionSubmodules>true</autoVersionSubmodules>
+
<useReleaseProfile>false</useReleaseProfile>
+
<releaseProfiles>release</releaseProfiles>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/java/src/nl/cwi/monetdb/client/JMonetDB.java
b/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
rename from java/src/nl/cwi/monetdb/client/JMonetDB.java
rename to java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
--- a/java/src/nl/cwi/monetdb/client/JMonetDB.java
+++ b/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
@@ -17,7 +17,7 @@ import java.util.*;
* This program mimics the monetdb tool. It is meant as demonstration
* and test of the MeroControl library.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
* @version 1.0
*/
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
