Changeset: 629b6cf13e8f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=629b6cf13e8f Modified Files: java/ChangeLog java/Makefile.ag java/build.xml java/src/nl/cwi/monetdb/xquery/xrpc/api/NamespaceContextImpl.java java/src/nl/cwi/monetdb/xquery/xrpc/api/XRPCException.java java/src/nl/cwi/monetdb/xquery/xrpc/api/XRPCHTTPConnection.java java/src/nl/cwi/monetdb/xquery/xrpc/api/XRPCMessage.java java/src/nl/cwi/monetdb/xquery/xrpc/api/XRPCReceiverException.java java/src/nl/cwi/monetdb/xquery/xrpc/api/XRPCSenderException.java java/src/nl/cwi/monetdb/xquery/xrpc/client/XRPCTestClient.java java/src/nl/cwi/monetdb/xquery/xrpc/client/auctions.xml java/src/nl/cwi/monetdb/xquery/xrpc/client/bib.xml java/src/nl/cwi/monetdb/xquery/xrpc/client/persons.xml java/src/nl/cwi/monetdb/xquery/xrpc/client/xrpcwrapper_testfunctions.xq java/src/nl/cwi/monetdb/xquery/xrpc/wrapper/XRPCWrapper.java java/src/nl/cwi/monetdb/xquery/xrpc/wrapper/XRPCWrapperWorker.java java/src/nl/cwi/monetdb/xquery/xrpc/wrapper/wrapper_functions.xq Branch: default Log Message:
java: remove XQuery related XRPC wrapper diffs (truncated from 13443 to 300 lines): diff --git a/java/ChangeLog b/java/ChangeLog --- a/java/ChangeLog +++ b/java/ChangeLog @@ -1,3 +1,6 @@ # ChangeLog file for java # This file is updated with Maddlog +* Mon Feb 7 2011 Fabian Groffen <[email protected]> +- Removed XQuery related XRPC wrapper code + diff --git a/java/Makefile.ag b/java/Makefile.ag --- a/java/Makefile.ag +++ b/java/Makefile.ag @@ -22,24 +22,18 @@ EXTRA_DIST_DIR = src \ example +JAVA_HOME = @JAVA_HOME@ + ant_distjdbc = { COND = HAVE_JAVAJDBC DIR = datadir/monetdb/lib FILES = monetdb-1.6-mcl.jar monetdb-1.18-jdbc.jar jdbcclient.jar } -ant_distxrpc = { - COND = HAVE_JAVAXRPC - DIR = datadir/monetdb/lib - FILES = xrpcapi.jar xrpcwrapper.jar xrpcclient.jar -} - ant_distmerocontrol = { COND = HAVE_JAVAMEROCONTROL DIR = datadir/monetdb/lib FILES = merocontrol.jar } -JAVA_HOME = @JAVA_HOME@ - # vim: ft=automake : diff --git a/java/build.xml b/java/build.xml --- a/java/build.xml +++ b/java/build.xml @@ -40,9 +40,6 @@ <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 name="mero-control-package" value="nl/cwi/monetdb/merovingian" /> <property file="build.local.properties" /> @@ -57,13 +54,6 @@ <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" /> - <property name="mero-control-jar" value="${jardir}/merocontrol.jar" /> @@ -75,8 +65,6 @@ to be fetched first --> <antcall target="jar_xmldb" /> - <antcall target="distxrpc" /> - <antcall target="distmerocontrol" /> <antcall target="doc" /> @@ -84,7 +72,6 @@ <target name="distall"> <antcall target="distjdbc" /> - <antcall target="distxrpc" /> <antcall target="distmerocontrol" /> </target> @@ -99,12 +86,6 @@ <antcall target="jar_jdbcclient" /> </target> - <target name="distxrpc"> - <antcall target="jar_xrpc_api" /> - <antcall target="jar_xrpc_wrapper" /> - <antcall target="jar_xrpc_client" /> - </target> - <target name="distmerocontrol"> <antcall target="jar_mero_control" /> </target> @@ -164,53 +145,6 @@ </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> - <target name="jar_mero_control" depends="compile_mero_control"> <jar jarfile="${mero-control-jar}"> @@ -301,51 +235,6 @@ </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> - <target name="compile_mero_control" depends="prepare"> <echo message="Compiling Merovingian Control library" /> <javac @@ -469,7 +358,7 @@ <!-- documentation target --> <target name="doc" - depends="compile_mcl,compile_jdbc,compile_util,compile_client,compile_xrpc_api,compile_xrpc_wrapper,compile_xrpc_client,compile_mero_control"> + depends="compile_mcl,compile_jdbc,compile_util,compile_client,compile_mero_control"> <javadoc destdir="${docdir}" author="true" @@ -482,7 +371,6 @@ <include name="${mcl-package}/**/*.java" /> <include name="${client-package}/**/*.java" /> <include name="${util-package}/**/*.java" /> - <include name="${xrpc-api-package}/**/*.java" /> <include name="${mero-control-package}/**/*.java" /> </fileset> @@ -491,7 +379,6 @@ <include name="${mcl-package}/**/*.java" /> <include name="${client-package}/**/*.java" /> <include name="${util-package}/**/*.java" /> - <include name="${xrpc-api-package}/**/*.java" /> <include name="${mero-control-package}/**/*.java" /> </fileset> </javadoc> diff --git a/java/src/nl/cwi/monetdb/xquery/xrpc/api/NamespaceContextImpl.java b/java/src/nl/cwi/monetdb/xquery/xrpc/api/NamespaceContextImpl.java deleted file mode 100644 --- a/java/src/nl/cwi/monetdb/xquery/xrpc/api/NamespaceContextImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * The contents of this file are subject to the MonetDB Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * - * The Original Code is the MonetDB Database System. - * - * The Initial Developer of the Original Code is CWI. - * Portions created by CWI are Copyright (C) 1997-July 2008 CWI. - * Copyright August 2008-2011 MonetDB B.V. - * All Rights Reserved. - */ - -package nl.cwi.monetdb.xquery.xrpc.api; - -import java.util.*; -import javax.xml.namespace.*; - -/** - * This class implements <code>NamespaceContex</code>, which is needed - * to evaluate an <code>XPath</code> expression on an XML document - * containing namespaces. - * This class provides functions to store and retrieve (prefix, uri) - * mappings for Namespaces. - * See the documentation of the interface <a - * href="http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/namespace/NamespaceContext.html";>NamespaceContext</a> - * for more information. - * - * @author Ying Zhang <[email protected]> - * @version 0.1 - */ - -public class NamespaceContextImpl implements NamespaceContext{ - private Map map; - - /** - * Creates a <code>NamespaceContextImpl</code> object. - */ - public NamespaceContextImpl(){ - map = new HashMap(); - } - - /** - * Creates a <code>NamespaceContextImpl</code> object with an initial binding of - * the given (<code>prefix</code>, <code>uri</code>). - * - * @param prefix Prefix of the Namespace - * @param uri URI of the Namespace - */ - public NamespaceContextImpl(String prefix, String uri){ - map = new HashMap(); - map.put(prefix, uri); - } - - /** - * Add a new binding of the given (<code>prefix</code>, - * <code>uri</code>). - * - * @param prefix Prefix of the Namespace - * @param uri URI of the Namespace - */ _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
