Update of /cvsroot/monetdb/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10861
Modified Files:
Makefile.ag MonetDB-java.spec.in build.xml
Log Message:
Moved the XRPC Wrapper to the new "java" module
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/java/Makefile.ag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.ag 4 Dec 2007 12:49:08 -0000 1.3
+++ Makefile.ag 5 Dec 2007 17:02:00 -0000 1.4
@@ -29,7 +29,7 @@
ant_distall = {
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.2-mcl.jar monetdb-1.7-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.2-mcl.jar monetdb-1.7-jdbc.jar jdbcclient.jar
xrpcapi.jar xrpcwrapper.jar xrpcclient.jar
}
TESTS = RunMtest
Index: MonetDB-java.spec.in
===================================================================
RCS file: /cvsroot/monetdb/java/MonetDB-java.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MonetDB-java.spec.in 3 Dec 2007 08:24:22 -0000 1.3
+++ MonetDB-java.spec.in 5 Dec 2007 17:02:00 -0000 1.4
@@ -42,6 +42,21 @@
written in Java that uses the JDBC driver to communicate with the
database server.
+This package also cotains the XRPC Wrapper, with which one can run
+ distributed XQuery queries on different XQuery processing engine.
+The XRPC Wrapper comes with three Java Archives
+- xrpcapi.jar: the XRPC Java API, which includes functions for
+ -- creating XRPC request messages,
+ -- parsing XRPC response messages,
+ -- send and/or receive XRPC messages using HTTP connection, and
+ -- XRPC specific exception classes
+- xrpcwrapper.jar: the XRPC Wrapper, which is a stand-alone program that
+ can be plugged in on top of an XQuery engine to handle non-nested XRPC
+ requests (i.e. requests that do not trigger another XRPC request).
+- xrpcclient.jar: an example client program, which (i) can be used to
+ test the XRPC Wrapper, and (ii) shows how to write an XRPC Java
+ client.
+
%description devel
MonetDB is a database management system that is developed from a
Index: build.xml
===================================================================
RCS file: /cvsroot/monetdb/java/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- build.xml 28 Nov 2007 14:53:48 -0000 1.1.1.1
+++ build.xml 5 Dec 2007 17:02:00 -0000 1.2
@@ -39,6 +39,9 @@
<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="xrpc-api-package" value="nl/cwi/monetdb/xquery/xrpc/api"
/>
+ <property name="xrpc-wrapper-package"
value="nl/cwi/monetdb/xquery/xrpc/wrapper" />
+ <property name="xrpc-client-package"
value="nl/cwi/monetdb/xquery/xrpc/client" />
<property file="build.local.properties" />
<property file="build.properties" />
@@ -52,6 +55,13 @@
<property name="xmldb-jar"
value="${jardir}/monetdb-${JDBC_MAJOR}.${JDBC_MINOR}-xmldb.jar" />
+ <property name="xrpc-api-jar"
+ value="${jardir}/xrpcapi.jar" />
+ <property name="xrpc-wrapper-jar"
+ value="${jardir}/xrpcwrapper.jar" />
+ <property name="xrpc-client-jar"
+ value="${jardir}/xrpcclient.jar" />
+
<!-- full target -->
<target name="all">
<antcall target="jar_jdbc" />
@@ -59,6 +69,10 @@
<antcall target="jar_mcl" />
<antcall target="jar_client" />
+ <antcall target="jar_xrpc_api" />
+ <antcall target="jar_xrpc_wrapper" />
+ <antcall target="jar_xrpc_client" />
+
<antcall target="doc" />
</target>
@@ -66,10 +80,24 @@
<antcall target="jar_mcl" />
<antcall target="jar_jdbc" />
<antcall target="jar_jdbcclient" />
+
+ <antcall target="jar_xrpc_api" />
+ <antcall target="jar_xrpc_wrapper" />
+ <antcall target="jar_xrpc_client" />
</target>
<target name="default">
<antcall target="jar_jdbcclient" />
+
+ <antcall target="jar_xrpc_api" />
+ <antcall target="jar_xrpc_wrapper" />
+ <antcall target="jar_xrpc_client" />
+ </target>
+
+ <target name="xrpc">
+ <antcall target="jar_xrpc_api" />
+ <antcall target="jar_xrpc_wrapper" />
+ <antcall target="jar_xrpc_client" />
</target>
<!-- jar targets -->
@@ -127,6 +155,53 @@
</jar>
</target>
+ <target name="jar_xrpc_api" depends="compile_xrpc_api">
+ <jar jarfile="${xrpc-api-jar}">
+ <fileset dir="${builddir}">
+ <include name="${xrpc-api-package}/**/*.class" />
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jar_xrpc_wrapper"
+ depends="compile_util,compile_xrpc_api,compile_xrpc_wrapper">
+ <jar jarfile="${xrpc-wrapper-jar}">
+ <fileset dir="${builddir}">
+ <include name="${util-package}/**/*.class" />
+ <include name="${xrpc-api-package}/**/*.class" />
+ <include name="${xrpc-wrapper-package}/**/*.class" />
+ </fileset>
+ <fileset dir="${srcdir}">
+ <include name="${xrpc-wrapper-package}/wrapper_functions.xq" />
+ </fileset>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}" />
+ <attribute name="Main-Class"
+ value="nl.cwi.monetdb.xquery.xrpc.wrapper.XRPCWrapper" />
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="jar_xrpc_client"
+ depends="compile_util,compile_xrpc_api,compile_xrpc_client">
+ <jar jarfile="${xrpc-client-jar}">
+ <fileset dir="${builddir}">
+ <include name="${util-package}/**/*.class" />
+ <include name="${xrpc-api-package}/**/*.class" />
+ <include name="${xrpc-client-package}/**/*.class" />
+ </fileset>
+ <fileset dir="${srcdir}">
+ <include name="${xrpc-client-package}/*.xml" />
+ <include name="${xrpc-client-package}/*.xq" />
+ </fileset>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}" />
+ <attribute name="Main-Class"
+ value="nl.cwi.monetdb.xquery.xrpc.client.XRPCTestClient" />
+ </manifest>
+ </jar>
+ </target>
+
<!-- compile targets -->
<target name="compile_jdbc" depends="prepare,driver">
<echo message="Compiling JDBC driver" />
@@ -205,6 +280,51 @@
</javac>
</target>
+ <target name="compile_xrpc_api" depends="prepare">
+ <echo message="Compiling XRPC Java API" />
+ <javac
+ classpath="${srcdir}"
+ srcdir="${srcdir}"
+ destdir="${builddir}"
+ debug="${debug}"
+ optimize="${optimize}"
+ target="${javac_version}"
+ source="${javac_version}"
+ >
+ <include name="${xrpc-api-package}/*.java" />
+ </javac>
+ </target>
+
+ <target name="compile_xrpc_wrapper" 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="${xrpc-wrapper-package}/*.java" />
+ </javac>
+ </target>
+
+ <target name="compile_xrpc_client" depends="prepare">
+ <echo message="Compiling XRPC (test) client" />
+ <javac
+ classpath="${srcdir}"
+ srcdir="${srcdir}"
+ destdir="${builddir}"
+ debug="${debug}"
+ optimize="${optimize}"
+ target="${javac_version}"
+ source="${javac_version}"
+ >
+ <include name="${xrpc-client-package}/**/*.java" />
+ </javac>
+ </target>
+
<!--
This generates MonetDriver.java and MonetDBDatabase.java from their
".java.in" equivalents. It's required for importing the driver
@@ -314,7 +434,8 @@
<!-- documentation target -->
<target name="doc"
-
depends="compile_mcl,compile_jdbc,compile_xmldb,compile_util,compile_client">
+
depends="compile_mcl,compile_jdbc,compile_xmldb,compile_util,compile_client,
+ compile_xrpc_api,compile_xrpc_wrapper, compile_xrpc_client">
<javadoc
destdir="${docdir}"
author="true"
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
