Changeset: 9b5b525664ce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b5b525664ce
Modified Files:
java/ChangeLog.Feb2013
java/Makefile.ag
java/build.properties
java/release.txt
java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
Branch: Feb2013
Log Message:
getChallengeResponse: drop proto v8 support
diffs (70 lines):
diff --git a/java/ChangeLog.Feb2013 b/java/ChangeLog.Feb2013
--- a/java/ChangeLog.Feb2013
+++ b/java/ChangeLog.Feb2013
@@ -1,3 +1,7 @@
# ChangeLog file for java
# This file is updated with Maddlog
+* Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org>
+- Mapi protocol v8 support was removed from MapiSocket. Protocol
+ v8 has not been used by the servers any more since Apr2012 release
+
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -27,7 +27,7 @@ JAVA_HOME = @JAVA_HOME@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/monetdb/lib
- FILES = monetdb-mcl-1.8.jar monetdb-jdbc-2.8.jar jdbcclient.jar
+ FILES = monetdb-mcl-1.9.jar monetdb-jdbc-2.8.jar jdbcclient.jar
}
ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -9,7 +9,7 @@
# major release number
MCL_MAJOR=1
# minor release number
-MCL_MINOR=8
+MCL_MINOR=9
##
diff --git a/java/release.txt b/java/release.txt
--- a/java/release.txt
+++ b/java/release.txt
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 2.8 (Liberica/MCL-1.8)
+MonetDB JDBC driver version 2.8 (Liberica/MCL-1.9)
Fabian Groffen <fab...@monetdb.org>
-Release date: 2012-11-22
+Release date: 2012-12-01
This JDBC driver is designed for use with MonetDB, a main-memory
diff --git a/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
b/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
--- a/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
+++ b/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
@@ -481,7 +481,7 @@ public final class MapiSocket {
} catch (UnsupportedEncodingException e) {
throw new AssertionError("internal
error: " + e.toString());
}
- case 8:
+
// proto 7 (finally) used the challenge and
works with a
// password hash. The supported
implementations come
// from the server challenge. We chose the
best hash
@@ -518,8 +518,6 @@ public final class MapiSocket {
} else if (hashesSet.contains("MD5")) {
algo = "MD5";
pwhash = "{MD5}";
- } else if (version == 8 &&
hashesSet.contains("PLAIN")) {
- pwhash = "{plain}" + password +
challenge;
} else {
throw new MCLException("no supported
password hashes in " + hashes);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
