Update of /cvsroot/monetdb/clients/src/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22508/src/java
Modified Files:
Makefile.ag build.properties build.xml version.sh
Log Message:
propagated changes of Monday Oct 08 2007 - Wednesday Oct 10 2007
from the Clients_1-20 branch to the development trunk
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/Makefile.ag,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.ag 10 Aug 2007 12:34:12 -0000 1.14
+++ Makefile.ag 10 Oct 2007 12:14:08 -0000 1.15
@@ -25,5 +25,5 @@
ant_distall = {
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.0-mcl.jar monetdb-1.6-jdbc.jar jdbcclient.jar
xrpcwrapper-0.1.jar
+ FILES = monetdb-1.0-mcl.jar monetdb-1.6-jdbc.jar jdbcclient.jar
}
Index: build.xml
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- build.xml 3 Sep 2007 11:29:06 -0000 1.28
+++ build.xml 10 Oct 2007 12:14:09 -0000 1.29
@@ -38,7 +38,6 @@
<property name="xmldb-package" value="nl/cwi/monetdb/xmldb" />
<property name="mcl-package" value="nl/cwi/monetdb/mcl" />
<property name="client-package" value="nl/cwi/monetdb/client" />
- <property name="xrpcwrapper-package" value="nl/cwi/monetdb/xrpc/wrapper" />
<property name="util-package" value="nl/cwi/monetdb/util" />
<property file="build.local.properties" />
@@ -52,8 +51,6 @@
value="${jardir}/monetdb-${MCL_MAJOR}.${MCL_MINOR}-mcl.jar" />
<property name="xmldb-jar"
value="${jardir}/monetdb-${JDBC_MAJOR}.${JDBC_MINOR}-xmldb.jar" />
- <property name="xrpcwrapper-jar"
-
value="${jardir}/xrpcwrapper-${XRPC_WRAPPER_MAJOR}.${XRPC_WRAPPER_MINOR}.jar" />
<!-- full target -->
<target name="all">
@@ -61,7 +58,6 @@
<antcall target="jar_xmldb" />
<antcall target="jar_mcl" />
<antcall target="jar_client" />
- <antcall target="jar_xrpcwrapper" />
<antcall target="doc" />
</target>
@@ -70,12 +66,10 @@
<antcall target="jar_mcl" />
<antcall target="jar_jdbc" />
<antcall target="jar_jdbcclient" />
- <antcall target="jar_xrpcwrapper" />
</target>
<target name="default">
<antcall target="jar_jdbcclient" />
- <antcall target="jar_xrpcwrapper" />
</target>
<!-- jar targets -->
@@ -114,26 +108,6 @@
</jar>
</target>
- <target name="jar_xrpcwrapper"
- depends="compile_util,compile_xrpcwrapper">
- <jar jarfile="${xrpcwrapper-jar}">
- <fileset dir="${builddir}">
- <include name="${util-package}/**/*.class" />
- <include name="${xrpcwrapper-package}/**/*.class" />
- </fileset>
- <fileset dir="${srcdir}">
- <include name="${xrpcwrapper-package}/wrapper_functions.xq" />
- <include name="${xrpcwrapper-package}/Tests/*.xml" />
- <include name="${xrpcwrapper-package}/Tests/*.xq" />
- </fileset>
- <manifest>
- <attribute name="Built-By" value="${user.name}" />
- <attribute name="Main-Class"
- value="nl.cwi.monetdb.xrpc.wrapper.XrpcWrapper" />
- </manifest>
- </jar>
- </target>
-
<!-- a convenience jar of JDBC plus the JdbcClient utililty -->
<target name="jar_jdbcclient"
depends="compile_mcl,compile_jdbc,compile_util,compile_client"
@@ -231,21 +205,6 @@
</javac>
</target>
- <target name="compile_xrpcwrapper" depends="prepare">
- <echo message="Compiling XRPC Wrapper" />
- <javac
- classpath="${srcdir}"
- srcdir="${srcdir}"
- destdir="${builddir}"
- debug="${debug}"
- optimize="${optimize}"
- target="${javac_version}"
- source="${javac_version}"
- >
- <include name="${xrpcwrapper-package}/**/*.java" />
- </javac>
- </target>
-
<!--
This generates MonetDriver.java and MonetDBDatabase.java from their
".java.in" equivalents. It's required for importing the driver
@@ -355,7 +314,7 @@
<!-- documentation target -->
<target name="doc"
-
depends="compile_mcl,compile_jdbc,compile_xmldb,compile_util,compile_client,compile_xrpcwrapper">
+
depends="compile_mcl,compile_jdbc,compile_xmldb,compile_util,compile_client">
<javadoc
destdir="${docdir}"
author="true"
Index: version.sh
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/version.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- version.sh 16 Jul 2007 20:23:21 -0000 1.10
+++ version.sh 10 Oct 2007 12:14:10 -0000 1.11
@@ -17,7 +17,7 @@
# All Rights Reserved.
if [[ -z $1 ]] ; then
- echo "Usage: $0 [-w] <(jdbc|mcl|xrpc)>
<(major|minor|suffix)=newversion> [...]"
+ echo "Usage: $0 [-w] <(jdbc|mcl)> <(major|minor|suffix)=newversion>
[...]"
echo "where -w activates actual write of changes"
exit -1
fi
@@ -51,10 +51,6 @@
TYPE=MCL
FILES="monetdb-XXX-mcl.jar"
;;
- xrpc)
- TYPE=XRPC_WRAPPER
- FILES="xrpcwrapper-XXX.jar"
- ;;
*)
echo "invalid type: $1"
exit -1
Index: build.properties
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/build.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- build.properties 2 Oct 2007 07:46:04 -0000 1.17
+++ build.properties 10 Oct 2007 12:14:09 -0000 1.18
@@ -29,16 +29,6 @@
##
-## XRPC Wrapper
-##
-
-# major release number
-XRPC_WRAPPER_MAJOR=0
-# minor release number
-XRPC_WRAPPER_MINOR=1
-
-
-##
## General
##
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
