Update of /cvsroot/monetdb/pathfinder/tests/BugTracker/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14066/pathfinder/tests/BugTracker/Tests
Modified Files:
Tag: XQuery_0-24
All JDBC_0_results.SF-1886326.XQUERY.bat
JDBC_0_results.SF-1886326.XQUERY.sh
JDBC_250_results.SF-1730556.XQUERY.bat
JDBC_250_results.SF-1730556.XQUERY.sh
Log Message:
Clean-up of buildtools-, configure-, and testing-legacy in MonetDB-Java.
(
Considered as "bug-fix" by Sjoerd and me.
Has no impact on binary distributions and/or packaging.
Wrapped in tags "JavaTestingCleanUp1_before" & "JavaTestingCleanUp1_after".
Will fix or undo tomorrow in case unexpected problems occur.
)
- Removed "mjclient" as is was not packaged/distributed, anyway.
- Changed test that used "mjclient" to use "jdbcclient.jar" directly.
(Note: "jdbcclient.jar" is not packaged and/or distributed, either, but
only used internally for testing and "convenience".)
- Removed "monetdb-java-config[.bat]" as it was not packaged/distributed,
anyway.
- Changed Mtest.py (and tests) that used monetdb-java-config to find out
where the MonetDB/Java .jar's (and Java/JDBC tests) are installed,
to extract this information from CLASSPATH (falling back to
`monetdb-config --pkgdatadir`/lib and `monetdb-config --pkgdatadir`/Tests
in case CLASSPATH is not set accordingly, assuming MonetDB/Java is stalled
in the same prefix as MonetDB/Common).
- Removed all(?) code that became unused after above changes.
These changes should not break or add any inter-package/-module
dependencies.
TODO (Any help by any Java expert is more than welcome!):
====
For convenience of testing Java/JDBC functionality of binary distributions,
the tests in source/java/tests/ (installed in
<prefix>/share/MonetDB/Tests/*.class) should be collected in a single
"jdbctests.jar" (or alike) to be installed in <prefix>/share/MonetDB/Tests/
or <prefix>/share/MonetDB/lib/ (like the other *.jar files).
If necessary, the tests in sql/src/jdbc/tests/Tests/ then need to be adapted
to use the "jdbctests.jar" instead of the individual
<prefix>/share/MonetDB/Tests/*.class .
Just like "jdbcclient.jar", "jdbctests.jar" is meant for (internal) testing
convenience, only, and not to be distributed.
U JDBC_250_results.SF-1730556.XQUERY.bat
Index: JDBC_250_results.SF-1730556.XQUERY.bat
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat,v
retrieving revision 1.6
retrieving revision 1.6.8.1
diff -u -d -r1.6 -r1.6.8.1
--- JDBC_250_results.SF-1730556.XQUERY.bat 28 Nov 2007 16:24:00 -0000
1.6
+++ JDBC_250_results.SF-1730556.XQUERY.bat 1 Jul 2008 15:06:22 -0000
1.6.8.1
@@ -1,7 +1,5 @@
@echo off
-set JAR="%MONETDB_JAVA_PREFIX%\share\MonetDB\lib\jdbcclient.jar"
-
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
@@ -10,8 +8,8 @@
prompt # $t $g
echo on
-java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery -f
"%TST%.250.xq"
+java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -l
xquery -f "%TST%.250.xq"
-java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery -f
"%TST%.251.xq"
+java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -l
xquery -f "%TST%.251.xq"
@del .monetdb
U JDBC_250_results.SF-1730556.XQUERY.sh
Index: JDBC_250_results.SF-1730556.XQUERY.sh
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.sh,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -d -r1.2 -r1.2.8.1
--- JDBC_250_results.SF-1730556.XQUERY.sh 28 Nov 2007 16:24:00 -0000
1.2
+++ JDBC_250_results.SF-1730556.XQUERY.sh 1 Jul 2008 15:06:22 -0000
1.2.8.1
@@ -1,8 +1,5 @@
#!/bin/bash
-pdd="`monetdb-java-config --pkgdatadir`"
-JAR="$pdd/lib/jdbcclient.jar"
-
cat << EOF > .monetdb
user=monetdb
password=monetdb
@@ -11,8 +8,8 @@
LC_CTYPE="en_US.UTF-8"
export LC_CTYPE
-Mlog -x "java -jar \"$JAR\" -h $HOST -p $MAPIPORT -d $TSTDB -l xquery -f
$TST.250.xq"
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-l xquery -f $TST.250.xq"
-Mlog -x "java -jar \"$JAR\" -h $HOST -p $MAPIPORT -d $TSTDB -l xquery -f
$TST.251.xq"
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-l xquery -f $TST.251.xq"
rm -f .monetdb
U JDBC_0_results.SF-1886326.XQUERY.bat
Index: JDBC_0_results.SF-1886326.XQUERY.bat
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/JDBC_0_results.SF-1886326.XQUERY.bat,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -d -r1.2 -r1.2.6.1
--- JDBC_0_results.SF-1886326.XQUERY.bat 21 Feb 2008 13:42:47 -0000
1.2
+++ JDBC_0_results.SF-1886326.XQUERY.bat 1 Jul 2008 15:06:21 -0000
1.2.6.1
@@ -1,7 +1,5 @@
@echo off
-set JAR="%MONETDB_JAVA_PREFIX%\share\MonetDB\lib\jdbcclient.jar"
-
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
@@ -10,6 +8,6 @@
prompt # $t $g
echo on
-java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery -f "%TST%.0.xq"
+java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -l
xquery -f "%TST%.0.xq"
@del .monetdb
U All
Index: All
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/All,v
retrieving revision 1.102.2.9
retrieving revision 1.102.2.10
diff -u -d -r1.102.2.9 -r1.102.2.10
--- All 20 Jun 2008 07:05:44 -0000 1.102.2.9
+++ All 1 Jul 2008 15:06:21 -0000 1.102.2.10
@@ -109,8 +109,8 @@
attribute_access_mposjoin_error.SF-1726928
insert_large_doc.SF-1726954
32_docs.SF-1730617
-HAVE_MONETDB_JAVAJDBC?JDBC_250_results.SF-1730556
-HAVE_MONETDB_JAVAJDBC?JDBC_0_results.SF-1886326
+HAVE_JDBCCLIENT_JAR?JDBC_250_results.SF-1730556
+HAVE_JDBCCLIENT_JAR?JDBC_0_results.SF-1886326
crash_on_concatenated_query.SF-1730547
error_in_preceeding_axis.SF-1731850
attribute_serialization.SF-1743442
U JDBC_0_results.SF-1886326.XQUERY.sh
Index: JDBC_0_results.SF-1886326.XQUERY.sh
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/JDBC_0_results.SF-1886326.XQUERY.sh,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -d -r1.2 -r1.2.6.1
--- JDBC_0_results.SF-1886326.XQUERY.sh 21 Feb 2008 13:42:47 -0000 1.2
+++ JDBC_0_results.SF-1886326.XQUERY.sh 1 Jul 2008 15:06:22 -0000 1.2.6.1
@@ -1,8 +1,5 @@
#!/bin/bash
-pdd="`monetdb-java-config --pkgdatadir`"
-JAR="$pdd/lib/jdbcclient.jar"
-
cat << EOF > .monetdb
user=monetdb
password=monetdb
@@ -11,6 +8,6 @@
LC_CTYPE="en_US.UTF-8"
export LC_CTYPE
-Mlog -x "java -jar \"$JAR\" -h $HOST -p $MAPIPORT -d $TSTDB -l xquery -f
$TST.0.xq"
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-l xquery -f $TST.0.xq"
rm -f .monetdb
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
