Update internal BDB to version 4.6.18.

169 files changed, 514 insertions, 14123 deletions

diff --git a/db/rpc_server/c/db_server_proc.c b/db/rpc_server/c/db_server_proc.c
index c563caa8d..dd10f93ab 100644
--- a/db/rpc_server/c/db_server_proc.c
+++ b/db/rpc_server/c/db_server_proc.c
@@ -1,16 +1,15 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2000-2006
- *	Oracle Corporation.  All rights reserved.
+ * Copyright (c) 2000,2007 Oracle.  All rights reserved.
  *
- * $Id: db_server_proc.c,v 12.14 2006/09/19 13:39:44 mjc Exp $
+ * $Id: db_server_proc.c,v 12.22 2007/06/28 13:59:24 bostic Exp $
  */
 
 #include "db_config.h"
 
 #include "db_int.h"
-#ifndef NO_SYSTEM_INCLUDES
+#ifdef HAVE_SYSTEM_INCLUDE_FILES
 #include <rpc/rpc.h>
 #endif
 #include "db_server.h"
@@ -373,7 +372,8 @@ __env_open_proc(dbenvcl_id, home, flags, mode, replyp)
 	if (__dbsrv_verbose) {
 		dbenv->set_errfile(dbenv, stderr);
 		dbenv->set_errpfx(dbenv, fullhome->home);
-	}
+	} else
+		dbenv->set_errfile(dbenv, NULL);
 
 	/*
 	 * Mask off flags we ignore
@@ -1755,6 +1755,47 @@ err:		FREE_IF_CHANGED(dbp->dbenv, key.data, keydata);
 }
 
 /*
+ * PUBLIC: void __db_get_priority_proc __P((u_int, __db_get_priority_reply *));
+ */
+void
+__db_get_priority_proc(dbpcl_id, replyp)
+	u_int dbpcl_id;
+	__db_get_priority_reply *replyp;
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	replyp->status =
+	    dbp->get_priority(dbp, (DB_CACHE_PRIORITY *)&replyp->priority);
+}
+
+/*
+ * PUBLIC: void __db_set_priority_proc __P((u_int, u_int32_t,
+ * PUBLIC:      __db_set_priority_reply *));
+ */
+void
+__db_set_priority_proc(dbpcl_id, priority, replyp)
+	u_int dbpcl_id;
+	u_int32_t priority;
+	__db_set_priority_reply *replyp;
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_priority(dbp, (DB_CACHE_PRIORITY)priority);
+
+	replyp->status = ret;
+	return;
+}
+
+/*
  * PUBLIC: void __db_get_re_delim_proc __P((u_int, __db_get_re_delim_reply *));
  */
 void
@@ -2198,12 +2239,12 @@ out:	__os_free(dbenv, jcurs);
 }
 
 /*
- * PUBLIC: void __dbc_c_close_proc __P((u_int, __dbc_c_close_reply *));
+ * PUBLIC: void __dbc_close_proc __P((u_int, __dbc_close_reply *));
  */
 void
-__dbc_c_close_proc(dbccl_id, replyp)
+__dbc_close_proc(dbccl_id, replyp)
 	u_int dbccl_id;
-	__dbc_c_close_reply *replyp;
+	__dbc_close_reply *replyp;
 {
 	ct_entry *dbc_ctp;
 
@@ -2213,14 +2254,14 @@ __dbc_c_close_proc(dbccl_id, replyp)
 }
 
 /*
- * PUBLIC: void __dbc_c_count_proc
- * PUBLIC:     __P((u_int, u_int32_t, __dbc_c_count_reply *));
+ * PUBLIC: void __dbc_count_proc
+ * PUBLIC:     __P((u_int, u_int32_t, __dbc_count_reply *));
  */
 void
-__dbc_c_count_proc(dbccl_id, flags, replyp)
+__dbc_count_proc(dbccl_id, flags, replyp)
 	u_int dbccl_id;
 	u_int32_t flags;
-	__dbc_c_count_reply *replyp;
+	__dbc_count_reply *replyp;
 {
 	DBC *dbc;
 	ct_entry *dbc_ctp;
@@ -2230,7 +2271,7 @@ __dbc_c_count_proc(dbccl_id, flags, replyp)
 	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
 	dbc = (DBC *)dbc_ctp->ct_anyp;
 
-	ret = dbc->c_count(dbc, &num, flags);
+	ret = dbc->count(dbc, &num, flags);
 	replyp->status = ret;
 	if (ret == 0)
 		replyp->dupcount = num;
@@ -2238,13 +2279,13 @@ __dbc_c_count_proc(dbccl_id, flags, replyp)
 }
 
 /*
- * PUBLIC: void __dbc_c_del_proc __P((u_int, u_int32_t, __dbc_c_del_reply *));
+ * PUBLIC: void __dbc_del_proc __P((u_int, u_int32_t, __dbc_del_reply *));
  */
 void
-__dbc_c_del_proc(dbccl_id, flags, replyp)
+__dbc_del_proc(dbccl_id, flags, replyp)
 	u_int dbccl_id;
 	u_int32_t flags;
-	__dbc_c_del_reply *replyp;
+	__dbc_del_reply *replyp;
 {
 	DBC *dbc;
 	ct_entry *dbc_ctp;
@@ -2253,20 +2294,20 @@ __dbc_c_del_proc(dbccl_id, flags, replyp)
 	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
 	dbc = (DBC *)dbc_ctp->ct_anyp;
 
-	ret = dbc->c_del(dbc, flags);
+	ret = dbc->del(dbc, flags);
 
 	replyp->status = ret;
 	return;
 }
 
 /*
- * PUBLIC: void __dbc_c_dup_proc __P((u_int, u_int32_t, __dbc_c_dup_reply *));
+ * PUBLIC: void __dbc_dup_proc __P((u_int, u_int32_t, __dbc_dup_reply *));
  */
 void
-__dbc_c_dup_proc(dbccl_id, flags, replyp)
+__dbc_dup_proc(dbccl_id, flags, replyp)
 	u_int dbccl_id;
 	u_int32_t flags;
-	__dbc_c_dup_reply *replyp;
+	__dbc_dup_reply *replyp;
 {
 	DBC *dbc, *newdbc;
 	ct_entry *dbc_ctp, *new_ctp;
@@ -2279,7 +2320,7 @@ __dbc_c_dup_proc(dbccl_id, flags, replyp)
 	if (new_ctp == NULL)
 		return;
 
-	if ((ret = dbc->c_dup(dbc, &newdbc, flags)) == 0) {
+	if ((ret = dbc->dup(dbc, &newdbc, flags)) == 0) {
 		new_ctp->ct_dbc = newdbc;
 		new_ctp->ct_type = CT_CURSOR;
 		new_ctp->ct_parent = dbc_ctp->ct_parent;
@@ -2300,13 +2341,13 @@ __dbc_c_dup_proc(dbccl_id, flags, replyp)
 }
 
 /*
- * PUBLIC: void __dbc_c_get_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC: void __dbc_get_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t,
  * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, __dbc_c_get_reply *,
+ * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, __dbc_get_reply *,
  * PUBLIC:     int *));
  */
 void
-__dbc_c_get_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
+__dbc_get_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
     keysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize,
     flags, replyp, freep)
 	u_int dbccl_id;
@@ -2323,7 +2364,7 @@ __dbc_c_get_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
 	void *datadata;
 	u_int32_t datasize;
 	u_int32_t flags;
-	__dbc_c_get_reply *replyp;
+	__dbc_get_reply *replyp;
 	int * freep;
 {
 	DBC *dbc;
@@ -2381,7 +2422,7 @@ __dbc_c_get_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
 		data.flags |= DB_DBT_PARTIAL;
 
 	/* Got all our stuff, now do the get */
-	ret = dbc->c_get(dbc, &key, &data, flags);
+	ret = dbc->get(dbc, &key, &data, flags);
 
 	/*
 	 * Otherwise just status.
@@ -2441,14 +2482,14 @@ err:		FREE_IF_CHANGED(dbenv, key.data, keydata);
 }
 
 /*
- * PUBLIC: void __dbc_c_pget_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC: void __dbc_pget_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t,
  * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
  * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, __dbc_c_pget_reply *,
+ * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, __dbc_pget_reply *,
  * PUBLIC:     int *));
  */
 void
-__dbc_c_pget_proc(dbccl_id, skeydlen, skeydoff, skeyulen, skeyflags,
+__dbc_pget_proc(dbccl_id, skeydlen, skeydoff, skeyulen, skeyflags,
     skeydata, skeysize, pkeydlen, pkeydoff, pkeyulen, pkeyflags, pkeydata,
     pkeysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize,
     flags, replyp, freep)
@@ -2472,7 +2513,7 @@ __dbc_c_pget_proc(dbccl_id, skeydlen, skeydoff, skeyulen, skeyflags,
 	void *datadata;
 	u_int32_t datasize;
 	u_int32_t flags;
-	__dbc_c_pget_reply *replyp;
+	__dbc_pget_reply *replyp;
 	int * freep;
 {
 	DBC *dbc;
@@ -2525,7 +2566,7 @@ __dbc_c_pget_proc(dbccl_id, skeydlen, skeydoff, skeyulen, skeyflags,
 	data.data = datadata;
 
 	/* Got all our stuff, now do the get */
-	ret = dbc->c_pget(dbc, &skey, &pkey, &data, flags);
+	ret = dbc->pget(dbc, &skey, &pkey, &data, flags);
 	/*
 	 * Otherwise just status.
 	 */
@@ -2609,13 +2650,13 @@ err:		FREE_IF_CHANGED(dbenv, skey.data, skeydata);
 }
 
 /*
- * PUBLIC: void __dbc_c_put_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC: void __dbc_put_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t,
  * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, __dbc_c_put_reply *,
+ * PUBLIC:     u_int32_t, void *, u_int32_t, u_int32_t, __dbc_put_reply *,
  * PUBLIC:     int *));
  */
 void
-__dbc_c_put_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
+__dbc_put_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
     keysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize,
     flags, replyp, freep)
 	u_int dbccl_id;
@@ -2632,7 +2673,7 @@ __dbc_c_put_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
 	void *datadata;
 	u_int32_t datasize;
 	u_int32_t flags;
-	__dbc_c_put_reply *replyp;
+	__dbc_put_reply *replyp;
 	int * freep;
 {
 	DB *dbp;
@@ -2669,7 +2710,7 @@ __dbc_c_put_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
 	data.data = datadata;
 
 	/* Got all our stuff, now do the put */
-	ret = dbc->c_put(dbc, &key, &data, flags);
+	ret = dbc->put(dbc, &key, &data, flags);
 
 	*freep = 0;
 	if (ret == 0 && (flags == DB_AFTER || flags == DB_BEFORE) &&
@@ -2686,3 +2727,45 @@ __dbc_c_put_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata,
 	replyp->status = ret;
 	return;
 }
+
+/*
+ * PUBLIC: void
+ * PUBLIC: __dbc_get_priority_proc __P((u_int, __dbc_get_priority_reply *));
+ */
+void
+__dbc_get_priority_proc(dbccl_id, replyp)
+	u_int dbccl_id;
+	__dbc_get_priority_reply *replyp;
+{
+	DBC *dbc;
+	ct_entry *dbc_ctp;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+
+	replyp->status =
+	    dbc->get_priority(dbc, (DB_CACHE_PRIORITY *)&replyp->priority);
+}
+
+/*
+ * PUBLIC: void __dbc_set_priority_proc __P((u_int, u_int32_t,
+ * PUBLIC:      __dbc_set_priority_reply *));
+ */
+void
+__dbc_set_priority_proc(dbccl_id, priority, replyp)
+	u_int dbccl_id;
+	u_int32_t priority;
+	__dbc_set_priority_reply *replyp;
+{
+	DBC *dbc;
+	ct_entry *dbc_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+
+	ret = dbc->set_priority(dbc, (DB_CACHE_PRIORITY)priority);
+
+	replyp->status = ret;
+	return;
+}
diff --git a/db/rpc_server/c/db_server_util.c b/db/rpc_server/c/db_server_util.c
index 9ef8dfcdf..ac5bbc8c4 100644
--- a/db/rpc_server/c/db_server_util.c
+++ b/db/rpc_server/c/db_server_util.c
@@ -1,16 +1,15 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2000-2006
- *	Oracle Corporation.  All rights reserved.
+ * Copyright (c) 2000,2007 Oracle.  All rights reserved.
  *
- * $Id: db_server_util.c,v 12.9 2006/08/24 14:46:29 bostic Exp $
+ * $Id: db_server_util.c,v 12.13 2007/05/17 15:15:52 bostic Exp $
  */
 
 #include "db_config.h"
 
 #include "db_int.h"
-#ifndef NO_SYSTEM_INCLUDES
+#ifdef HAVE_SYSTEM_INCLUDE_FILES
 #include <rpc/rpc.h>
 #endif
 #include "db_server.h"
@@ -597,7 +596,7 @@ __dbc_close_int(dbc_ctp)
 
 	dbc = (DBC *)dbc_ctp->ct_anyp;
 
-	ret = dbc->c_close(dbc);
+	ret = dbc->close(dbc);
 	/*
 	 * If this cursor is a join cursor then we need to fix up the
 	 * cursors that it was joined from so that they are independent again.
diff --git a/db/rpc_server/c/gen_db_server.c b/db/rpc_server/c/gen_db_server.c
index 0f8062648..a3b3dcac6 100644
--- a/db/rpc_server/c/gen_db_server.c
+++ b/db/rpc_server/c/gen_db_server.c
@@ -2,7 +2,7 @@
 #include "db_config.h"
 
 #include "db_int.h"
-#ifndef NO_SYSTEM_INCLUDES
+#ifdef HAVE_SYSTEM_INCLUDE_FILES
 #include <rpc/rpc.h>
 #endif
 #include "db_server.h"
@@ -10,7 +10,7 @@
 #include "dbinc_auto/rpc_server_ext.h"
 
 __env_create_reply *
-__db_env_create_4005__SVCSUFFIX__(msg, req)
+__db_env_create_4006__SVCSUFFIX__(msg, req)
 	__env_create_msg *msg;
 	struct svc_req *req;
 {
@@ -24,7 +24,7 @@ __db_env_create_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_cdsgroup_begin_reply *
-__db_env_cdsgroup_begin_4005__SVCSUFFIX__(msg, req)
+__db_env_cdsgroup_begin_4006__SVCSUFFIX__(msg, req)
 	__env_cdsgroup_begin_msg *msg;
 	struct svc_req *req;
 {
@@ -38,7 +38,7 @@ __db_env_cdsgroup_begin_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_close_reply *
-__db_env_close_4005__SVCSUFFIX__(msg, req)
+__db_env_close_4006__SVCSUFFIX__(msg, req)
 	__env_close_msg *msg;
 	struct svc_req *req;
 {
@@ -53,7 +53,7 @@ __db_env_close_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_dbremove_reply *
-__db_env_dbremove_4005__SVCSUFFIX__(msg, req)
+__db_env_dbremove_4006__SVCSUFFIX__(msg, req)
 	__env_dbremove_msg *msg;
 	struct svc_req *req;
 {
@@ -71,7 +71,7 @@ __db_env_dbremove_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_dbrename_reply *
-__db_env_dbrename_4005__SVCSUFFIX__(msg, req)
+__db_env_dbrename_4006__SVCSUFFIX__(msg, req)
 	__env_dbrename_msg *msg;
 	struct svc_req *req;
 {
@@ -90,7 +90,7 @@ __db_env_dbrename_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_get_cachesize_reply *
-__db_env_get_cachesize_4005__SVCSUFFIX__(msg, req)
+__db_env_get_cachesize_4006__SVCSUFFIX__(msg, req)
 	__env_get_cachesize_msg *msg;
 	struct svc_req *req;
 {
@@ -104,7 +104,7 @@ __db_env_get_cachesize_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_get_encrypt_flags_reply *
-__db_env_get_encrypt_flags_4005__SVCSUFFIX__(msg, req)
+__db_env_get_encrypt_flags_4006__SVCSUFFIX__(msg, req)
 	__env_get_encrypt_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -118,7 +118,7 @@ __db_env_get_encrypt_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_get_flags_reply *
-__db_env_get_flags_4005__SVCSUFFIX__(msg, req)
+__db_env_get_flags_4006__SVCSUFFIX__(msg, req)
 	__env_get_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -132,7 +132,7 @@ __db_env_get_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_get_home_reply *
-__db_env_get_home_4005__SVCSUFFIX__(msg, req)
+__db_env_get_home_4006__SVCSUFFIX__(msg, req)
 	__env_get_home_msg *msg;
 	struct svc_req *req;
 {
@@ -146,7 +146,7 @@ __db_env_get_home_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_get_open_flags_reply *
-__db_env_get_open_flags_4005__SVCSUFFIX__(msg, req)
+__db_env_get_open_flags_4006__SVCSUFFIX__(msg, req)
 	__env_get_open_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -160,7 +160,7 @@ __db_env_get_open_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_open_reply *
-__db_env_open_4005__SVCSUFFIX__(msg, req)
+__db_env_open_4006__SVCSUFFIX__(msg, req)
 	__env_open_msg *msg;
 	struct svc_req *req;
 {
@@ -177,7 +177,7 @@ __db_env_open_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_remove_reply *
-__db_env_remove_4005__SVCSUFFIX__(msg, req)
+__db_env_remove_4006__SVCSUFFIX__(msg, req)
 	__env_remove_msg *msg;
 	struct svc_req *req;
 {
@@ -193,7 +193,7 @@ __db_env_remove_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_set_cachesize_reply *
-__db_env_set_cachesize_4005__SVCSUFFIX__(msg, req)
+__db_env_set_cachesize_4006__SVCSUFFIX__(msg, req)
 	__env_set_cachesize_msg *msg;
 	struct svc_req *req;
 {
@@ -210,7 +210,7 @@ __db_env_set_cachesize_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_set_encrypt_reply *
-__db_env_set_encrypt_4005__SVCSUFFIX__(msg, req)
+__db_env_set_encrypt_4006__SVCSUFFIX__(msg, req)
 	__env_set_encrypt_msg *msg;
 	struct svc_req *req;
 {
@@ -226,7 +226,7 @@ __db_env_set_encrypt_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_set_flags_reply *
-__db_env_set_flags_4005__SVCSUFFIX__(msg, req)
+__db_env_set_flags_4006__SVCSUFFIX__(msg, req)
 	__env_set_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -242,7 +242,7 @@ __db_env_set_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_txn_begin_reply *
-__db_env_txn_begin_4005__SVCSUFFIX__(msg, req)
+__db_env_txn_begin_4006__SVCSUFFIX__(msg, req)
 	__env_txn_begin_msg *msg;
 	struct svc_req *req;
 {
@@ -258,7 +258,7 @@ __db_env_txn_begin_4005__SVCSUFFIX__(msg, req)
 }
 
 __env_txn_recover_reply *
-__db_env_txn_recover_4005__SVCSUFFIX__(msg, req)
+__db_env_txn_recover_4006__SVCSUFFIX__(msg, req)
 	__env_txn_recover_msg *msg;
 	struct svc_req *req;
 {
@@ -283,7 +283,7 @@ __db_env_txn_recover_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_create_reply *
-__db_db_create_4005__SVCSUFFIX__(msg, req)
+__db_db_create_4006__SVCSUFFIX__(msg, req)
 	__db_create_msg *msg;
 	struct svc_req *req;
 {
@@ -298,7 +298,7 @@ __db_db_create_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_associate_reply *
-__db_db_associate_4005__SVCSUFFIX__(msg, req)
+__db_db_associate_4006__SVCSUFFIX__(msg, req)
 	__db_associate_msg *msg;
 	struct svc_req *req;
 {
@@ -315,7 +315,7 @@ __db_db_associate_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_close_reply *
-__db_db_close_4005__SVCSUFFIX__(msg, req)
+__db_db_close_4006__SVCSUFFIX__(msg, req)
 	__db_close_msg *msg;
 	struct svc_req *req;
 {
@@ -330,7 +330,7 @@ __db_db_close_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_cursor_reply *
-__db_db_cursor_4005__SVCSUFFIX__(msg, req)
+__db_db_cursor_4006__SVCSUFFIX__(msg, req)
 	__db_cursor_msg *msg;
 	struct svc_req *req;
 {
@@ -346,7 +346,7 @@ __db_db_cursor_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_del_reply *
-__db_db_del_4005__SVCSUFFIX__(msg, req)
+__db_db_del_4006__SVCSUFFIX__(msg, req)
 	__db_del_msg *msg;
 	struct svc_req *req;
 {
@@ -368,7 +368,7 @@ __db_db_del_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_reply *
-__db_db_get_4005__SVCSUFFIX__(msg, req)
+__db_db_get_4006__SVCSUFFIX__(msg, req)
 	__db_get_msg *msg;
 	struct svc_req *req;
 {
@@ -405,7 +405,7 @@ __db_db_get_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_bt_minkey_reply *
-__db_db_get_bt_minkey_4005__SVCSUFFIX__(msg, req)
+__db_db_get_bt_minkey_4006__SVCSUFFIX__(msg, req)
 	__db_get_bt_minkey_msg *msg;
 	struct svc_req *req;
 {
@@ -419,7 +419,7 @@ __db_db_get_bt_minkey_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_dbname_reply *
-__db_db_get_dbname_4005__SVCSUFFIX__(msg, req)
+__db_db_get_dbname_4006__SVCSUFFIX__(msg, req)
 	__db_get_dbname_msg *msg;
 	struct svc_req *req;
 {
@@ -433,7 +433,7 @@ __db_db_get_dbname_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_encrypt_flags_reply *
-__db_db_get_encrypt_flags_4005__SVCSUFFIX__(msg, req)
+__db_db_get_encrypt_flags_4006__SVCSUFFIX__(msg, req)
 	__db_get_encrypt_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -447,7 +447,7 @@ __db_db_get_encrypt_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_flags_reply *
-__db_db_get_flags_4005__SVCSUFFIX__(msg, req)
+__db_db_get_flags_4006__SVCSUFFIX__(msg, req)
 	__db_get_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -461,7 +461,7 @@ __db_db_get_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_h_ffactor_reply *
-__db_db_get_h_ffactor_4005__SVCSUFFIX__(msg, req)
+__db_db_get_h_ffactor_4006__SVCSUFFIX__(msg, req)
 	__db_get_h_ffactor_msg *msg;
 	struct svc_req *req;
 {
@@ -475,7 +475,7 @@ __db_db_get_h_ffactor_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_h_nelem_reply *
-__db_db_get_h_nelem_4005__SVCSUFFIX__(msg, req)
+__db_db_get_h_nelem_4006__SVCSUFFIX__(msg, req)
 	__db_get_h_nelem_msg *msg;
 	struct svc_req *req;
 {
@@ -489,7 +489,7 @@ __db_db_get_h_nelem_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_lorder_reply *
-__db_db_get_lorder_4005__SVCSUFFIX__(msg, req)
+__db_db_get_lorder_4006__SVCSUFFIX__(msg, req)
 	__db_get_lorder_msg *msg;
 	struct svc_req *req;
 {
@@ -503,7 +503,7 @@ __db_db_get_lorder_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_open_flags_reply *
-__db_db_get_open_flags_4005__SVCSUFFIX__(msg, req)
+__db_db_get_open_flags_4006__SVCSUFFIX__(msg, req)
 	__db_get_open_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -517,7 +517,7 @@ __db_db_get_open_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_pagesize_reply *
-__db_db_get_pagesize_4005__SVCSUFFIX__(msg, req)
+__db_db_get_pagesize_4006__SVCSUFFIX__(msg, req)
 	__db_get_pagesize_msg *msg;
 	struct svc_req *req;
 {
@@ -530,8 +530,22 @@ __db_db_get_pagesize_4005__SVCSUFFIX__(msg, req)
 	return (&reply);
 }
 
+__db_get_priority_reply *
+__db_db_get_priority_4006__SVCSUFFIX__(msg, req)
+	__db_get_priority_msg *msg;
+	struct svc_req *req;
+{
+	static __db_get_priority_reply reply; /* must be static */
+	COMPQUIET(req, NULL);
+
+	__db_get_priority_proc(msg->dbpcl_id,
+	    &reply);
+
+	return (&reply);
+}
+
 __db_get_q_extentsize_reply *
-__db_db_get_q_extentsize_4005__SVCSUFFIX__(msg, req)
+__db_db_get_q_extentsize_4006__SVCSUFFIX__(msg, req)
 	__db_get_q_extentsize_msg *msg;
 	struct svc_req *req;
 {
@@ -545,7 +559,7 @@ __db_db_get_q_extentsize_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_re_delim_reply *
-__db_db_get_re_delim_4005__SVCSUFFIX__(msg, req)
+__db_db_get_re_delim_4006__SVCSUFFIX__(msg, req)
 	__db_get_re_delim_msg *msg;
 	struct svc_req *req;
 {
@@ -559,7 +573,7 @@ __db_db_get_re_delim_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_re_len_reply *
-__db_db_get_re_len_4005__SVCSUFFIX__(msg, req)
+__db_db_get_re_len_4006__SVCSUFFIX__(msg, req)
 	__db_get_re_len_msg *msg;
 	struct svc_req *req;
 {
@@ -573,7 +587,7 @@ __db_db_get_re_len_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_get_re_pad_reply *
-__db_db_get_re_pad_4005__SVCSUFFIX__(msg, req)
+__db_db_get_re_pad_4006__SVCSUFFIX__(msg, req)
 	__db_get_re_pad_msg *msg;
 	struct svc_req *req;
 {
@@ -587,7 +601,7 @@ __db_db_get_re_pad_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_join_reply *
-__db_db_join_4005__SVCSUFFIX__(msg, req)
+__db_db_join_4006__SVCSUFFIX__(msg, req)
 	__db_join_msg *msg;
 	struct svc_req *req;
 {
@@ -604,7 +618,7 @@ __db_db_join_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_key_range_reply *
-__db_db_key_range_4005__SVCSUFFIX__(msg, req)
+__db_db_key_range_4006__SVCSUFFIX__(msg, req)
 	__db_key_range_msg *msg;
 	struct svc_req *req;
 {
@@ -626,7 +640,7 @@ __db_db_key_range_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_open_reply *
-__db_db_open_4005__SVCSUFFIX__(msg, req)
+__db_db_open_4006__SVCSUFFIX__(msg, req)
 	__db_open_msg *msg;
 	struct svc_req *req;
 {
@@ -646,7 +660,7 @@ __db_db_open_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_pget_reply *
-__db_db_pget_4005__SVCSUFFIX__(msg, req)
+__db_db_pget_4006__SVCSUFFIX__(msg, req)
 	__db_pget_msg *msg;
 	struct svc_req *req;
 {
@@ -690,7 +704,7 @@ __db_db_pget_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_put_reply *
-__db_db_put_4005__SVCSUFFIX__(msg, req)
+__db_db_put_4006__SVCSUFFIX__(msg, req)
 	__db_put_msg *msg;
 	struct svc_req *req;
 {
@@ -726,7 +740,7 @@ __db_db_put_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_remove_reply *
-__db_db_remove_4005__SVCSUFFIX__(msg, req)
+__db_db_remove_4006__SVCSUFFIX__(msg, req)
 	__db_remove_msg *msg;
 	struct svc_req *req;
 {
@@ -743,7 +757,7 @@ __db_db_remove_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_rename_reply *
-__db_db_rename_4005__SVCSUFFIX__(msg, req)
+__db_db_rename_4006__SVCSUFFIX__(msg, req)
 	__db_rename_msg *msg;
 	struct svc_req *req;
 {
@@ -761,7 +775,7 @@ __db_db_rename_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_bt_minkey_reply *
-__db_db_set_bt_minkey_4005__SVCSUFFIX__(msg, req)
+__db_db_set_bt_minkey_4006__SVCSUFFIX__(msg, req)
 	__db_set_bt_minkey_msg *msg;
 	struct svc_req *req;
 {
@@ -776,7 +790,7 @@ __db_db_set_bt_minkey_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_encrypt_reply *
-__db_db_set_encrypt_4005__SVCSUFFIX__(msg, req)
+__db_db_set_encrypt_4006__SVCSUFFIX__(msg, req)
 	__db_set_encrypt_msg *msg;
 	struct svc_req *req;
 {
@@ -792,7 +806,7 @@ __db_db_set_encrypt_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_flags_reply *
-__db_db_set_flags_4005__SVCSUFFIX__(msg, req)
+__db_db_set_flags_4006__SVCSUFFIX__(msg, req)
 	__db_set_flags_msg *msg;
 	struct svc_req *req;
 {
@@ -807,7 +821,7 @@ __db_db_set_flags_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_h_ffactor_reply *
-__db_db_set_h_ffactor_4005__SVCSUFFIX__(msg, req)
+__db_db_set_h_ffactor_4006__SVCSUFFIX__(msg, req)
 	__db_set_h_ffactor_msg *msg;
 	struct svc_req *req;
 {
@@ -822,7 +836,7 @@ __db_db_set_h_ffactor_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_h_nelem_reply *
-__db_db_set_h_nelem_4005__SVCSUFFIX__(msg, req)
+__db_db_set_h_nelem_4006__SVCSUFFIX__(msg, req)
 	__db_set_h_nelem_msg *msg;
 	struct svc_req *req;
 {
@@ -837,7 +851,7 @@ __db_db_set_h_nelem_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_lorder_reply *
-__db_db_set_lorder_4005__SVCSUFFIX__(msg, req)
+__db_db_set_lorder_4006__SVCSUFFIX__(msg, req)
 	__db_set_lorder_msg *msg;
 	struct svc_req *req;
 {
@@ -852,7 +866,7 @@ __db_db_set_lorder_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_pagesize_reply *
-__db_db_set_pagesize_4005__SVCSUFFIX__(msg, req)
+__db_db_set_pagesize_4006__SVCSUFFIX__(msg, req)
 	__db_set_pagesize_msg *msg;
 	struct svc_req *req;
 {
@@ -866,8 +880,23 @@ __db_db_set_pagesize_4005__SVCSUFFIX__(msg, req)
 	return (&reply);
 }
 
+__db_set_priority_reply *
+__db_db_set_priority_4006__SVCSUFFIX__(msg, req)
+	__db_set_priority_msg *msg;
+	struct svc_req *req;
+{
+	static __db_set_priority_reply reply; /* must be static */
+	COMPQUIET(req, NULL);
+
+	__db_set_priority_proc(msg->dbpcl_id,
+	    msg->priority,
+	    &reply);
+
+	return (&reply);
+}
+
 __db_set_q_extentsize_reply *
-__db_db_set_q_extentsize_4005__SVCSUFFIX__(msg, req)
+__db_db_set_q_extentsize_4006__SVCSUFFIX__(msg, req)
 	__db_set_q_extentsize_msg *msg;
 	struct svc_req *req;
 {
@@ -882,7 +911,7 @@ __db_db_set_q_extentsize_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_re_delim_reply *
-__db_db_set_re_delim_4005__SVCSUFFIX__(msg, req)
+__db_db_set_re_delim_4006__SVCSUFFIX__(msg, req)
 	__db_set_re_delim_msg *msg;
 	struct svc_req *req;
 {
@@ -897,7 +926,7 @@ __db_db_set_re_delim_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_re_len_reply *
-__db_db_set_re_len_4005__SVCSUFFIX__(msg, req)
+__db_db_set_re_len_4006__SVCSUFFIX__(msg, req)
 	__db_set_re_len_msg *msg;
 	struct svc_req *req;
 {
@@ -912,7 +941,7 @@ __db_db_set_re_len_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_set_re_pad_reply *
-__db_db_set_re_pad_4005__SVCSUFFIX__(msg, req)
+__db_db_set_re_pad_4006__SVCSUFFIX__(msg, req)
 	__db_set_re_pad_msg *msg;
 	struct svc_req *req;
 {
@@ -927,7 +956,7 @@ __db_db_set_re_pad_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_stat_reply *
-__db_db_stat_4005__SVCSUFFIX__(msg, req)
+__db_db_stat_4006__SVCSUFFIX__(msg, req)
 	__db_stat_msg *msg;
 	struct svc_req *req;
 {
@@ -951,7 +980,7 @@ __db_db_stat_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_sync_reply *
-__db_db_sync_4005__SVCSUFFIX__(msg, req)
+__db_db_sync_4006__SVCSUFFIX__(msg, req)
 	__db_sync_msg *msg;
 	struct svc_req *req;
 {
@@ -966,7 +995,7 @@ __db_db_sync_4005__SVCSUFFIX__(msg, req)
 }
 
 __db_truncate_reply *
-__db_db_truncate_4005__SVCSUFFIX__(msg, req)
+__db_db_truncate_4006__SVCSUFFIX__(msg, req)
 	__db_truncate_msg *msg;
 	struct svc_req *req;
 {
@@ -981,83 +1010,83 @@ __db_db_truncate_4005__SVCSUFFIX__(msg, req)
 	return (&reply);
 }
 
-__dbc_c_close_reply *
-__db_dbc_c_close_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_close_msg *msg;
+__dbc_close_reply *
+__db_dbc_close_4006__SVCSUFFIX__(msg, req)
+	__dbc_close_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_close_reply reply; /* must be static */
+	static __dbc_close_reply reply; /* must be static */
 	COMPQUIET(req, NULL);
 
-	__dbc_c_close_proc(msg->dbccl_id,
+	__dbc_close_proc(msg->dbccl_id,
 	    &reply);
 
 	return (&reply);
 }
 
-__dbc_c_count_reply *
-__db_dbc_c_count_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_count_msg *msg;
+__dbc_count_reply *
+__db_dbc_count_4006__SVCSUFFIX__(msg, req)
+	__dbc_count_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_count_reply reply; /* must be static */
+	static __dbc_count_reply reply; /* must be static */
 	COMPQUIET(req, NULL);
 
-	__dbc_c_count_proc(msg->dbccl_id,
+	__dbc_count_proc(msg->dbccl_id,
 	    msg->flags,
 	    &reply);
 
 	return (&reply);
 }
 
-__dbc_c_del_reply *
-__db_dbc_c_del_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_del_msg *msg;
+__dbc_del_reply *
+__db_dbc_del_4006__SVCSUFFIX__(msg, req)
+	__dbc_del_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_del_reply reply; /* must be static */
+	static __dbc_del_reply reply; /* must be static */
 	COMPQUIET(req, NULL);
 
-	__dbc_c_del_proc(msg->dbccl_id,
+	__dbc_del_proc(msg->dbccl_id,
 	    msg->flags,
 	    &reply);
 
 	return (&reply);
 }
 
-__dbc_c_dup_reply *
-__db_dbc_c_dup_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_dup_msg *msg;
+__dbc_dup_reply *
+__db_dbc_dup_4006__SVCSUFFIX__(msg, req)
+	__dbc_dup_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_dup_reply reply; /* must be static */
+	static __dbc_dup_reply reply; /* must be static */
 	COMPQUIET(req, NULL);
 
-	__dbc_c_dup_proc(msg->dbccl_id,
+	__dbc_dup_proc(msg->dbccl_id,
 	    msg->flags,
 	    &reply);
 
 	return (&reply);
 }
 
-__dbc_c_get_reply *
-__db_dbc_c_get_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_get_msg *msg;
+__dbc_get_reply *
+__db_dbc_get_4006__SVCSUFFIX__(msg, req)
+	__dbc_get_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_get_reply reply; /* must be static */
-	static int __dbc_c_get_free = 0; /* must be static */
+	static __dbc_get_reply reply; /* must be static */
+	static int __dbc_get_free = 0; /* must be static */
 
 	COMPQUIET(req, NULL);
-	if (__dbc_c_get_free)
-		xdr_free((xdrproc_t)xdr___dbc_c_get_reply, (void *)&reply);
-	__dbc_c_get_free = 0;
+	if (__dbc_get_free)
+		xdr_free((xdrproc_t)xdr___dbc_get_reply, (void *)&reply);
+	__dbc_get_free = 0;
 
 	/* Reinitialize allocated fields */
 	reply.keydata.keydata_val = NULL;
 	reply.datadata.datadata_val = NULL;
 
-	__dbc_c_get_proc(msg->dbccl_id,
+	__dbc_get_proc(msg->dbccl_id,
 	    msg->keydlen,
 	    msg->keydoff,
 	    msg->keyulen,
@@ -1072,29 +1101,43 @@ __db_dbc_c_get_4005__SVCSUFFIX__(msg, req)
 	    msg->datadata.datadata_len,
 	    msg->flags,
 	    &reply,
-	    &__dbc_c_get_free);
+	    &__dbc_get_free);
 	return (&reply);
 }
 
-__dbc_c_pget_reply *
-__db_dbc_c_pget_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_pget_msg *msg;
+__dbc_get_priority_reply *
+__db_dbc_get_priority_4006__SVCSUFFIX__(msg, req)
+	__dbc_get_priority_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_pget_reply reply; /* must be static */
-	static int __dbc_c_pget_free = 0; /* must be static */
+	static __dbc_get_priority_reply reply; /* must be static */
+	COMPQUIET(req, NULL);
+
+	__dbc_get_priority_proc(msg->dbccl_id,
+	    &reply);
+
+	return (&reply);
+}
+
+__dbc_pget_reply *
+__db_dbc_pget_4006__SVCSUFFIX__(msg, req)
+	__dbc_pget_msg *msg;
+	struct svc_req *req;
+{
+	static __dbc_pget_reply reply; /* must be static */
+	static int __dbc_pget_free = 0; /* must be static */
 
 	COMPQUIET(req, NULL);
-	if (__dbc_c_pget_free)
-		xdr_free((xdrproc_t)xdr___dbc_c_pget_reply, (void *)&reply);
-	__dbc_c_pget_free = 0;
+	if (__dbc_pget_free)
+		xdr_free((xdrproc_t)xdr___dbc_pget_reply, (void *)&reply);
+	__dbc_pget_free = 0;
 
 	/* Reinitialize allocated fields */
 	reply.skeydata.skeydata_val = NULL;
 	reply.pkeydata.pkeydata_val = NULL;
 	reply.datadata.datadata_val = NULL;
 
-	__dbc_c_pget_proc(msg->dbccl_id,
+	__dbc_pget_proc(msg->dbccl_id,
 	    msg->skeydlen,
 	    msg->skeydoff,
 	    msg->skeyulen,
@@ -1115,27 +1158,27 @@ __db_dbc_c_pget_4005__SVCSUFFIX__(msg, req)
 	    msg->datadata.datadata_len,
 	    msg->flags,
 	    &reply,
-	    &__dbc_c_pget_free);
+	    &__dbc_pget_free);
 	return (&reply);
 }
 
-__dbc_c_put_reply *
-__db_dbc_c_put_4005__SVCSUFFIX__(msg, req)
-	__dbc_c_put_msg *msg;
+__dbc_put_reply *
+__db_dbc_put_4006__SVCSUFFIX__(msg, req)
+	__dbc_put_msg *msg;
 	struct svc_req *req;
 {
-	static __dbc_c_put_reply reply; /* must be static */
-	static int __dbc_c_put_free = 0; /* must be static */
+	static __dbc_put_reply reply; /* must be static */
+	static int __dbc_put_free = 0; /* must be static */
 
 	COMPQUIET(req, NULL);
-	if (__dbc_c_put_free)
-		xdr_free((xdrproc_t)xdr___dbc_c_put_reply, (void *)&reply);
-	__dbc_c_put_free = 0;
+	if (__dbc_put_free)
+		xdr_free((xdrproc_t)xdr___dbc_put_reply, (void *)&reply);
+	__dbc_put_free = 0;
 
 	/* Reinitialize allocated fields */
 	reply.keydata.keydata_val = NULL;
 
-	__dbc_c_put_proc(msg->dbccl_id,
+	__dbc_put_proc(msg->dbccl_id,
 	    msg->keydlen,
 	    msg->keydoff,
 	    msg->keyulen,
@@ -1150,12 +1193,27 @@ __db_dbc_c_put_4005__SVCSUFFIX__(msg, req)
 	    msg->datadata.datadata_len,
 	    msg->flags,
 	    &reply,
-	    &__dbc_c_put_free);
+	    &__dbc_put_free);
+	return (&reply);
+}
+
+__dbc_set_priority_reply *
+__db_dbc_set_priority_4006__SVCSUFFIX__(msg, req)
+	__dbc_set_priority_msg *msg;
+	struct svc_req *req;
+{
+	static __dbc_set_priority_reply reply; /* must be static */
+	COMPQUIET(req, NULL);
+
+	__dbc_set_priority_proc(msg->dbccl_id,
+	    msg->priority,
+	    &reply);
+
 	return (&reply);
 }
 
 __txn_abort_reply *
-__db_txn_abort_4005__SVCSUFFIX__(msg, req)
+__db_txn_abort_4006__SVCSUFFIX__(msg, req)
 	__txn_abort_msg *msg;
 	struct svc_req *req;
 {
@@ -1169,7 +1227,7 @@ __db_txn_abort_4005__SVCSUFFIX__(msg, req)
 }
 
 __txn_commit_reply *
-__db_txn_commit_4005__SVCSUFFIX__(msg, req)
+__db_txn_commit_4006__SVCSUFFIX__(msg, req)
 	__txn_commit_msg *msg;
 	struct svc_req *req;
 {
@@ -1184,7 +1242,7 @@ __db_txn_commit_4005__SVCSUFFIX__(msg, req)
 }
 
 __txn_discard_reply *
-__db_txn_discard_4005__SVCSUFFIX__(msg, req)
+__db_txn_discard_4006__SVCSUFFIX__(msg, req)
 	__txn_discard_msg *msg;
 	struct svc_req *req;
 {
@@ -1199,7 +1257,7 @@ __db_txn_discard_4005__SVCSUFFIX__(msg, req)
 }
 
 __txn_prepare_reply *
-__db_txn_prepare_4005__SVCSUFFIX__(msg, req)
+__db_txn_prepare_4006__SVCSUFFIX__(msg, req)
 	__txn_prepare_msg *msg;
 	struct svc_req *req;
 {
diff --git a/db/rpc_server/cxx/db_server_cxxproc.cpp b/db/rpc_server/cxx/db_server_cxxproc.cpp
index f182c69e0..b9714169e 100644
--- a/db/rpc_server/cxx/db_server_cxxproc.cpp
+++ b/db/rpc_server/cxx/db_server_cxxproc.cpp
@@ -1,10 +1,9 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2001-2006
- *	Oracle Corporation.  All rights reserved.
+ * Copyright (c) 2001,2007 Oracle.  All rights reserved.
  *
- * $Id: db_server_cxxproc.cpp,v 12.12 2006/08/24 14:46:29 bostic Exp $
+ * $Id: db_server_cxxproc.cpp,v 12.18 2007/06/28 14:01:21 bostic Exp $
  */
 
 #include "db_config.h"
@@ -315,7 +314,8 @@ __env_open_proc(
 	if (__dbsrv_verbose) {
 		dbenv->set_errfile(stderr);
 		dbenv->set_errpfx(fullhome->home);
-	}
+	} else
+		dbenv->set_errfile(NULL);
 
 	/*
 	 * Mask off flags we ignore
@@ -1261,6 +1261,40 @@ __db_set_pagesize_proc(
 }
 
 extern "C" void
+__db_get_priority_proc(
+	u_int dbpcl_id,
+	__db_get_priority_reply *replyp)
+{
+	Db *dbp;
+	ct_entry *dbp_ctp;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (Db *)dbp_ctp->ct_anyp;
+
+	replyp->status =
+	    dbp->get_priority((DB_CACHE_PRIORITY *)&replyp->priority);
+}
+
+extern "C" void
+__db_set_priority_proc(
+	u_int dbpcl_id,
+	u_int32_t priority,
+	__db_set_priority_reply *replyp)
+{
+	Db *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (Db *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_priority((DB_CACHE_PRIORITY)priority);
+
+	replyp->status = ret;
+	return;
+}
+
+extern "C" void
 __db_pget_proc(
 	u_int dbpcl_id,
 	u_int txnpcl_id,
@@ -1894,9 +1928,9 @@ out:
 }
 
 extern "C" void
-__dbc_c_close_proc(
+__dbc_close_proc(
 	u_int dbccl_id,
-	__dbc_c_close_reply *replyp)
+	__dbc_close_reply *replyp)
 {
 	ct_entry *dbc_ctp;
 
@@ -1906,10 +1940,10 @@ __dbc_c_close_proc(
 }
 
 extern "C" void
-__dbc_c_count_proc(
+__dbc_count_proc(
 	u_int dbccl_id,
 	u_int32_t flags,
-	__dbc_c_count_reply *replyp)
+	__dbc_count_reply *replyp)
 {
 	Dbc *dbc;
 	ct_entry *dbc_ctp;
@@ -1927,10 +1961,10 @@ __dbc_c_count_proc(
 }
 
 extern "C" void
-__dbc_c_del_proc(
+__dbc_del_proc(
 	u_int dbccl_id,
 	u_int32_t flags,
-	__dbc_c_del_reply *replyp)
+	__dbc_del_reply *replyp)
 {
 	Dbc *dbc;
 	ct_entry *dbc_ctp;
@@ -1946,10 +1980,10 @@ __dbc_c_del_proc(
 }
 
 extern "C" void
-__dbc_c_dup_proc(
+__dbc_dup_proc(
 	u_int dbccl_id,
 	u_int32_t flags,
-	__dbc_c_dup_reply *replyp)
+	__dbc_dup_reply *replyp)
 {
 	Dbc *dbc, *newdbc;
 	ct_entry *dbc_ctp, *new_ctp;
@@ -1983,7 +2017,7 @@ __dbc_c_dup_proc(
 }
 
 extern "C" void
-__dbc_c_get_proc(
+__dbc_get_proc(
 	u_int dbccl_id,
 	u_int32_t keydlen,
 	u_int32_t keydoff,
@@ -1998,7 +2032,7 @@ __dbc_c_get_proc(
 	void *datadata,
 	u_int32_t datasize,
 	u_int32_t flags,
-	__dbc_c_get_reply *replyp,
+	__dbc_get_reply *replyp,
 	int * freep)
 {
 	Dbc *dbc;
@@ -2104,7 +2138,7 @@ err:		FREE_IF_CHANGED(dbenv->get_DB_ENV(),
 }
 
 extern "C" void
-__dbc_c_pget_proc(
+__dbc_pget_proc(
 	u_int dbccl_id,
 	u_int32_t skeydlen,
 	u_int32_t skeydoff,
@@ -2125,7 +2159,7 @@ __dbc_c_pget_proc(
 	void *datadata,
 	u_int32_t datasize,
 	u_int32_t flags,
-	__dbc_c_pget_reply *replyp,
+	__dbc_pget_reply *replyp,
 	int * freep)
 {
 	Dbc *dbc;
@@ -2246,7 +2280,7 @@ err:		FREE_IF_CHANGED(dbenv->get_DB_ENV(),
 }
 
 extern "C" void
-__dbc_c_put_proc(
+__dbc_put_proc(
 	u_int dbccl_id,
 	u_int32_t keydlen,
 	u_int32_t keydoff,
@@ -2261,7 +2295,7 @@ __dbc_c_put_proc(
 	void *datadata,
 	u_int32_t datasize,
 	u_int32_t flags,
-	__dbc_c_put_reply *replyp,
+	__dbc_put_reply *replyp,
 	int * freep)
 {
 	Db *dbp;
@@ -2310,3 +2344,37 @@ __dbc_c_put_proc(
 	replyp->status = ret;
 	return;
 }
+
+extern "C" void
+__dbc_get_priority_proc(
+	u_int dbccl_id,
+	__dbc_get_priority_reply *replyp)
+{
+	Dbc *dbc;
+	ct_entry *dbc_ctp;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (Dbc *)dbc_ctp->ct_anyp;
+
+	replyp->status =
+	    dbc->get_priority((DB_CACHE_PRIORITY *)&replyp->priority);
+}
+
+extern "C" void
+__dbc_set_priority_proc(
+	u_int dbccl_id,
+	u_int32_t priority,
+	__dbc_set_priority_reply *replyp)
+{
+	Dbc *dbc;
+	ct_entry *dbc_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (Dbc *)dbc_ctp->ct_anyp;
+
+	ret = dbc->set_priority((DB_CACHE_PRIORITY)priority);
+
+	replyp->status = ret;
+	return;
+}
diff --git a/db/rpc_server/cxx/db_server_cxxutil.cpp b/db/rpc_server/cxx/db_server_cxxutil.cpp
index 13083dfd4..794d8e8b1 100644
--- a/db/rpc_server/cxx/db_server_cxxutil.cpp
+++ b/db/rpc_server/cxx/db_server_cxxutil.cpp
@@ -1,10 +1,9 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2000-2006
- *	Oracle Corporation.  All rights reserved.
+ * Copyright (c) 2000,2007 Oracle.  All rights reserved.
  *
- * $Id: db_server_cxxutil.cpp,v 12.6 2006/08/24 14:46:30 bostic Exp $
+ * $Id: db_server_cxxutil.cpp,v 12.8 2007/05/17 15:15:52 bostic Exp $
  */
 
 #include "db_config.h"
diff --git a/db/rpc_server/db_server.sed b/db/rpc_server/db_server.sed
deleted file mode 100644
index f028f778e..000000000
--- a/db/rpc_server/db_server.sed
+++ /dev/null
@@ -1,5 +0,0 @@
-1i\
-\#include "db_config.h"\
-\#ifdef HAVE_RPC
-$a\
-\#endif /* HAVE_RPC */
diff --git a/db/rpc_server/db_server.x b/db/rpc_server/db_server.x
index 322582181..52cb2be4b 100644
--- a/db/rpc_server/db_server.x
+++ b/db/rpc_server/db_server.x
@@ -368,6 +368,16 @@ struct __db_get_pagesize_reply {
 	unsigned int pagesize;
 };
 
+struct __db_get_priority_msg {
+	unsigned int dbpcl_id;
+};
+
+struct __db_get_priority_reply {
+	/* num return vars: 1 */
+	int status;
+	unsigned int priority;
+};
+
 struct __db_get_q_extentsize_msg {
 	unsigned int dbpcl_id;
 };
@@ -604,6 +614,16 @@ struct __db_set_pagesize_reply {
 	int status;
 };
 
+struct __db_set_priority_msg {
+	unsigned int dbpcl_id;
+	unsigned int priority;
+};
+
+struct __db_set_priority_reply {
+	/* num return vars: 0 */
+	int status;
+};
+
 struct __db_set_q_extentsize_msg {
 	unsigned int dbpcl_id;
 	unsigned int extentsize;
@@ -678,48 +698,48 @@ struct __db_truncate_reply {
 	unsigned int count;
 };
 
-struct __dbc_c_close_msg {
+struct __dbc_close_msg {
 	unsigned int dbccl_id;
 };
 
-struct __dbc_c_close_reply {
+struct __dbc_close_reply {
 	/* num return vars: 0 */
 	int status;
 };
 
-struct __dbc_c_count_msg {
+struct __dbc_count_msg {
 	unsigned int dbccl_id;
 	unsigned int flags;
 };
 
-struct __dbc_c_count_reply {
+struct __dbc_count_reply {
 	/* num return vars: 1 */
 	int status;
 	unsigned int dupcount;
 };
 
-struct __dbc_c_del_msg {
+struct __dbc_del_msg {
 	unsigned int dbccl_id;
 	unsigned int flags;
 };
 
-struct __dbc_c_del_reply {
+struct __dbc_del_reply {
 	/* num return vars: 0 */
 	int status;
 };
 
-struct __dbc_c_dup_msg {
+struct __dbc_dup_msg {
 	unsigned int dbccl_id;
 	unsigned int flags;
 };
 
-struct __dbc_c_dup_reply {
+struct __dbc_dup_reply {
 	/* num return vars: 1 */
 	int status;
 	unsigned int dbcidcl_id;
 };
 
-struct __dbc_c_get_msg {
+struct __dbc_get_msg {
 	unsigned int dbccl_id;
 	unsigned int keydlen;
 	unsigned int keydoff;
@@ -734,14 +754,24 @@ struct __dbc_c_get_msg {
 	unsigned int flags;
 };
 
-struct __dbc_c_get_reply {
+struct __dbc_get_reply {
 	/* num return vars: 2 */
 	int status;
 	opaque keydata<>;
 	opaque datadata<>;
 };
 
-struct __dbc_c_pget_msg {
+struct __dbc_get_priority_msg {
+	unsigned int dbccl_id;
+};
+
+struct __dbc_get_priority_reply {
+	/* num return vars: 1 */
+	int status;
+	unsigned int priority;
+};
+
+struct __dbc_pget_msg {
 	unsigned int dbccl_id;
 	unsigned int skeydlen;
 	unsigned int skeydoff;
@@ -761,7 +791,7 @@ struct __dbc_c_pget_msg {
 	unsigned int flags;
 };
 
-struct __dbc_c_pget_reply {
+struct __dbc_pget_reply {
 	/* num return vars: 3 */
 	int status;
 	opaque skeydata<>;
@@ -769,7 +799,7 @@ struct __dbc_c_pget_reply {
 	opaque datadata<>;
 };
 
-struct __dbc_c_put_msg {
+struct __dbc_put_msg {
 	unsigned int dbccl_id;
 	unsigned int keydlen;
 	unsigned int keydoff;
@@ -784,12 +814,22 @@ struct __dbc_c_put_msg {
 	unsigned int flags;
 };
 
-struct __dbc_c_put_reply {
+struct __dbc_put_reply {
 	/* num return vars: 1 */
 	int status;
 	opaque keydata<>;
 };
 
+struct __dbc_set_priority_msg {
+	unsigned int dbccl_id;
+	unsigned int priority;
+};
+
+struct __dbc_set_priority_reply {
+	/* num return vars: 0 */
+	int status;
+};
+
 struct __txn_abort_msg {
 	unsigned int txnpcl_id;
 };
@@ -862,41 +902,45 @@ program DB_RPC_SERVERPROG {
 		__db_get_lorder_reply __DB_db_get_lorder(__db_get_lorder_msg) = 30;
 		__db_get_open_flags_reply __DB_db_get_open_flags(__db_get_open_flags_msg) = 31;
 		__db_get_pagesize_reply __DB_db_get_pagesize(__db_get_pagesize_msg) = 32;
-		__db_get_q_extentsize_reply __DB_db_get_q_extentsize(__db_get_q_extentsize_msg) = 33;
-		__db_get_re_delim_reply __DB_db_get_re_delim(__db_get_re_delim_msg) = 34;
-		__db_get_re_len_reply __DB_db_get_re_len(__db_get_re_len_msg) = 35;
-		__db_get_re_pad_reply __DB_db_get_re_pad(__db_get_re_pad_msg) = 36;
-		__db_join_reply __DB_db_join(__db_join_msg) = 37;
-		__db_key_range_reply __DB_db_key_range(__db_key_range_msg) = 38;
-		__db_open_reply __DB_db_open(__db_open_msg) = 39;
-		__db_pget_reply __DB_db_pget(__db_pget_msg) = 40;
-		__db_put_reply __DB_db_put(__db_put_msg) = 41;
-		__db_remove_reply __DB_db_remove(__db_remove_msg) = 42;
-		__db_rename_reply __DB_db_rename(__db_rename_msg) = 43;
-		__db_set_bt_minkey_reply __DB_db_set_bt_minkey(__db_set_bt_minkey_msg) = 44;
-		__db_set_encrypt_reply __DB_db_set_encrypt(__db_set_encrypt_msg) = 45;
-		__db_set_flags_reply __DB_db_set_flags(__db_set_flags_msg) = 46;
-		__db_set_h_ffactor_reply __DB_db_set_h_ffactor(__db_set_h_ffactor_msg) = 47;
-		__db_set_h_nelem_reply __DB_db_set_h_nelem(__db_set_h_nelem_msg) = 48;
-		__db_set_lorder_reply __DB_db_set_lorder(__db_set_lorder_msg) = 49;
-		__db_set_pagesize_reply __DB_db_set_pagesize(__db_set_pagesize_msg) = 50;
-		__db_set_q_extentsize_reply __DB_db_set_q_extentsize(__db_set_q_extentsize_msg) = 51;
-		__db_set_re_delim_reply __DB_db_set_re_delim(__db_set_re_delim_msg) = 52;
-		__db_set_re_len_reply __DB_db_set_re_len(__db_set_re_len_msg) = 53;
-		__db_set_re_pad_reply __DB_db_set_re_pad(__db_set_re_pad_msg) = 54;
-		__db_stat_reply __DB_db_stat(__db_stat_msg) = 55;
-		__db_sync_reply __DB_db_sync(__db_sync_msg) = 56;
-		__db_truncate_reply __DB_db_truncate(__db_truncate_msg) = 57;
-		__dbc_c_close_reply __DB_dbc_c_close(__dbc_c_close_msg) = 58;
-		__dbc_c_count_reply __DB_dbc_c_count(__dbc_c_count_msg) = 59;
-		__dbc_c_del_reply __DB_dbc_c_del(__dbc_c_del_msg) = 60;
-		__dbc_c_dup_reply __DB_dbc_c_dup(__dbc_c_dup_msg) = 61;
-		__dbc_c_get_reply __DB_dbc_c_get(__dbc_c_get_msg) = 62;
-		__dbc_c_pget_reply __DB_dbc_c_pget(__dbc_c_pget_msg) = 63;
-		__dbc_c_put_reply __DB_dbc_c_put(__dbc_c_put_msg) = 64;
-		__txn_abort_reply __DB_txn_abort(__txn_abort_msg) = 65;
-		__txn_commit_reply __DB_txn_commit(__txn_commit_msg) = 66;
-		__txn_discard_reply __DB_txn_discard(__txn_discard_msg) = 67;
-		__txn_prepare_reply __DB_txn_prepare(__txn_prepare_msg) = 68;
-	} = 4005;
+		__db_get_priority_reply __DB_db_get_priority(__db_get_priority_msg) = 33;
+		__db_get_q_extentsize_reply __DB_db_get_q_extentsize(__db_get_q_extentsize_msg) = 34;
+		__db_get_re_delim_reply __DB_db_get_re_delim(__db_get_re_delim_msg) = 35;
+		__db_get_re_len_reply __DB_db_get_re_len(__db_get_re_len_msg) = 36;
+		__db_get_re_pad_reply __DB_db_get_re_pad(__db_get_re_pad_msg) = 37;
+		__db_join_reply __DB_db_join(__db_join_msg) = 38;
+		__db_key_range_reply __DB_db_key_range(__db_key_range_msg) = 39;
+		__db_open_reply __DB_db_open(__db_open_msg) = 40;
+		__db_pget_reply __DB_db_pget(__db_pget_msg) = 41;
+		__db_put_reply __DB_db_put(__db_put_msg) = 42;
+		__db_remove_reply __DB_db_remove(__db_remove_msg) = 43;
+		__db_rename_reply __DB_db_rename(__db_rename_msg) = 44;
+		__db_set_bt_minkey_reply __DB_db_set_bt_minkey(__db_set_bt_minkey_msg) = 45;
+		__db_set_encrypt_reply __DB_db_set_encrypt(__db_set_encrypt_msg) = 46;
+		__db_set_flags_reply __DB_db_set_flags(__db_set_flags_msg) = 47;
+		__db_set_h_ffactor_reply __DB_db_set_h_ffactor(__db_set_h_ffactor_msg) = 48;
+		__db_set_h_nelem_reply __DB_db_set_h_nelem(__db_set_h_nelem_msg) = 49;
+		__db_set_lorder_reply __DB_db_set_lorder(__db_set_lorder_msg) = 50;
+		__db_set_pagesize_reply __DB_db_set_pagesize(__db_set_pagesize_msg) = 51;
+		__db_set_priority_reply __DB_db_set_priority(__db_set_priority_msg) = 52;
+		__db_set_q_extentsize_reply __DB_db_set_q_extentsize(__db_set_q_extentsize_msg) = 53;
+		__db_set_re_delim_reply __DB_db_set_re_delim(__db_set_re_delim_msg) = 54;
+		__db_set_re_len_reply __DB_db_set_re_len(__db_set_re_len_msg) = 55;
+		__db_set_re_pad_reply __DB_db_set_re_pad(__db_set_re_pad_msg) = 56;
+		__db_stat_reply __DB_db_stat(__db_stat_msg) = 57;
+		__db_sync_reply __DB_db_sync(__db_sync_msg) = 58;
+		__db_truncate_reply __DB_db_truncate(__db_truncate_msg) = 59;
+		__dbc_close_reply __DB_dbc_close(__dbc_close_msg) = 60;
+		__dbc_count_reply __DB_dbc_count(__dbc_count_msg) = 61;
+		__dbc_del_reply __DB_dbc_del(__dbc_del_msg) = 62;
+		__dbc_dup_reply __DB_dbc_dup(__dbc_dup_msg) = 63;
+		__dbc_get_reply __DB_dbc_get(__dbc_get_msg) = 64;
+		__dbc_get_priority_reply __DB_dbc_get_priority(__dbc_get_priority_msg) = 65;
+		__dbc_pget_reply __DB_dbc_pget(__dbc_pget_msg) = 66;
+		__dbc_put_reply __DB_dbc_put(__dbc_put_msg) = 67;
+		__dbc_set_priority_reply __DB_dbc_set_priority(__dbc_set_priority_msg) = 68;
+		__txn_abort_reply __DB_txn_abort(__txn_abort_msg) = 69;
+		__txn_commit_reply __DB_txn_commit(__txn_commit_msg) = 70;
+		__txn_discard_reply __DB_txn_discard(__txn_discard_msg) = 71;
+		__txn_prepare_reply __DB_txn_prepare(__txn_prepare_msg) = 72;
+	} = 4006;
 } = 351457;
diff --git a/db/rpc_server/db_server_proc.c b/db/rpc_server/db_server_proc.c
deleted file mode 100644
index 108a00fb3..000000000
--- a/db/rpc_server/db_server_proc.c
+++ /dev/null
@@ -1,1546 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2000
- *      Sleepycat Software.  All rights reserved.
- */
-
-#include "db_config.h"
-
-#ifdef HAVE_RPC
-#ifndef lint
-static const char revid[] = "$Id: db_server_proc.c,v 1.48 2001/01/06 16:08:01 sue Exp $";
-#endif /* not lint */
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <rpc/rpc.h>
-
-#include <string.h>
-#endif
-#include "db_server.h"
-
-#include "db_int.h"
-#include "db_server_int.h"
-#include "rpc_server_ext.h"
-
-static int __db_stats_list __P((DB_ENV *,
-	      __db_stat_statsreplist **, u_int32_t *, int));
-
-/* BEGIN __env_cachesize_1_proc */
-void
-__env_cachesize_1_proc(dbenvcl_id, gbytes, bytes,
-		ncache, replyp)
-	long dbenvcl_id;
-	u_int32_t gbytes;
-	u_int32_t bytes;
-	u_int32_t ncache;
-	__env_cachesize_reply *replyp;
-/* END __env_cachesize_1_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	ret = dbenv->set_cachesize(dbenv, gbytes, bytes, ncache);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_close_1_proc */
-void
-__env_close_1_proc(dbenvcl_id, flags, replyp)
-	long dbenvcl_id;
-	u_int32_t flags;
-	__env_close_reply *replyp;
-/* END __env_close_1_proc */
-{
-	replyp->status = __dbenv_close_int(dbenvcl_id, flags);
-	return;
-}
-
-/* BEGIN __env_create_1_proc */
-void
-__env_create_1_proc(timeout, replyp)
-	u_int32_t timeout;
-	__env_create_reply *replyp;
-/* END __env_create_1_proc */
-{
-	int ret;
-	DB_ENV *dbenv;
-	ct_entry *ctp;
-
-	ctp = new_ct_ent(&replyp->status);
-	if (ctp == NULL)
-		return;
-	if ((ret = db_env_create(&dbenv, 0)) == 0) {
-		ctp->ct_envp = dbenv;
-		ctp->ct_type = CT_ENV;
-		ctp->ct_parent = NULL;
-		ctp->ct_envparent = ctp;
-		__dbsrv_settimeout(ctp, timeout);
-		__dbsrv_active(ctp);
-		replyp->envcl_id = ctp->ct_id;
-	} else
-		__dbclear_ctp(ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_flags_1_proc */
-void
-__env_flags_1_proc(dbenvcl_id, flags, onoff, replyp)
-	long dbenvcl_id;
-	u_int32_t flags;
-	u_int32_t onoff;
-	__env_flags_reply *replyp;
-/* END __env_flags_1_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	ret = dbenv->set_flags(dbenv, flags, onoff);
-
-	replyp->status = ret;
-	return;
-}
-/* BEGIN __env_open_1_proc */
-void
-__env_open_1_proc(dbenvcl_id, home, flags,
-		mode, replyp)
-	long dbenvcl_id;
-	char *home;
-	u_int32_t flags;
-	u_int32_t mode;
-	__env_open_reply *replyp;
-/* END __env_open_1_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-	char *fullhome;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-	fullhome = get_home(home);
-	if (fullhome == NULL) {
-		replyp->status = DB_NOSERVER_HOME;
-		return;
-	}
-
-	ret = dbenv->open(dbenv, fullhome, flags, mode);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_remove_1_proc */
-void
-__env_remove_1_proc(dbenvcl_id, home, flags, replyp)
-	long dbenvcl_id;
-	char *home;
-	u_int32_t flags;
-	__env_remove_reply *replyp;
-/* END __env_remove_1_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-	char *fullhome;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-	fullhome = get_home(home);
-	if (fullhome == NULL) {
-		replyp->status = DB_NOSERVER_HOME;
-		return;
-	}
-
-	ret = dbenv->remove(dbenv, fullhome, flags);
-	__dbdel_ctp(dbenv_ctp);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_abort_1_proc */
-void
-__txn_abort_1_proc(txnpcl_id, replyp)
-	long txnpcl_id;
-	__txn_abort_reply *replyp;
-/* END __txn_abort_1_proc */
-{
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-
-	ret =  txn_abort(txnp);
-	__dbdel_ctp(txnp_ctp);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_begin_1_proc */
-void
-__txn_begin_1_proc(envpcl_id, parentcl_id,
-		flags, replyp)
-	long envpcl_id;
-	long parentcl_id;
-	u_int32_t flags;
-	__txn_begin_reply *replyp;
-/* END __txn_begin_1_proc */
-{
-	int ret;
-	DB_ENV * envp;
-	ct_entry *envp_ctp;
-	DB_TXN * parent;
-	ct_entry *parent_ctp;
-	DB_TXN *txnp;
-	ct_entry *ctp;
-
-	ACTIVATE_CTP(envp_ctp, envpcl_id, CT_ENV);
-	envp = (DB_ENV *)envp_ctp->ct_anyp;
-	parent_ctp = NULL;
-
-	ctp = new_ct_ent(&replyp->status);
-	if (ctp == NULL)
-		return;
-
-	if (parentcl_id != 0) {
-		ACTIVATE_CTP(parent_ctp, parentcl_id, CT_TXN);
-		parent = (DB_TXN *)parent_ctp->ct_anyp;
-		ctp->ct_activep = parent_ctp->ct_activep;
-	} else
-		parent = NULL;
-
-	ret = txn_begin(envp, parent, &txnp, flags);
-	if (ret == 0) {
-		ctp->ct_txnp = txnp;
-		ctp->ct_type = CT_TXN;
-		ctp->ct_parent = parent_ctp;
-		ctp->ct_envparent = envp_ctp;
-		replyp->txnidcl_id = ctp->ct_id;
-		__dbsrv_settimeout(ctp, envp_ctp->ct_timeout);
-		__dbsrv_active(ctp);
-	} else
-		__dbclear_ctp(ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_commit_1_proc */
-void
-__txn_commit_1_proc(txnpcl_id, flags, replyp)
-	long txnpcl_id;
-	u_int32_t flags;
-	__txn_commit_reply *replyp;
-/* END __txn_commit_1_proc */
-{
-	int ret;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-
-	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-
-	ret = txn_commit(txnp, flags);
-	__dbdel_ctp(txnp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_bt_maxkey_1_proc */
-void
-__db_bt_maxkey_1_proc(dbpcl_id, maxkey, replyp)
-	long dbpcl_id;
-	u_int32_t maxkey;
-	__db_bt_maxkey_reply *replyp;
-/* END __db_bt_maxkey_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_bt_maxkey(dbp, maxkey);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_bt_minkey_1_proc */
-void
-__db_bt_minkey_1_proc(dbpcl_id, minkey, replyp)
-	long dbpcl_id;
-	u_int32_t minkey;
-	__db_bt_minkey_reply *replyp;
-/* END __db_bt_minkey_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_bt_minkey(dbp, minkey);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_close_1_proc */
-void
-__db_close_1_proc(dbpcl_id, flags, replyp)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_close_reply *replyp;
-/* END __db_close_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->close(dbp, flags);
-	__dbdel_ctp(dbp_ctp);
-
-	replyp-> status= ret;
-	return;
-}
-
-/* BEGIN __db_create_1_proc */
-void
-__db_create_1_proc(flags, envpcl_id, replyp)
-	u_int32_t flags;
-	long envpcl_id;
-	__db_create_reply *replyp;
-/* END __db_create_1_proc */
-{
-	int ret;
-	DB_ENV * envp;
-	DB *dbp;
-	ct_entry *envp_ctp, *dbp_ctp;
-
-	ACTIVATE_CTP(envp_ctp, envpcl_id, CT_ENV);
-	envp = (DB_ENV *)envp_ctp->ct_anyp;
-
-	dbp_ctp = new_ct_ent(&replyp->status);
-	if (dbp_ctp == NULL)
-		return ;
-	/*
-	 * We actually require env's for databases.  The client should
-	 * have caught it, but just in case.
-	 */
-	DB_ASSERT(envp != NULL);
-	if ((ret = db_create(&dbp, envp, flags)) == 0) {
-		dbp_ctp->ct_dbp = dbp;
-		dbp_ctp->ct_type = CT_DB;
-		dbp_ctp->ct_parent = envp_ctp;
-		dbp_ctp->ct_envparent = envp_ctp;
-		replyp->dbpcl_id = dbp_ctp->ct_id;
-	} else
-		__dbclear_ctp(dbp_ctp);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_del_1_proc */
-void
-__db_del_1_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyflags, keydata, keysize,
-		flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t flags;
-	__db_del_reply *replyp;
-/* END __db_del_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-	DBT key;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	memset(&key, 0, sizeof(key));
-
-	/* Set up key DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	key.flags = keyflags;
-	key.size = keysize;
-	key.data = keydata;
-
-	ret = dbp->del(dbp, txnp, &key, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_extentsize_1_proc */
-void
-__db_extentsize_1_proc(dbpcl_id, extentsize, replyp)
-	long dbpcl_id;
-	u_int32_t extentsize;
-	__db_extentsize_reply *replyp;
-/* END __db_extentsize_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_q_extentsize(dbp, extentsize);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_flags_1_proc */
-void
-__db_flags_1_proc(dbpcl_id, flags, replyp)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_flags_reply *replyp;
-/* END __db_flags_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_flags(dbp, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_get_1_proc */
-void
-__db_get_1_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyflags, keydata, keysize,
-		datadlen, datadoff, dataflags, datadata,
-		datasize, flags, replyp, freep)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__db_get_reply *replyp;
-	int * freep;
-/* END __db_get_1_proc */
-{
-	int key_alloc, ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-	DBT key, data;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	*freep = 0;
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = DB_DBT_MALLOC;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.doff = datadoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	data.flags = DB_DBT_MALLOC;
-	if (dataflags & DB_DBT_PARTIAL)
-		data.flags |= DB_DBT_PARTIAL;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the get */
-	ret = dbp->get(dbp, txnp, &key, &data, flags);
-	/*
-	 * Otherwise just status.
-	 */
-	if (ret == 0) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		key_alloc = 0;
-		if (key.data == keydata) {
-			ret = __os_malloc(dbp->dbenv,
-			    key.size, NULL, &replyp->keydata.keydata_val);
-			if (ret != 0) {
-				__os_free(key.data, key.size);
-				__os_free(data.data, data.size);
-				goto err;
-			}
-			key_alloc = 1;
-			memcpy(replyp->keydata.keydata_val, key.data, key.size);
-		} else
-			replyp->keydata.keydata_val = key.data;
-
-		replyp->keydata.keydata_len = key.size;
-
-		/*
-		 * Data
-		 */
-		if (data.data == datadata) {
-			ret = __os_malloc(dbp->dbenv,
-			     data.size, NULL, &replyp->datadata.datadata_val);
-			if (ret != 0) {
-				__os_free(key.data, key.size);
-				__os_free(data.data, data.size);
-				if (key_alloc)
-					__os_free(replyp->keydata.keydata_val,
-					    key.size);
-				goto err;
-			}
-			memcpy(replyp->datadata.datadata_val, data.data,
-			    data.size);
-		} else
-			replyp->datadata.datadata_val = data.data;
-		replyp->datadata.datadata_len = data.size;
-	} else {
-err:		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-		replyp->datadata.datadata_val = NULL;
-		replyp->datadata.datadata_len = 0;
-		*freep = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_h_ffactor_1_proc */
-void
-__db_h_ffactor_1_proc(dbpcl_id, ffactor, replyp)
-	long dbpcl_id;
-	u_int32_t ffactor;
-	__db_h_ffactor_reply *replyp;
-/* END __db_h_ffactor_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_h_ffactor(dbp, ffactor);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_h_nelem_1_proc */
-void
-__db_h_nelem_1_proc(dbpcl_id, nelem, replyp)
-	long dbpcl_id;
-	u_int32_t nelem;
-	__db_h_nelem_reply *replyp;
-/* END __db_h_nelem_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_h_nelem(dbp, nelem);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_key_range_1_proc */
-void
-__db_key_range_1_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyflags, keydata, keysize,
-		flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t flags;
-	__db_key_range_reply *replyp;
-/* END __db_key_range_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-	DBT key;
-	DB_KEY_RANGE range;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	memset(&key, 0, sizeof(key));
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	key.size = keysize;
-	key.data = keydata;
-	key.flags = keyflags;
-
-	ret = dbp->key_range(dbp, txnp, &key, &range, flags);
-
-	replyp->status = ret;
-	replyp->less = range.less;
-	replyp->equal = range.equal;
-	replyp->greater = range.greater;
-	return;
-}
-
-/* BEGIN __db_lorder_1_proc */
-void
-__db_lorder_1_proc(dbpcl_id, lorder, replyp)
-	long dbpcl_id;
-	u_int32_t lorder;
-	__db_lorder_reply *replyp;
-/* END __db_lorder_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_lorder(dbp, lorder);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbopen_1_proc */
-void
-__db_open_1_proc(dbpcl_id, name, subdb,
-		type, flags, mode, replyp)
-	long dbpcl_id;
-	char *name;
-	char *subdb;
-	u_int32_t type;
-	u_int32_t flags;
-	u_int32_t mode;
-	__db_open_reply *replyp;
-/* END __db_open_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->open(dbp, name, subdb, (DBTYPE)type, flags, mode);
-	if (ret == 0) {
-		replyp->type = (int) dbp->get_type(dbp);
-		/* XXX
-		 * Tcl needs to peek at dbp->flags for DB_AM_DUP.  Send
-		 * this dbp's flags back.
-		 */
-		replyp->dbflags = (int) dbp->flags;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_pagesize_1_proc */
-void
-__db_pagesize_1_proc(dbpcl_id, pagesize, replyp)
-	long dbpcl_id;
-	u_int32_t pagesize;
-	__db_pagesize_reply *replyp;
-/* END __db_pagesize_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_pagesize(dbp, pagesize);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_put_1_proc */
-void
-__db_put_1_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyflags, keydata, keysize,
-		datadlen, datadoff, dataflags, datadata,
-		datasize, flags, replyp, freep)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__db_put_reply *replyp;
-	int * freep;
-/* END __db_put_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-	DBT key, data;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	*freep = 0;
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = DB_DBT_MALLOC;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.doff = datadoff;
-	data.flags = dataflags;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the put */
-	ret = dbp->put(dbp, txnp, &key, &data, flags);
-	/*
-	 * If the client did a DB_APPEND, set up key in reply.
-	 * Otherwise just status.
-	 */
-	if (ret == 0 && (flags == DB_APPEND)) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		if (key.data == keydata) {
-			ret = __os_malloc(dbp->dbenv,
-			    key.size, NULL, &replyp->keydata.keydata_val);
-			if (ret != 0) {
-				__os_free(key.data, key.size);
-				goto err;
-			}
-			memcpy(replyp->keydata.keydata_val, key.data, key.size);
-		} else
-			replyp->keydata.keydata_val = key.data;
-
-		replyp->keydata.keydata_len = key.size;
-	} else {
-err:		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-		*freep = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_re_delim_1_proc */
-void
-__db_re_delim_1_proc(dbpcl_id, delim, replyp)
-	long dbpcl_id;
-	u_int32_t delim;
-	__db_re_delim_reply *replyp;
-/* END __db_re_delim_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_re_delim(dbp, delim);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_re_len_1_proc */
-void
-__db_re_len_1_proc(dbpcl_id, len, replyp)
-	long dbpcl_id;
-	u_int32_t len;
-	__db_re_len_reply *replyp;
-/* END __db_re_len_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_re_len(dbp, len);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_re_pad_1_proc */
-void
-__db_re_pad_1_proc(dbpcl_id, pad, replyp)
-	long dbpcl_id;
-	u_int32_t pad;
-	__db_re_pad_reply *replyp;
-/* END __db_re_pad_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_re_pad(dbp, pad);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_remove_1_proc */
-void
-__db_remove_1_proc(dbpcl_id, name, subdb,
-		flags, replyp)
-	long dbpcl_id;
-	char *name;
-	char *subdb;
-	u_int32_t flags;
-	__db_remove_reply *replyp;
-/* END __db_remove_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->remove(dbp, name, subdb, flags);
-	__dbdel_ctp(dbp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_rename_1_proc */
-void
-__db_rename_1_proc(dbpcl_id, name, subdb,
-		newname, flags, replyp)
-	long dbpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int32_t flags;
-	__db_rename_reply *replyp;
-/* END __db_rename_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->rename(dbp, name, subdb, newname, flags);
-	__dbdel_ctp(dbp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_stat_1_proc */
-void
-__db_stat_1_proc(dbpcl_id,
-		flags, replyp, freep)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_stat_reply *replyp;
-	int * freep;
-/* END __db_stat_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DBTYPE type;
-	void *sp;
-	int len;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->stat(dbp, &sp, NULL, flags);
-	replyp->status = ret;
-	if (ret != 0)
-		return;
-	/*
-	 * We get here, we have success.  Allocate an array so that
-	 * we can use the list generator.  Generate the reply, free
-	 * up the space.
-	 */
-	/*
-	 * XXX This assumes that all elements of all stat structures
-	 * are u_int32_t fields.  They are, currently.
-	 */
-	type = dbp->get_type(dbp);
-	if (type == DB_HASH)
-		len = sizeof(DB_HASH_STAT) / sizeof(u_int32_t);
-	else if (type == DB_QUEUE)
-		len = sizeof(DB_QUEUE_STAT) / sizeof(u_int32_t);
-	else            /* BTREE or RECNO are same stats */
-		len = sizeof(DB_BTREE_STAT) / sizeof(u_int32_t);
-	/*
-	 * Set up our list of stats.
-	 */
-	ret = __db_stats_list(dbp->dbenv,
-	    &replyp->statslist, (u_int32_t*)sp, len);
-
-	__os_free(sp, 0);
-	if (ret == 0)
-		*freep = 1;
-	replyp->status = ret;
-	return;
-}
-
-int
-__db_stats_list(dbenv, locp, pp, len)
-	DB_ENV *dbenv;
-	__db_stat_statsreplist **locp;
-	u_int32_t *pp;
-	int len;
-{
-	u_int32_t *p, *q;
-	int i, ret;
-	__db_stat_statsreplist *nl, **nlp;
-
-	nlp = locp;
-	for (i = 0; i < len; i++) {
-		p = pp+i;
-		if ((ret = __os_malloc(dbenv, sizeof(*nl), NULL, nlp)) != 0)
-			goto out;
-		nl = *nlp;
-		nl->next = NULL;
-		if ((ret = __os_malloc(dbenv,
-		    sizeof(u_int32_t), NULL, &nl->ent.ent_val)) != 0)
-			goto out;
-		q = (u_int32_t *)nl->ent.ent_val;
-		*q = *p;
-		nl->ent.ent_len = sizeof(u_int32_t);
-		nlp = &nl->next;
-	}
-	return (0);
-out:
-	__db_stats_freelist(locp);
-	return (ret);
-}
-
-/*
- * PUBLIC: void __db_stats_freelist __P((__db_stat_statsreplist **));
- */
-void
-__db_stats_freelist(locp)
-	__db_stat_statsreplist **locp;
-{
-	__db_stat_statsreplist *nl, *nl1;
-
-	for (nl = *locp; nl != NULL; nl = nl1) {
-		nl1 = nl->next;
-		if (nl->ent.ent_val)
-			__os_free(nl->ent.ent_val, nl->ent.ent_len);
-		__os_free(nl, sizeof(*nl));
-	}
-	*locp = NULL;
-}
-
-/* BEGIN __db_swapped_1_proc */
-void
-__db_swapped_1_proc(dbpcl_id, replyp)
-	long dbpcl_id;
-	__db_swapped_reply *replyp;
-/* END __db_swapped_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->get_byteswapped(dbp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_sync_1_proc */
-void
-__db_sync_1_proc(dbpcl_id, flags, replyp)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_sync_reply *replyp;
-/* END __db_sync_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->sync(dbp, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_cursor_1_proc */
-void
-__db_cursor_1_proc(dbpcl_id, txnpcl_id,
-		flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t flags;
-	__db_cursor_reply *replyp;
-/* END __db_cursor_1_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-	DBC *dbc;
-	ct_entry *dbc_ctp, *env_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	dbc_ctp = new_ct_ent(&replyp->status);
-	if (dbc_ctp == NULL)
-		return;
-
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-		dbc_ctp->ct_activep = txnp_ctp->ct_activep;
-	} else
-		txnp = NULL;
-
-	if ((ret = dbp->cursor(dbp, txnp, &dbc, flags)) == 0) {
-		dbc_ctp->ct_dbc = dbc;
-		dbc_ctp->ct_type = CT_CURSOR;
-		dbc_ctp->ct_parent = dbp_ctp;
-		env_ctp = dbp_ctp->ct_envparent;
-		dbc_ctp->ct_envparent = env_ctp;
-		__dbsrv_settimeout(dbc_ctp, env_ctp->ct_timeout);
-		__dbsrv_active(dbc_ctp);
-		replyp->dbcidcl_id = dbc_ctp->ct_id;
-	} else
-		__dbclear_ctp(dbc_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_join_1_proc */
-void
-__db_join_1_proc(dbpcl_id, curslist,
-		flags, replyp)
-	long dbpcl_id;
-	u_int32_t * curslist;
-	u_int32_t flags;
-	__db_join_reply *replyp;
-/* END __db_join_1_proc */
-{
-	DB * dbp;
-	ct_entry *dbp_ctp;
-	DBC *dbc;
-	DBC **jcurs, **c;
-	ct_entry *dbc_ctp, *ctp;
-	size_t size;
-	int ret;
-	u_int32_t *cl;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	dbc_ctp = new_ct_ent(&replyp->status);
-	if (dbc_ctp == NULL)
-		return;
-
-	for (size = sizeof(DBC *), cl = curslist; *cl != 0; size += sizeof(DBC *), cl++)
-		;
-	if ((ret = __os_malloc(dbp->dbenv, size, NULL, &jcurs)) != 0) {
-		replyp->status = ret;
-		__dbclear_ctp(dbc_ctp);
-		return;
-	}
-	/*
-	 * If our curslist has a parent txn, we need to use it too
-	 * for the activity timeout.  All cursors must be part of
-	 * the same transaction, so just check the first.
-	 */
-	ctp = get_tableent(*curslist);
-	DB_ASSERT(ctp->ct_type == CT_CURSOR);
-	/*
-	 * If we are using a transaction, set the join activity timer
-	 * to point to the parent transaction.
-	 */
-	if (ctp->ct_activep != &ctp->ct_active)
-		dbc_ctp->ct_activep = ctp->ct_activep;
-	for (cl = curslist, c = jcurs; *cl != 0; cl++, c++) {
-		ctp = get_tableent(*cl);
-		if (ctp == NULL) {
-			replyp->status = DB_NOSERVER_ID;
-			goto out;
-		}
-		/*
-		 * If we are using a txn, the join cursor points to the
-		 * transaction timeout.  If we are not using a transaction,
-		 * then all the curslist cursors must point to the join
-		 * cursor's timeout so that we do not timeout any of the
-		 * curlist cursors while the join cursor is active.
-		 * Change the type of the curslist ctps to CT_JOIN so that
-		 * we know they are part of a join list and we can distinguish
-		 * them and later restore them when the join cursor is closed.
-		 */
-		DB_ASSERT(ctp->ct_type == CT_CURSOR);
-		ctp->ct_type |= CT_JOIN;
-		ctp->ct_origp = ctp->ct_activep;
-		/*
-		 * Setting this to the ct_active field of the dbc_ctp is
-		 * really just a way to distinguish which join dbc this
-		 * cursor is part of.  The ct_activep of this cursor is
-		 * not used at all during its lifetime as part of a join
-		 * cursor.
-		 */
-		ctp->ct_activep = &dbc_ctp->ct_active;
-		*c = ctp->ct_dbc;
-	}
-	*c = NULL;
-	if ((ret = dbp->join(dbp, jcurs, &dbc, flags)) == 0) {
-		dbc_ctp->ct_dbc = dbc;
-		dbc_ctp->ct_type = (CT_JOINCUR | CT_CURSOR);
-		dbc_ctp->ct_parent = dbp_ctp;
-		dbc_ctp->ct_envparent = dbp_ctp->ct_envparent;
-		__dbsrv_settimeout(dbc_ctp, dbp_ctp->ct_envparent->ct_timeout);
-		__dbsrv_active(dbc_ctp);
-		replyp->dbcidcl_id = dbc_ctp->ct_id;
-	} else {
-		__dbclear_ctp(dbc_ctp);
-		/*
-		 * If we get an error, undo what we did above to any cursors.
-		 */
-		for (cl = curslist; *cl != 0; cl++) {
-			ctp = get_tableent(*cl);
-			ctp->ct_type = CT_CURSOR;
-			ctp->ct_activep = ctp->ct_origp;
-		}
-	}
-
-	replyp->status = ret;
-out:
-	__os_free(jcurs, size);
-	return;
-}
-
-/* BEGIN __dbc_close_1_proc */
-void
-__dbc_close_1_proc(dbccl_id, replyp)
-	long dbccl_id;
-	__dbc_close_reply *replyp;
-/* END __dbc_close_1_proc */
-{
-	ct_entry *dbc_ctp;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	replyp->status = __dbc_close_int(dbc_ctp);
-	return;
-}
-
-/* BEGIN __dbc_count_1_proc */
-void
-__dbc_count_1_proc(dbccl_id, flags, replyp)
-	long dbccl_id;
-	u_int32_t flags;
-	__dbc_count_reply *replyp;
-/* END __dbc_count_1_proc */
-{
-	int ret;
-	DBC * dbc;
-	ct_entry *dbc_ctp;
-	db_recno_t num;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	ret = dbc->c_count(dbc, &num, flags);
-	replyp->status = ret;
-	if (ret == 0)
-		replyp->dupcount = num;
-	return;
-}
-
-/* BEGIN __dbc_del_1_proc */
-void
-__dbc_del_1_proc(dbccl_id, flags, replyp)
-	long dbccl_id;
-	u_int32_t flags;
-	__dbc_del_reply *replyp;
-/* END __dbc_del_1_proc */
-{
-	int ret;
-	DBC * dbc;
-	ct_entry *dbc_ctp;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	ret = dbc->c_del(dbc, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_dup_1_proc */
-void
-__dbc_dup_1_proc(dbccl_id, flags, replyp)
-	long dbccl_id;
-	u_int32_t flags;
-	__dbc_dup_reply *replyp;
-/* END __dbc_dup_1_proc */
-{
-	int ret;
-	DBC * dbc;
-	ct_entry *dbc_ctp;
-	DBC *newdbc;
-	ct_entry *new_ctp;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	new_ctp = new_ct_ent(&replyp->status);
-	if (new_ctp == NULL)
-		return;
-
-	if ((ret = dbc->c_dup(dbc, &newdbc, flags)) == 0) {
-		new_ctp->ct_dbc = newdbc;
-		new_ctp->ct_type = CT_CURSOR;
-		new_ctp->ct_parent = dbc_ctp->ct_parent;
-		new_ctp->ct_envparent = dbc_ctp->ct_envparent;
-		/*
-		 * If our cursor has a parent txn, we need to use it too.
-		 */
-		if (dbc_ctp->ct_activep != &dbc_ctp->ct_active)
-			new_ctp->ct_activep = dbc_ctp->ct_activep;
-		__dbsrv_settimeout(new_ctp, dbc_ctp->ct_timeout);
-		__dbsrv_active(new_ctp);
-		replyp->dbcidcl_id = new_ctp->ct_id;
-	} else
-		__dbclear_ctp(new_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_get_1_proc */
-void
-__dbc_get_1_proc(dbccl_id, keydlen, keydoff,
-		keyflags, keydata, keysize, datadlen,
-		datadoff, dataflags, datadata, datasize,
-		flags, replyp, freep)
-	long dbccl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__dbc_get_reply *replyp;
-	int * freep;
-/* END __dbc_get_1_proc */
-{
-	DB_ENV *dbenv;
-	DBC *dbc;
-	DBT key, data;
-	ct_entry *dbc_ctp;
-	int key_alloc, ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-	dbenv = dbc->dbp->dbenv;
-
-	*freep = 0;
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = DB_DBT_MALLOC;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.doff = datadoff;
-	data.flags = DB_DBT_MALLOC;
-	if (dataflags & DB_DBT_PARTIAL)
-		data.flags |= DB_DBT_PARTIAL;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the get */
-	ret = dbc->c_get(dbc, &key, &data, flags);
-
-	/*
-	 * Otherwise just status.
-	 */
-	if (ret == 0) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		key_alloc = 0;
-		if (key.data == keydata) {
-			ret = __os_malloc(dbenv, key.size, NULL,
-			    &replyp->keydata.keydata_val);
-			if (ret != 0) {
-				__os_free(key.data, key.size);
-				__os_free(data.data, data.size);
-				goto err;
-			}
-			key_alloc = 1;
-			memcpy(replyp->keydata.keydata_val, key.data, key.size);
-		} else
-			replyp->keydata.keydata_val = key.data;
-
-		replyp->keydata.keydata_len = key.size;
-
-		/*
-		 * Data
-		 */
-		if (data.data == datadata) {
-			ret = __os_malloc(dbenv, data.size, NULL,
-			    &replyp->datadata.datadata_val);
-			if (ret != 0) {
-				__os_free(key.data, key.size);
-				__os_free(data.data, data.size);
-				if (key_alloc)
-					__os_free(replyp->keydata.keydata_val,
-					    key.size);
-				goto err;
-			}
-			memcpy(replyp->datadata.datadata_val, data.data,
-			    data.size);
-		} else
-			replyp->datadata.datadata_val = data.data;
-		replyp->datadata.datadata_len = data.size;
-	} else {
-err:		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-		replyp->datadata.datadata_val = NULL;
-		replyp->datadata.datadata_len = 0;
-		*freep = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_put_1_proc */
-void
-__dbc_put_1_proc(dbccl_id, keydlen, keydoff,
-		keyflags, keydata, keysize, datadlen,
-		datadoff, dataflags, datadata, datasize,
-		flags, replyp, freep)
-	long dbccl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__dbc_put_reply *replyp;
-	int * freep;
-/* END __dbc_put_1_proc */
-{
-	int ret;
-	DBC * dbc;
-	DB *dbp;
-	ct_entry *dbc_ctp;
-	DBT key, data;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-	dbp = (DB *)dbc_ctp->ct_parent->ct_anyp;
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = 0;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.doff = datadoff;
-	data.flags = dataflags;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the put */
-	ret = dbc->c_put(dbc, &key, &data, flags);
-
-	*freep = 0;
-	if (ret == 0 && (flags == DB_AFTER || flags == DB_BEFORE) &&
-	    dbp->type == DB_RECNO) {
-		/*
-		 * We need to xdr_free whatever we are returning, next time.
-		 */
-		replyp->keydata.keydata_val = key.data;
-		replyp->keydata.keydata_len = key.size;
-	} else {
-		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-#endif /* HAVE_RPC */
diff --git a/db/rpc_server/db_server_proc.sed b/db/rpc_server/db_server_proc.sed
deleted file mode 100644
index 7266275b2..000000000
--- a/db/rpc_server/db_server_proc.sed
+++ /dev/null
@@ -1,418 +0,0 @@
-/^\/\* BEGIN __env_cachesize_1_proc/,/^\/\* END __env_cachesize_1_proc/c\
-/* BEGIN __env_cachesize_1_proc */\
-void\
-__env_cachesize_1_proc(dbenvcl_id, gbytes, bytes,\
-\	\	ncache, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t gbytes;\
-\	u_int32_t bytes;\
-\	u_int32_t ncache;\
-\	__env_cachesize_reply *replyp;\
-/* END __env_cachesize_1_proc */
-/^\/\* BEGIN __env_close_1_proc/,/^\/\* END __env_close_1_proc/c\
-/* BEGIN __env_close_1_proc */\
-void\
-__env_close_1_proc(dbenvcl_id, flags, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t flags;\
-\	__env_close_reply *replyp;\
-/* END __env_close_1_proc */
-/^\/\* BEGIN __env_create_1_proc/,/^\/\* END __env_create_1_proc/c\
-/* BEGIN __env_create_1_proc */\
-void\
-__env_create_1_proc(timeout, replyp)\
-\	u_int32_t timeout;\
-\	__env_create_reply *replyp;\
-/* END __env_create_1_proc */
-/^\/\* BEGIN __env_flags_1_proc/,/^\/\* END __env_flags_1_proc/c\
-/* BEGIN __env_flags_1_proc */\
-void\
-__env_flags_1_proc(dbenvcl_id, flags, onoff, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t flags;\
-\	u_int32_t onoff;\
-\	__env_flags_reply *replyp;\
-/* END __env_flags_1_proc */
-/^\/\* BEGIN __env_open_1_proc/,/^\/\* END __env_open_1_proc/c\
-/* BEGIN __env_open_1_proc */\
-void\
-__env_open_1_proc(dbenvcl_id, home, flags,\
-\	\	mode, replyp)\
-\	long dbenvcl_id;\
-\	char *home;\
-\	u_int32_t flags;\
-\	u_int32_t mode;\
-\	__env_open_reply *replyp;\
-/* END __env_open_1_proc */
-/^\/\* BEGIN __env_remove_1_proc/,/^\/\* END __env_remove_1_proc/c\
-/* BEGIN __env_remove_1_proc */\
-void\
-__env_remove_1_proc(dbenvcl_id, home, flags, replyp)\
-\	long dbenvcl_id;\
-\	char *home;\
-\	u_int32_t flags;\
-\	__env_remove_reply *replyp;\
-/* END __env_remove_1_proc */
-/^\/\* BEGIN __txn_abort_1_proc/,/^\/\* END __txn_abort_1_proc/c\
-/* BEGIN __txn_abort_1_proc */\
-void\
-__txn_abort_1_proc(txnpcl_id, replyp)\
-\	long txnpcl_id;\
-\	__txn_abort_reply *replyp;\
-/* END __txn_abort_1_proc */
-/^\/\* BEGIN __txn_begin_1_proc/,/^\/\* END __txn_begin_1_proc/c\
-/* BEGIN __txn_begin_1_proc */\
-void\
-__txn_begin_1_proc(envpcl_id, parentcl_id,\
-\	\	flags, replyp)\
-\	long envpcl_id;\
-\	long parentcl_id;\
-\	u_int32_t flags;\
-\	__txn_begin_reply *replyp;\
-/* END __txn_begin_1_proc */
-/^\/\* BEGIN __txn_commit_1_proc/,/^\/\* END __txn_commit_1_proc/c\
-/* BEGIN __txn_commit_1_proc */\
-void\
-__txn_commit_1_proc(txnpcl_id, flags, replyp)\
-\	long txnpcl_id;\
-\	u_int32_t flags;\
-\	__txn_commit_reply *replyp;\
-/* END __txn_commit_1_proc */
-/^\/\* BEGIN __db_bt_maxkey_1_proc/,/^\/\* END __db_bt_maxkey_1_proc/c\
-/* BEGIN __db_bt_maxkey_1_proc */\
-void\
-__db_bt_maxkey_1_proc(dbpcl_id, maxkey, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t maxkey;\
-\	__db_bt_maxkey_reply *replyp;\
-/* END __db_bt_maxkey_1_proc */
-/^\/\* BEGIN __db_bt_minkey_1_proc/,/^\/\* END __db_bt_minkey_1_proc/c\
-/* BEGIN __db_bt_minkey_1_proc */\
-void\
-__db_bt_minkey_1_proc(dbpcl_id, minkey, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t minkey;\
-\	__db_bt_minkey_reply *replyp;\
-/* END __db_bt_minkey_1_proc */
-/^\/\* BEGIN __db_close_1_proc/,/^\/\* END __db_close_1_proc/c\
-/* BEGIN __db_close_1_proc */\
-void\
-__db_close_1_proc(dbpcl_id, flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_close_reply *replyp;\
-/* END __db_close_1_proc */
-/^\/\* BEGIN __db_create_1_proc/,/^\/\* END __db_create_1_proc/c\
-/* BEGIN __db_create_1_proc */\
-void\
-__db_create_1_proc(flags, envpcl_id, replyp)\
-\	u_int32_t flags;\
-\	long envpcl_id;\
-\	__db_create_reply *replyp;\
-/* END __db_create_1_proc */
-/^\/\* BEGIN __db_del_1_proc/,/^\/\* END __db_del_1_proc/c\
-/* BEGIN __db_del_1_proc */\
-void\
-__db_del_1_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyflags, keydata, keysize,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t flags;\
-\	__db_del_reply *replyp;\
-/* END __db_del_1_proc */
-/^\/\* BEGIN __db_extentsize_1_proc/,/^\/\* END __db_extentsize_1_proc/c\
-/* BEGIN __db_extentsize_1_proc */\
-void\
-__db_extentsize_1_proc(dbpcl_id, extentsize, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t extentsize;\
-\	__db_extentsize_reply *replyp;\
-/* END __db_extentsize_1_proc */
-/^\/\* BEGIN __db_flags_1_proc/,/^\/\* END __db_flags_1_proc/c\
-/* BEGIN __db_flags_1_proc */\
-void\
-__db_flags_1_proc(dbpcl_id, flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_flags_reply *replyp;\
-/* END __db_flags_1_proc */
-/^\/\* BEGIN __db_get_1_proc/,/^\/\* END __db_get_1_proc/c\
-/* BEGIN __db_get_1_proc */\
-void\
-__db_get_1_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyflags, keydata, keysize,\
-\	\	datadlen, datadoff, dataflags, datadata,\
-\	\	datasize, flags, replyp, freep)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__db_get_reply *replyp;\
-\	int * freep;\
-/* END __db_get_1_proc */
-/^\/\* BEGIN __db_h_ffactor_1_proc/,/^\/\* END __db_h_ffactor_1_proc/c\
-/* BEGIN __db_h_ffactor_1_proc */\
-void\
-__db_h_ffactor_1_proc(dbpcl_id, ffactor, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t ffactor;\
-\	__db_h_ffactor_reply *replyp;\
-/* END __db_h_ffactor_1_proc */
-/^\/\* BEGIN __db_h_nelem_1_proc/,/^\/\* END __db_h_nelem_1_proc/c\
-/* BEGIN __db_h_nelem_1_proc */\
-void\
-__db_h_nelem_1_proc(dbpcl_id, nelem, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t nelem;\
-\	__db_h_nelem_reply *replyp;\
-/* END __db_h_nelem_1_proc */
-/^\/\* BEGIN __db_key_range_1_proc/,/^\/\* END __db_key_range_1_proc/c\
-/* BEGIN __db_key_range_1_proc */\
-void\
-__db_key_range_1_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyflags, keydata, keysize,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t flags;\
-\	__db_key_range_reply *replyp;\
-/* END __db_key_range_1_proc */
-/^\/\* BEGIN __db_lorder_1_proc/,/^\/\* END __db_lorder_1_proc/c\
-/* BEGIN __db_lorder_1_proc */\
-void\
-__db_lorder_1_proc(dbpcl_id, lorder, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t lorder;\
-\	__db_lorder_reply *replyp;\
-/* END __db_lorder_1_proc */
-/^\/\* BEGIN __db_open_1_proc/,/^\/\* END __db_open_1_proc/c\
-/* BEGIN __db_open_1_proc */\
-void\
-__db_open_1_proc(dbpcl_id, name, subdb,\
-\	\	type, flags, mode, replyp)\
-\	long dbpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	u_int32_t type;\
-\	u_int32_t flags;\
-\	u_int32_t mode;\
-\	__db_open_reply *replyp;\
-/* END __db_open_1_proc */
-/^\/\* BEGIN __db_pagesize_1_proc/,/^\/\* END __db_pagesize_1_proc/c\
-/* BEGIN __db_pagesize_1_proc */\
-void\
-__db_pagesize_1_proc(dbpcl_id, pagesize, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t pagesize;\
-\	__db_pagesize_reply *replyp;\
-/* END __db_pagesize_1_proc */
-/^\/\* BEGIN __db_put_1_proc/,/^\/\* END __db_put_1_proc/c\
-/* BEGIN __db_put_1_proc */\
-void\
-__db_put_1_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyflags, keydata, keysize,\
-\	\	datadlen, datadoff, dataflags, datadata,\
-\	\	datasize, flags, replyp, freep)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__db_put_reply *replyp;\
-\	int * freep;\
-/* END __db_put_1_proc */
-/^\/\* BEGIN __db_re_delim_1_proc/,/^\/\* END __db_re_delim_1_proc/c\
-/* BEGIN __db_re_delim_1_proc */\
-void\
-__db_re_delim_1_proc(dbpcl_id, delim, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t delim;\
-\	__db_re_delim_reply *replyp;\
-/* END __db_re_delim_1_proc */
-/^\/\* BEGIN __db_re_len_1_proc/,/^\/\* END __db_re_len_1_proc/c\
-/* BEGIN __db_re_len_1_proc */\
-void\
-__db_re_len_1_proc(dbpcl_id, len, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t len;\
-\	__db_re_len_reply *replyp;\
-/* END __db_re_len_1_proc */
-/^\/\* BEGIN __db_re_pad_1_proc/,/^\/\* END __db_re_pad_1_proc/c\
-/* BEGIN __db_re_pad_1_proc */\
-void\
-__db_re_pad_1_proc(dbpcl_id, pad, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t pad;\
-\	__db_re_pad_reply *replyp;\
-/* END __db_re_pad_1_proc */
-/^\/\* BEGIN __db_remove_1_proc/,/^\/\* END __db_remove_1_proc/c\
-/* BEGIN __db_remove_1_proc */\
-void\
-__db_remove_1_proc(dbpcl_id, name, subdb,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	u_int32_t flags;\
-\	__db_remove_reply *replyp;\
-/* END __db_remove_1_proc */
-/^\/\* BEGIN __db_rename_1_proc/,/^\/\* END __db_rename_1_proc/c\
-/* BEGIN __db_rename_1_proc */\
-void\
-__db_rename_1_proc(dbpcl_id, name, subdb,\
-\	\	newname, flags, replyp)\
-\	long dbpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	char *newname;\
-\	u_int32_t flags;\
-\	__db_rename_reply *replyp;\
-/* END __db_rename_1_proc */
-/^\/\* BEGIN __db_stat_1_proc/,/^\/\* END __db_stat_1_proc/c\
-/* BEGIN __db_stat_1_proc */\
-void\
-__db_stat_1_proc(dbpcl_id,\
-\	\	flags, replyp, freep)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_stat_reply *replyp;\
-\	int * freep;\
-/* END __db_stat_1_proc */
-/^\/\* BEGIN __db_swapped_1_proc/,/^\/\* END __db_swapped_1_proc/c\
-/* BEGIN __db_swapped_1_proc */\
-void\
-__db_swapped_1_proc(dbpcl_id, replyp)\
-\	long dbpcl_id;\
-\	__db_swapped_reply *replyp;\
-/* END __db_swapped_1_proc */
-/^\/\* BEGIN __db_sync_1_proc/,/^\/\* END __db_sync_1_proc/c\
-/* BEGIN __db_sync_1_proc */\
-void\
-__db_sync_1_proc(dbpcl_id, flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_sync_reply *replyp;\
-/* END __db_sync_1_proc */
-/^\/\* BEGIN __db_cursor_1_proc/,/^\/\* END __db_cursor_1_proc/c\
-/* BEGIN __db_cursor_1_proc */\
-void\
-__db_cursor_1_proc(dbpcl_id, txnpcl_id,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t flags;\
-\	__db_cursor_reply *replyp;\
-/* END __db_cursor_1_proc */
-/^\/\* BEGIN __db_join_1_proc/,/^\/\* END __db_join_1_proc/c\
-/* BEGIN __db_join_1_proc */\
-void\
-__db_join_1_proc(dbpcl_id, curslist,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t * curslist;\
-\	u_int32_t flags;\
-\	__db_join_reply *replyp;\
-/* END __db_join_1_proc */
-/^\/\* BEGIN __dbc_close_1_proc/,/^\/\* END __dbc_close_1_proc/c\
-/* BEGIN __dbc_close_1_proc */\
-void\
-__dbc_close_1_proc(dbccl_id, replyp)\
-\	long dbccl_id;\
-\	__dbc_close_reply *replyp;\
-/* END __dbc_close_1_proc */
-/^\/\* BEGIN __dbc_count_1_proc/,/^\/\* END __dbc_count_1_proc/c\
-/* BEGIN __dbc_count_1_proc */\
-void\
-__dbc_count_1_proc(dbccl_id, flags, replyp)\
-\	long dbccl_id;\
-\	u_int32_t flags;\
-\	__dbc_count_reply *replyp;\
-/* END __dbc_count_1_proc */
-/^\/\* BEGIN __dbc_del_1_proc/,/^\/\* END __dbc_del_1_proc/c\
-/* BEGIN __dbc_del_1_proc */\
-void\
-__dbc_del_1_proc(dbccl_id, flags, replyp)\
-\	long dbccl_id;\
-\	u_int32_t flags;\
-\	__dbc_del_reply *replyp;\
-/* END __dbc_del_1_proc */
-/^\/\* BEGIN __dbc_dup_1_proc/,/^\/\* END __dbc_dup_1_proc/c\
-/* BEGIN __dbc_dup_1_proc */\
-void\
-__dbc_dup_1_proc(dbccl_id, flags, replyp)\
-\	long dbccl_id;\
-\	u_int32_t flags;\
-\	__dbc_dup_reply *replyp;\
-/* END __dbc_dup_1_proc */
-/^\/\* BEGIN __dbc_get_1_proc/,/^\/\* END __dbc_get_1_proc/c\
-/* BEGIN __dbc_get_1_proc */\
-void\
-__dbc_get_1_proc(dbccl_id, keydlen, keydoff,\
-\	\	keyflags, keydata, keysize, datadlen,\
-\	\	datadoff, dataflags, datadata, datasize,\
-\	\	flags, replyp, freep)\
-\	long dbccl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__dbc_get_reply *replyp;\
-\	int * freep;\
-/* END __dbc_get_1_proc */
-/^\/\* BEGIN __dbc_put_1_proc/,/^\/\* END __dbc_put_1_proc/c\
-/* BEGIN __dbc_put_1_proc */\
-void\
-__dbc_put_1_proc(dbccl_id, keydlen, keydoff,\
-\	\	keyflags, keydata, keysize, datadlen,\
-\	\	datadoff, dataflags, datadata, datasize,\
-\	\	flags, replyp, freep)\
-\	long dbccl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__dbc_put_reply *replyp;\
-\	int * freep;\
-/* END __dbc_put_1_proc */
diff --git a/db/rpc_server/db_server_svc.c b/db/rpc_server/db_server_svc.c
deleted file mode 100644
index 96d8a4a5d..000000000
--- a/db/rpc_server/db_server_svc.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include "db_config.h"
-#ifdef HAVE_RPC
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "db_server.h"
-#include <stdio.h>
-#include <stdlib.h> /* getenv, exit */
-#include <memory.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-extern void __dbsrv_timeout();
-
-#ifdef DEBUG
-#define	RPC_SVC_FG
-#endif
-
-static void
-db_serverprog_1(rqstp, transp)
-	struct svc_req *rqstp;
-	register SVCXPRT *transp;
-{
-	union {
-		__env_cachesize_msg __db_env_cachesize_1_arg;
-		__env_close_msg __db_env_close_1_arg;
-		__env_create_msg __db_env_create_1_arg;
-		__env_flags_msg __db_env_flags_1_arg;
-		__env_open_msg __db_env_open_1_arg;
-		__env_remove_msg __db_env_remove_1_arg;
-		__txn_abort_msg __db_txn_abort_1_arg;
-		__txn_begin_msg __db_txn_begin_1_arg;
-		__txn_commit_msg __db_txn_commit_1_arg;
-		__db_bt_maxkey_msg __db_db_bt_maxkey_1_arg;
-		__db_bt_minkey_msg __db_db_bt_minkey_1_arg;
-		__db_close_msg __db_db_close_1_arg;
-		__db_create_msg __db_db_create_1_arg;
-		__db_del_msg __db_db_del_1_arg;
-		__db_extentsize_msg __db_db_extentsize_1_arg;
-		__db_flags_msg __db_db_flags_1_arg;
-		__db_get_msg __db_db_get_1_arg;
-		__db_h_ffactor_msg __db_db_h_ffactor_1_arg;
-		__db_h_nelem_msg __db_db_h_nelem_1_arg;
-		__db_key_range_msg __db_db_key_range_1_arg;
-		__db_lorder_msg __db_db_lorder_1_arg;
-		__db_open_msg __db_db_open_1_arg;
-		__db_pagesize_msg __db_db_pagesize_1_arg;
-		__db_put_msg __db_db_put_1_arg;
-		__db_re_delim_msg __db_db_re_delim_1_arg;
-		__db_re_len_msg __db_db_re_len_1_arg;
-		__db_re_pad_msg __db_db_re_pad_1_arg;
-		__db_remove_msg __db_db_remove_1_arg;
-		__db_rename_msg __db_db_rename_1_arg;
-		__db_stat_msg __db_db_stat_1_arg;
-		__db_swapped_msg __db_db_swapped_1_arg;
-		__db_sync_msg __db_db_sync_1_arg;
-		__db_cursor_msg __db_db_cursor_1_arg;
-		__db_join_msg __db_db_join_1_arg;
-		__dbc_close_msg __db_dbc_close_1_arg;
-		__dbc_count_msg __db_dbc_count_1_arg;
-		__dbc_del_msg __db_dbc_del_1_arg;
-		__dbc_dup_msg __db_dbc_dup_1_arg;
-		__dbc_get_msg __db_dbc_get_1_arg;
-		__dbc_put_msg __db_dbc_put_1_arg;
-	} argument;
-	char *result;
-	bool_t (*xdr_argument)(), (*xdr_result)();
-	char *(*local)();
-
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		(void) svc_sendreply(transp, xdr_void,
-			(char *)NULL);
-		return;
-
-	case __DB_env_cachesize:
-		xdr_argument = xdr___env_cachesize_msg;
-		xdr_result = xdr___env_cachesize_reply;
-		local = (char *(*)()) __db_env_cachesize_1;
-		break;
-
-	case __DB_env_close:
-		xdr_argument = xdr___env_close_msg;
-		xdr_result = xdr___env_close_reply;
-		local = (char *(*)()) __db_env_close_1;
-		break;
-
-	case __DB_env_create:
-		xdr_argument = xdr___env_create_msg;
-		xdr_result = xdr___env_create_reply;
-		local = (char *(*)()) __db_env_create_1;
-		break;
-
-	case __DB_env_flags:
-		xdr_argument = xdr___env_flags_msg;
-		xdr_result = xdr___env_flags_reply;
-		local = (char *(*)()) __db_env_flags_1;
-		break;
-
-	case __DB_env_open:
-		xdr_argument = xdr___env_open_msg;
-		xdr_result = xdr___env_open_reply;
-		local = (char *(*)()) __db_env_open_1;
-		break;
-
-	case __DB_env_remove:
-		xdr_argument = xdr___env_remove_msg;
-		xdr_result = xdr___env_remove_reply;
-		local = (char *(*)()) __db_env_remove_1;
-		break;
-
-	case __DB_txn_abort:
-		xdr_argument = xdr___txn_abort_msg;
-		xdr_result = xdr___txn_abort_reply;
-		local = (char *(*)()) __db_txn_abort_1;
-		break;
-
-	case __DB_txn_begin:
-		xdr_argument = xdr___txn_begin_msg;
-		xdr_result = xdr___txn_begin_reply;
-		local = (char *(*)()) __db_txn_begin_1;
-		break;
-
-	case __DB_txn_commit:
-		xdr_argument = xdr___txn_commit_msg;
-		xdr_result = xdr___txn_commit_reply;
-		local = (char *(*)()) __db_txn_commit_1;
-		break;
-
-	case __DB_db_bt_maxkey:
-		xdr_argument = xdr___db_bt_maxkey_msg;
-		xdr_result = xdr___db_bt_maxkey_reply;
-		local = (char *(*)()) __db_db_bt_maxkey_1;
-		break;
-
-	case __DB_db_bt_minkey:
-		xdr_argument = xdr___db_bt_minkey_msg;
-		xdr_result = xdr___db_bt_minkey_reply;
-		local = (char *(*)()) __db_db_bt_minkey_1;
-		break;
-
-	case __DB_db_close:
-		xdr_argument = xdr___db_close_msg;
-		xdr_result = xdr___db_close_reply;
-		local = (char *(*)()) __db_db_close_1;
-		break;
-
-	case __DB_db_create:
-		xdr_argument = xdr___db_create_msg;
-		xdr_result = xdr___db_create_reply;
-		local = (char *(*)()) __db_db_create_1;
-		break;
-
-	case __DB_db_del:
-		xdr_argument = xdr___db_del_msg;
-		xdr_result = xdr___db_del_reply;
-		local = (char *(*)()) __db_db_del_1;
-		break;
-
-	case __DB_db_extentsize:
-		xdr_argument = xdr___db_extentsize_msg;
-		xdr_result = xdr___db_extentsize_reply;
-		local = (char *(*)()) __db_db_extentsize_1;
-		break;
-
-	case __DB_db_flags:
-		xdr_argument = xdr___db_flags_msg;
-		xdr_result = xdr___db_flags_reply;
-		local = (char *(*)()) __db_db_flags_1;
-		break;
-
-	case __DB_db_get:
-		xdr_argument = xdr___db_get_msg;
-		xdr_result = xdr___db_get_reply;
-		local = (char *(*)()) __db_db_get_1;
-		break;
-
-	case __DB_db_h_ffactor:
-		xdr_argument = xdr___db_h_ffactor_msg;
-		xdr_result = xdr___db_h_ffactor_reply;
-		local = (char *(*)()) __db_db_h_ffactor_1;
-		break;
-
-	case __DB_db_h_nelem:
-		xdr_argument = xdr___db_h_nelem_msg;
-		xdr_result = xdr___db_h_nelem_reply;
-		local = (char *(*)()) __db_db_h_nelem_1;
-		break;
-
-	case __DB_db_key_range:
-		xdr_argument = xdr___db_key_range_msg;
-		xdr_result = xdr___db_key_range_reply;
-		local = (char *(*)()) __db_db_key_range_1;
-		break;
-
-	case __DB_db_lorder:
-		xdr_argument = xdr___db_lorder_msg;
-		xdr_result = xdr___db_lorder_reply;
-		local = (char *(*)()) __db_db_lorder_1;
-		break;
-
-	case __DB_db_open:
-		xdr_argument = xdr___db_open_msg;
-		xdr_result = xdr___db_open_reply;
-		local = (char *(*)()) __db_db_open_1;
-		break;
-
-	case __DB_db_pagesize:
-		xdr_argument = xdr___db_pagesize_msg;
-		xdr_result = xdr___db_pagesize_reply;
-		local = (char *(*)()) __db_db_pagesize_1;
-		break;
-
-	case __DB_db_put:
-		xdr_argument = xdr___db_put_msg;
-		xdr_result = xdr___db_put_reply;
-		local = (char *(*)()) __db_db_put_1;
-		break;
-
-	case __DB_db_re_delim:
-		xdr_argument = xdr___db_re_delim_msg;
-		xdr_result = xdr___db_re_delim_reply;
-		local = (char *(*)()) __db_db_re_delim_1;
-		break;
-
-	case __DB_db_re_len:
-		xdr_argument = xdr___db_re_len_msg;
-		xdr_result = xdr___db_re_len_reply;
-		local = (char *(*)()) __db_db_re_len_1;
-		break;
-
-	case __DB_db_re_pad:
-		xdr_argument = xdr___db_re_pad_msg;
-		xdr_result = xdr___db_re_pad_reply;
-		local = (char *(*)()) __db_db_re_pad_1;
-		break;
-
-	case __DB_db_remove:
-		xdr_argument = xdr___db_remove_msg;
-		xdr_result = xdr___db_remove_reply;
-		local = (char *(*)()) __db_db_remove_1;
-		break;
-
-	case __DB_db_rename:
-		xdr_argument = xdr___db_rename_msg;
-		xdr_result = xdr___db_rename_reply;
-		local = (char *(*)()) __db_db_rename_1;
-		break;
-
-	case __DB_db_stat:
-		xdr_argument = xdr___db_stat_msg;
-		xdr_result = xdr___db_stat_reply;
-		local = (char *(*)()) __db_db_stat_1;
-		break;
-
-	case __DB_db_swapped:
-		xdr_argument = xdr___db_swapped_msg;
-		xdr_result = xdr___db_swapped_reply;
-		local = (char *(*)()) __db_db_swapped_1;
-		break;
-
-	case __DB_db_sync:
-		xdr_argument = xdr___db_sync_msg;
-		xdr_result = xdr___db_sync_reply;
-		local = (char *(*)()) __db_db_sync_1;
-		break;
-
-	case __DB_db_cursor:
-		xdr_argument = xdr___db_cursor_msg;
-		xdr_result = xdr___db_cursor_reply;
-		local = (char *(*)()) __db_db_cursor_1;
-		break;
-
-	case __DB_db_join:
-		xdr_argument = xdr___db_join_msg;
-		xdr_result = xdr___db_join_reply;
-		local = (char *(*)()) __db_db_join_1;
-		break;
-
-	case __DB_dbc_close:
-		xdr_argument = xdr___dbc_close_msg;
-		xdr_result = xdr___dbc_close_reply;
-		local = (char *(*)()) __db_dbc_close_1;
-		break;
-
-	case __DB_dbc_count:
-		xdr_argument = xdr___dbc_count_msg;
-		xdr_result = xdr___dbc_count_reply;
-		local = (char *(*)()) __db_dbc_count_1;
-		break;
-
-	case __DB_dbc_del:
-		xdr_argument = xdr___dbc_del_msg;
-		xdr_result = xdr___dbc_del_reply;
-		local = (char *(*)()) __db_dbc_del_1;
-		break;
-
-	case __DB_dbc_dup:
-		xdr_argument = xdr___dbc_dup_msg;
-		xdr_result = xdr___dbc_dup_reply;
-		local = (char *(*)()) __db_dbc_dup_1;
-		break;
-
-	case __DB_dbc_get:
-		xdr_argument = xdr___dbc_get_msg;
-		xdr_result = xdr___dbc_get_reply;
-		local = (char *(*)()) __db_dbc_get_1;
-		break;
-
-	case __DB_dbc_put:
-		xdr_argument = xdr___dbc_put_msg;
-		xdr_result = xdr___dbc_put_reply;
-		local = (char *(*)()) __db_dbc_put_1;
-		break;
-
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-	(void) memset((char *)&argument, 0, sizeof (argument));
-	if (!svc_getargs(transp, xdr_argument, &argument)) {
-		svcerr_decode(transp);
-		return;
-	}
-	result = (*local)(&argument, rqstp);
-	if (result != NULL && !svc_sendreply(transp, xdr_result, result)) {
-		svcerr_systemerr(transp);
-	}
-	if (!svc_freeargs(transp, xdr_argument, &argument)) {
-		fprintf(stderr, "unable to free arguments");
-		exit(1);
-	}
-	__dbsrv_timeout(0);
-	return;
-}
-
-void __dbsrv_main()
-{
-	register SVCXPRT *transp;
-
-	(void) pmap_unset(DB_SERVERPROG, DB_SERVERVERS);
-
-	transp = svctcp_create(RPC_ANYSOCK, 0, 0);
-	if (transp == NULL) {
-		fprintf(stderr, "cannot create tcp service.");
-		exit(1);
-	}
-	if (!svc_register(transp, DB_SERVERPROG, DB_SERVERVERS, db_serverprog_1, IPPROTO_TCP)) {
-		fprintf(stderr, "unable to register (DB_SERVERPROG, DB_SERVERVERS, tcp).");
-		exit(1);
-	}
-
-	svc_run();
-	fprintf(stderr, "svc_run returned");
-	exit(1);
-	/* NOTREACHED */
-}
-#endif /* HAVE_RPC */
diff --git a/db/rpc_server/db_server_svc.sed b/db/rpc_server/db_server_svc.sed
deleted file mode 100644
index 9d540e51a..000000000
--- a/db/rpc_server/db_server_svc.sed
+++ /dev/null
@@ -1,5 +0,0 @@
-/^#include <netinet.in.h>/a\
-\extern void __dbsrv_timeout();
-/^	return;/i\
-\	__dbsrv_timeout(0);
-s/^main/void __dbsrv_main/
diff --git a/db/rpc_server/db_server_util.c b/db/rpc_server/db_server_util.c
deleted file mode 100644
index 862bbd05e..000000000
--- a/db/rpc_server/db_server_util.c
+++ /dev/null
@@ -1,612 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2000
- *      Sleepycat Software.  All rights reserved.
- */
-
-#include "db_config.h"
-
-#ifndef lint
-static const char revid[] = "$Id: db_server_util.c,v 1.32 2001/01/18 18:36:59 bostic Exp $";
-#endif /* not lint */
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
-#include <rpc/rpc.h>
-
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#endif
-#include "db_server.h"
-
-#include "db_int.h"
-#include "clib_ext.h"
-#include "db_server_int.h"
-#include "rpc_server_ext.h"
-#include "common_ext.h"
-
-extern int __dbsrv_main	 __P((void));
-static int add_home __P((char *));
-static int env_recover __P((char *));
-static void __dbclear_child __P((ct_entry *));
-
-static LIST_HEAD(cthead, ct_entry) __dbsrv_head;
-static LIST_HEAD(homehead, home_entry) __dbsrv_home;
-static long __dbsrv_defto = DB_SERVER_TIMEOUT;
-static long __dbsrv_maxto = DB_SERVER_MAXTIMEOUT;
-static long __dbsrv_idleto = DB_SERVER_IDLETIMEOUT;
-static char *logfile = NULL;
-static char *prog;
-
-static void usage __P((char *));
-static void version_check __P((void));
-
-int __dbsrv_verbose = 0;
-
-int
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	extern char *optarg;
-	extern int optind;
-	CLIENT *cl;
-	int ch, ret;
-
-	prog = argv[0];
-
-	version_check();
-
-	/*
-	 * Check whether another server is running or not.  There
-	 * is a race condition where two servers could be racing to
-	 * register with the portmapper.  The goal of this check is to
-	 * forbid running additional servers (like those started from
-	 * the test suite) if the user is already running one.
-	 *
-	 * XXX
-	 * This does not solve nor prevent two servers from being
-	 * started at the same time and running recovery at the same
-	 * time on the same environments.
-	 */
-	if ((cl = clnt_create("localhost",
-	    DB_SERVERPROG, DB_SERVERVERS, "tcp")) != NULL) {
-		fprintf(stderr,
-		    "%s: Berkeley DB RPC server already running.\n", prog);
-		clnt_destroy(cl);
-		exit(1);
-	}
-
-	LIST_INIT(&__dbsrv_home);
-	while ((ch = getopt(argc, argv, "h:I:L:t:T:Vv")) != EOF)
-		switch (ch) {
-		case 'h':
-			(void)add_home(optarg);
-			break;
-		case 'I':
-			(void)__db_getlong(NULL, prog, optarg, 1,
-			    LONG_MAX, &__dbsrv_idleto);
-			break;
-		case 'L':
-			logfile = optarg;
-			break;
-		case 't':
-			(void)__db_getlong(NULL, prog, optarg, 1,
-			    LONG_MAX, &__dbsrv_defto);
-			break;
-		case 'T':
-			(void)__db_getlong(NULL, prog, optarg, 1,
-			    LONG_MAX, &__dbsrv_maxto);
-			break;
-		case 'V':
-			printf("%s\n", db_version(NULL, NULL, NULL));
-			exit(0);
-		case 'v':
-			__dbsrv_verbose = 1;
-			break;
-		default:
-			usage(prog);
-		}
-	/*
-	 * Check default timeout against maximum timeout
-	 */
-	if (__dbsrv_defto > __dbsrv_maxto)
-		__dbsrv_defto = __dbsrv_maxto;
-
-	/*
-	 * Check default timeout against idle timeout
-	 * It would be bad to timeout environments sooner than txns.
-	 */
-	if (__dbsrv_defto > __dbsrv_idleto)
-printf("%s:  WARNING: Idle timeout %ld is less than resource timeout %ld\n",
-		    prog, __dbsrv_idleto, __dbsrv_defto);
-
-	LIST_INIT(&__dbsrv_head);
-
-	/*
-	 * If a client crashes during an RPC, our reply to it
-	 * generates a SIGPIPE.  Ignore SIGPIPE so we don't exit unnecessarily.
-	 */
-#ifdef SIGPIPE
-	signal(SIGPIPE, SIG_IGN);
-#endif
-
-	if (logfile != NULL && __db_util_logset("berkeley_db_svc", logfile))
-		exit(1);
-
-	/*
-	 * Now that we are ready to start, run recovery on all the
-	 * environments specified.
-	 */
-	if ((ret = env_recover(prog)) != 0)
-		exit(1);
-
-	/*
-	 * We've done our setup, now call the generated server loop
-	 */
-	if (__dbsrv_verbose)
-		printf("%s:  Ready to receive requests\n", prog);
-	__dbsrv_main();
-
-	/* NOTREACHED */
-	abort();
-}
-
-static void
-usage(prog)
-	char *prog;
-{
-	fprintf(stderr, "usage: %s %s\n\t%s\n", prog,
-	    "[-Vv] [-h home]",
-	    "[-I idletimeout] [-L logfile] [-t def_timeout] [-T maxtimeout]");
-	exit(1);
-}
-
-static void
-version_check()
-{
-	int v_major, v_minor, v_patch;
-
-	/* Make sure we're loaded with the right version of the DB library. */
-	(void)db_version(&v_major, &v_minor, &v_patch);
-	if (v_major != DB_VERSION_MAJOR ||
-	    v_minor != DB_VERSION_MINOR || v_patch != DB_VERSION_PATCH) {
-		fprintf(stderr,
-	"%s: version %d.%d.%d doesn't match library version %d.%d.%d\n",
-		    prog, DB_VERSION_MAJOR, DB_VERSION_MINOR,
-		    DB_VERSION_PATCH, v_major, v_minor, v_patch);
-		exit (1);
-	}
-}
-
-/*
- * PUBLIC: void __dbsrv_settimeout __P((ct_entry *, u_int32_t));
- */
-void
-__dbsrv_settimeout(ctp, to)
-	ct_entry *ctp;
-	u_int32_t to;
-{
-	if (to > (u_int32_t)__dbsrv_maxto)
-		ctp->ct_timeout = __dbsrv_maxto;
-	else if (to <= 0)
-		ctp->ct_timeout = __dbsrv_defto;
-	else
-		ctp->ct_timeout = to;
-}
-
-/*
- * PUBLIC: void __dbsrv_timeout __P((int));
- */
-void
-__dbsrv_timeout(force)
-	int force;
-{
-	static long to_hint = -1;
-	DBC *dbcp;
-	time_t t;
-	long to;
-	ct_entry *ctp, *nextctp;
-
-	if ((t = time(NULL)) == -1)
-		return;
-
-	/*
-	 * Check hint.  If hint is further in the future
-	 * than now, no work to do.
-	 */
-	if (!force && to_hint > 0 && t < to_hint)
-		return;
-	to_hint = -1;
-	/*
-	 * Timeout transactions or cursors holding DB resources.
-	 * Do this before timing out envs to properly release resources.
-	 *
-	 * !!!
-	 * We can just loop through this list looking for cursors and txns.
-	 * We do not need to verify txn and cursor relationships at this
-	 * point because we maintain the list in LIFO order *and* we
-	 * maintain activity in the ultimate txn parent of any cursor
-	 * so either everything in a txn is timing out, or nothing.
-	 * So, since we are LIFO, we will correctly close/abort all the
-	 * appropriate handles, in the correct order.
-	 */
-	for (ctp = LIST_FIRST(&__dbsrv_head); ctp != NULL; ctp = nextctp) {
-		nextctp = LIST_NEXT(ctp, entries);
-		switch (ctp->ct_type) {
-		case CT_TXN:
-			to = *(ctp->ct_activep) + ctp->ct_timeout;
-			/* TIMEOUT */
-			if (to < t) {
-				if (__dbsrv_verbose)
-					printf("Timing out txn id %ld\n",
-					    ctp->ct_id);
-				(void)txn_abort((DB_TXN *)ctp->ct_anyp);
-				__dbdel_ctp(ctp);
-				/*
-				 * If we timed out an txn, we may have closed
-				 * all sorts of ctp's.
-				 * So start over with a guaranteed good ctp.
-				 */
-				nextctp = LIST_FIRST(&__dbsrv_head);
-			} else if ((to_hint > 0 && to_hint > to) ||
-			    to_hint == -1)
-				to_hint = to;
-			break;
-		case CT_CURSOR:
-		case (CT_JOINCUR | CT_CURSOR):
-			to = *(ctp->ct_activep) + ctp->ct_timeout;
-			/* TIMEOUT */
-			if (to < t) {
-				if (__dbsrv_verbose)
-					printf("Timing out cursor %ld\n",
-					    ctp->ct_id);
-				dbcp = (DBC *)ctp->ct_anyp;
-				(void)__dbc_close_int(ctp);
-				/*
-				 * Start over with a guaranteed good ctp.
-				 */
-				nextctp = LIST_FIRST(&__dbsrv_head);
-			} else if ((to_hint > 0 && to_hint > to) ||
-			    to_hint == -1)
-				to_hint = to;
-			break;
-		default:
-			break;
-		}
-	}
-	/*
-	 * Timeout idle handles.
-	 * If we are forcing a timeout, we'll close all env handles.
-	 */
-	for (ctp = LIST_FIRST(&__dbsrv_head); ctp != NULL; ctp = nextctp) {
-		nextctp = LIST_NEXT(ctp, entries);
-		if (ctp->ct_type != CT_ENV)
-			continue;
-		to = *(ctp->ct_activep) + ctp->ct_idle;
-		/* TIMEOUT */
-		if (to < t || force) {
-			if (__dbsrv_verbose)
-				printf("Timing out env id %ld\n", ctp->ct_id);
-			(void)__dbenv_close_int(ctp->ct_id, 0);
-			/*
-			 * If we timed out an env, we may have closed
-			 * all sorts of ctp's (maybe even all of them.
-			 * So start over with a guaranteed good ctp.
-			 */
-			nextctp = LIST_FIRST(&__dbsrv_head);
-		}
-	}
-}
-
-/*
- * RECURSIVE FUNCTION.  We need to clear/free any number of levels of nested
- * layers.
- */
-static void
-__dbclear_child(parent)
-	ct_entry *parent;
-{
-	ct_entry *ctp, *nextctp;
-
-	for (ctp = LIST_FIRST(&__dbsrv_head); ctp != NULL;
-	    ctp = nextctp) {
-		nextctp = LIST_NEXT(ctp, entries);
-		if (ctp->ct_type == 0)
-			continue;
-		if (ctp->ct_parent == parent) {
-			__dbclear_child(ctp);
-			/*
-			 * Need to do this here because le_next may
-			 * have changed with the recursive call and we
-			 * don't want to point to a removed entry.
-			 */
-			nextctp = LIST_NEXT(ctp, entries);
-			__dbclear_ctp(ctp);
-		}
-	}
-}
-
-/*
- * PUBLIC: void __dbclear_ctp __P((ct_entry *));
- */
-void
-__dbclear_ctp(ctp)
-	ct_entry *ctp;
-{
-	LIST_REMOVE(ctp, entries);
-	__os_free(ctp, sizeof(ct_entry));
-}
-
-/*
- * PUBLIC: void __dbdel_ctp __P((ct_entry *));
- */
-void
-__dbdel_ctp(parent)
-	ct_entry *parent;
-{
-	__dbclear_child(parent);
-	__dbclear_ctp(parent);
-}
-
-/*
- * PUBLIC: ct_entry *new_ct_ent __P((u_int32_t *));
- */
-ct_entry *
-new_ct_ent(errp)
-	u_int32_t *errp;
-{
-	time_t t;
-	ct_entry *ctp, *octp;
-	int ret;
-
-	if ((ret = __os_malloc(NULL, sizeof(ct_entry), NULL, &ctp)) != 0) {
-		*errp = ret;
-		return (NULL);
-	}
-	/*
-	 * Get the time as ID.  We may service more than one request per
-	 * second however.  If we are, then increment id value until we
-	 * find an unused one.  We insert entries in LRU fashion at the
-	 * head of the list.  So, if the first entry doesn't match, then
-	 * we know for certain that we can use our entry.
-	 */
-	if ((t = time(NULL)) == -1) {
-		*errp = t;
-		__os_free(ctp, sizeof(ct_entry));
-		return (NULL);
-	}
-	octp = LIST_FIRST(&__dbsrv_head);
-	if (octp != NULL && octp->ct_id >= t)
-		t = octp->ct_id + 1;
-	ctp->ct_id = t;
-	ctp->ct_idle = __dbsrv_idleto;
-	ctp->ct_activep = &ctp->ct_active;
-	ctp->ct_origp = NULL;
-
-	LIST_INSERT_HEAD(&__dbsrv_head, ctp, entries);
-	return (ctp);
-}
-
-/*
- * PUBLIC: ct_entry *get_tableent __P((long));
- */
-ct_entry *
-get_tableent(id)
-	long id;
-{
-	ct_entry *ctp;
-
-	for (ctp = LIST_FIRST(&__dbsrv_head); ctp != NULL;
-	    ctp = LIST_NEXT(ctp, entries))
-		if (ctp->ct_id == id)
-			return (ctp);
-	return (NULL);
-}
-
-/*
- * PUBLIC: void __dbsrv_active __P((ct_entry *));
- */
-void
-__dbsrv_active(ctp)
-	ct_entry *ctp;
-{
-	time_t t;
-	ct_entry *envctp;
-
-	if (ctp == NULL)
-		return;
-	if ((t = time(NULL)) == -1)
-		return;
-	*(ctp->ct_activep) = t;
-	if ((envctp = ctp->ct_envparent) == NULL)
-		return;
-	*(envctp->ct_activep) = t;
-	return;
-}
-
-/*
- * PUBLIC: int __dbc_close_int __P((ct_entry *));
- */
-int
-__dbc_close_int(dbc_ctp)
-	ct_entry *dbc_ctp;
-{
-	DBC *dbc;
-	int ret;
-	ct_entry *ctp;
-
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	ret = dbc->c_close(dbc);
-	/*
-	 * If this cursor is a join cursor then we need to fix up the
-	 * cursors that it was joined from so that they are independent again.
-	 */
-	if (dbc_ctp->ct_type & CT_JOINCUR)
-		for (ctp = LIST_FIRST(&__dbsrv_head); ctp != NULL;
-		    ctp = LIST_NEXT(ctp, entries)) {
-			/*
-			 * Test if it is a join cursor, and if it is part
-			 * of this one.
-			 */
-			if ((ctp->ct_type & CT_JOIN) &&
-			    ctp->ct_activep == &dbc_ctp->ct_active) {
-				ctp->ct_type &= ~CT_JOIN;
-				ctp->ct_activep = ctp->ct_origp;
-				__dbsrv_active(ctp);
-			}
-		}
-	__dbclear_ctp(dbc_ctp);
-	return (ret);
-
-}
-
-/*
- * PUBLIC: int __dbenv_close_int __P((long, int));
- */
-int
-__dbenv_close_int(id, flags)
-	long id;
-	int flags;
-{
-	DB_ENV *dbenv;
-	int ret;
-	ct_entry *ctp;
-
-	ctp = get_tableent(id);
-	if (ctp == NULL)
-		return (DB_NOSERVER_ID);
-	DB_ASSERT(ctp->ct_type == CT_ENV);
-	dbenv = ctp->ct_envp;
-
-	ret = dbenv->close(dbenv, flags);
-	__dbdel_ctp(ctp);
-	return (ret);
-}
-
-static int
-add_home(home)
-	char *home;
-{
-	home_entry *hp, *homep;
-	int ret;
-
-	if ((ret = __os_malloc(NULL, sizeof(home_entry), NULL, &hp)) != 0)
-		return (ret);
-	if ((ret = __os_malloc(NULL, strlen(home)+1, NULL, &hp->home)) != 0)
-		return (ret);
-	memcpy(hp->home, home, strlen(home)+1);
-	hp->dir = home;
-	/*
-	 * This loop is to remove any trailing path separators,
-	 * to assure hp->name points to the last component.
-	 */
-	hp->name = __db_rpath(home);
-	*(hp->name) = '\0';
-	hp->name++;
-	while (*(hp->name) == '\0') {
-		hp->name = __db_rpath(home);
-		*(hp->name) = '\0';
-		hp->name++;
-	}
-	/*
-	 * Now we have successfully added it.  Make sure there are no
-	 * identical names.
-	 */
-	for (homep = LIST_FIRST(&__dbsrv_home); homep != NULL;
-	    homep = LIST_NEXT(homep, entries))
-		if (strcmp(homep->name, hp->name) == 0) {
-			printf("Already added home name %s, at directory %s\n",
-			    hp->name, homep->dir);
-			return (-1);
-		}
-	LIST_INSERT_HEAD(&__dbsrv_home, hp, entries);
-	if (__dbsrv_verbose)
-		printf("Added home %s in dir %s\n", hp->name, hp->dir);
-	return (0);
-}
-
-/*
- * PUBLIC: char *get_home __P((char *));
- */
-char *
-get_home(name)
-	char *name;
-{
-	home_entry *hp;
-
-	for (hp = LIST_FIRST(&__dbsrv_home); hp != NULL;
-	    hp = LIST_NEXT(hp, entries))
-		if (strcmp(name, hp->name) == 0)
-			return (hp->home);
-	return (NULL);
-}
-
-static int
-env_recover(progname)
-	char *progname;
-{
-	DB_ENV *dbenv;
-	home_entry *hp;
-	u_int32_t flags;
-	int exitval, ret;
-
-	for (hp = LIST_FIRST(&__dbsrv_home); hp != NULL;
-	    hp = LIST_NEXT(hp, entries)) {
-		exitval = 0;
-		if ((ret = db_env_create(&dbenv, 0)) != 0) {
-			fprintf(stderr, "%s: db_env_create: %s\n",
-			    progname, db_strerror(ret));
-			exit(1);
-		}
-		if (__dbsrv_verbose == 1) {
-			(void)dbenv->set_verbose(dbenv, DB_VERB_RECOVERY, 1);
-			(void)dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT, 1);
-		}
-		dbenv->set_errfile(dbenv, stderr);
-		dbenv->set_errpfx(dbenv, progname);
-
-		/*
-		 * Initialize the env with DB_RECOVER.  That is all we
-		 * have to do to run recovery.
-		 */
-		if (__dbsrv_verbose)
-			printf("Running recovery on %s\n", hp->home);
-		flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
-		    DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON | DB_RECOVER;
-		if ((ret = dbenv->open(dbenv, hp->home, flags, 0)) != 0) {
-			dbenv->err(dbenv, ret, "DBENV->open");
-			goto error;
-		}
-
-		if (0) {
-error:			exitval = 1;
-		}
-		if ((ret = dbenv->close(dbenv, 0)) != 0) {
-			exitval = 1;
-			fprintf(stderr, "%s: dbenv->close: %s\n",
-			    progname, db_strerror(ret));
-		}
-		if (exitval)
-			return (exitval);
-	}
-	return (0);
-}
diff --git a/db/rpc_server/db_server_xdr.c b/db/rpc_server/db_server_xdr.c
deleted file mode 100644
index f403f862e..000000000
--- a/db/rpc_server/db_server_xdr.c
+++ /dev/null
@@ -1,1149 +0,0 @@
-#include "db_config.h"
-#ifdef HAVE_RPC
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "db_server.h"
-
-bool_t
-xdr___env_cachesize_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_cachesize_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->gbytes))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->bytes))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ncache))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_cachesize_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_cachesize_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_close_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_close_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_close_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_close_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_create_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_create_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->timeout))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_create_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_create_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->envcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_flags_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_flags_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->onoff))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_flags_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_flags_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_open_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_open_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->home, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->mode))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_open_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_open_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_remove_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_remove_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->home, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_remove_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_remove_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_abort_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_abort_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_abort_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_abort_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_begin_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_begin_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->envpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->parentcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_begin_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_begin_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_commit_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_commit_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_commit_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_commit_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_maxkey_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_maxkey_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->maxkey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_maxkey_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_maxkey_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_minkey_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_minkey_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->minkey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_minkey_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_minkey_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_close_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_close_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_close_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_close_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_create_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_create_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->envpcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_create_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_create_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_del_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_del_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_del_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_del_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_extentsize_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_extentsize_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->extentsize))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_extentsize_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_extentsize_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_flags_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_flags_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_flags_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_flags_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_get_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_get_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_get_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_get_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_ffactor_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_ffactor_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ffactor))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_ffactor_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_ffactor_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_nelem_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_nelem_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->nelem))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_nelem_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_nelem_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_key_range_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_key_range_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_key_range_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_key_range_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_double(xdrs, &objp->less))
-		return (FALSE);
-	if (!xdr_double(xdrs, &objp->equal))
-		return (FALSE);
-	if (!xdr_double(xdrs, &objp->greater))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_lorder_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_lorder_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->lorder))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_lorder_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_lorder_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_open_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_open_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->type))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->mode))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_open_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_open_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->type))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbflags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_pagesize_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_pagesize_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pagesize))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_pagesize_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_pagesize_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_put_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_put_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_put_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_put_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_delim_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_delim_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->delim))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_delim_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_delim_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_len_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_len_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->len))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_len_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_len_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_pad_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_pad_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pad))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_pad_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_pad_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_remove_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_remove_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_remove_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_remove_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_rename_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_rename_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->newname, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_rename_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_rename_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_stat_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_stat_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_stat_statsreplist(xdrs, objp)
-	register XDR *xdrs;
-	__db_stat_statsreplist *objp;
-{
-
-	if (!xdr_bytes(xdrs, (char **)&objp->ent.ent_val, (u_int *) &objp->ent.ent_len, ~0))
-		return (FALSE);
-	if (!xdr_pointer(xdrs, (char **)&objp->next, sizeof (__db_stat_statsreplist), (xdrproc_t) xdr___db_stat_statsreplist))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_stat_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_stat_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_pointer(xdrs, (char **)&objp->statslist, sizeof (__db_stat_statsreplist), (xdrproc_t) xdr___db_stat_statsreplist))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_swapped_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_swapped_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_swapped_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_swapped_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_sync_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_sync_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_sync_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_sync_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_cursor_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_cursor_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_cursor_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_cursor_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_join_curslist(xdrs, objp)
-	register XDR *xdrs;
-	__db_join_curslist *objp;
-{
-
-	if (!xdr_bytes(xdrs, (char **)&objp->ent.ent_val, (u_int *) &objp->ent.ent_len, ~0))
-		return (FALSE);
-	if (!xdr_pointer(xdrs, (char **)&objp->next, sizeof (__db_join_curslist), (xdrproc_t) xdr___db_join_curslist))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_join_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_join_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_pointer(xdrs, (char **)&objp->curslist, sizeof (__db_join_curslist), (xdrproc_t) xdr___db_join_curslist))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_join_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_join_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_close_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_close_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_close_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_close_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_count_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_count_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_count_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_count_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dupcount))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_del_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_del_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_del_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_del_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_dup_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_dup_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_dup_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_dup_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_get_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_get_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_get_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_get_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_put_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_put_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_put_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_put_reply *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-#endif /* HAVE_RPC */
diff --git a/db/rpc_server/gen_db_server.c b/db/rpc_server/gen_db_server.c
deleted file mode 100644
index 20da69c4b..000000000
--- a/db/rpc_server/gen_db_server.c
+++ /dev/null
@@ -1,703 +0,0 @@
-/* Do not edit: automatically built by gen_rpc.awk. */
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-
-#include <errno.h>
-#include <string.h>
-#endif
-#include "db_server.h"
-
-#include "db_int.h"
-#include "db_server_int.h"
-#include "rpc_server_ext.h"
-
-#include "gen_server_ext.h"
-
-__env_cachesize_reply *
-__db_env_cachesize_1(req)
-	__env_cachesize_msg *req;
-{
-	static __env_cachesize_reply reply; /* must be static */
-
-	__env_cachesize_1_proc(req->dbenvcl_id,
-	    req->gbytes,
-	    req->bytes,
-	    req->ncache,
-	    &reply);
-
-	return (&reply);
-}
-
-__env_close_reply *
-__db_env_close_1(req)
-	__env_close_msg *req;
-{
-	static __env_close_reply reply; /* must be static */
-
-	__env_close_1_proc(req->dbenvcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__env_create_reply *
-__db_env_create_1(req)
-	__env_create_msg *req;
-{
-	static __env_create_reply reply; /* must be static */
-
-	__env_create_1_proc(req->timeout,
-	    &reply);
-
-	return (&reply);
-}
-
-__env_flags_reply *
-__db_env_flags_1(req)
-	__env_flags_msg *req;
-{
-	static __env_flags_reply reply; /* must be static */
-
-	__env_flags_1_proc(req->dbenvcl_id,
-	    req->flags,
-	    req->onoff,
-	    &reply);
-
-	return (&reply);
-}
-
-__env_open_reply *
-__db_env_open_1(req)
-	__env_open_msg *req;
-{
-	static __env_open_reply reply; /* must be static */
-
-	__env_open_1_proc(req->dbenvcl_id,
-	    (*req->home == '\0') ? NULL : req->home,
-	    req->flags,
-	    req->mode,
-	    &reply);
-
-	return (&reply);
-}
-
-__env_remove_reply *
-__db_env_remove_1(req)
-	__env_remove_msg *req;
-{
-	static __env_remove_reply reply; /* must be static */
-
-	__env_remove_1_proc(req->dbenvcl_id,
-	    (*req->home == '\0') ? NULL : req->home,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__txn_abort_reply *
-__db_txn_abort_1(req)
-	__txn_abort_msg *req;
-{
-	static __txn_abort_reply reply; /* must be static */
-
-	__txn_abort_1_proc(req->txnpcl_id,
-	    &reply);
-
-	return (&reply);
-}
-
-__txn_begin_reply *
-__db_txn_begin_1(req)
-	__txn_begin_msg *req;
-{
-	static __txn_begin_reply reply; /* must be static */
-
-	__txn_begin_1_proc(req->envpcl_id,
-	    req->parentcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__txn_commit_reply *
-__db_txn_commit_1(req)
-	__txn_commit_msg *req;
-{
-	static __txn_commit_reply reply; /* must be static */
-
-	__txn_commit_1_proc(req->txnpcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_bt_maxkey_reply *
-__db_db_bt_maxkey_1(req)
-	__db_bt_maxkey_msg *req;
-{
-	static __db_bt_maxkey_reply reply; /* must be static */
-
-	__db_bt_maxkey_1_proc(req->dbpcl_id,
-	    req->maxkey,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_bt_minkey_reply *
-__db_db_bt_minkey_1(req)
-	__db_bt_minkey_msg *req;
-{
-	static __db_bt_minkey_reply reply; /* must be static */
-
-	__db_bt_minkey_1_proc(req->dbpcl_id,
-	    req->minkey,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_close_reply *
-__db_db_close_1(req)
-	__db_close_msg *req;
-{
-	static __db_close_reply reply; /* must be static */
-
-	__db_close_1_proc(req->dbpcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_create_reply *
-__db_db_create_1(req)
-	__db_create_msg *req;
-{
-	static __db_create_reply reply; /* must be static */
-
-	__db_create_1_proc(req->flags,
-	    req->envpcl_id,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_del_reply *
-__db_db_del_1(req)
-	__db_del_msg *req;
-{
-	static __db_del_reply reply; /* must be static */
-
-	__db_del_1_proc(req->dbpcl_id,
-	    req->txnpcl_id,
-	    req->keydlen,
-	    req->keydoff,
-	    req->keyflags,
-	    req->keydata.keydata_val,
-	    req->keydata.keydata_len,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_extentsize_reply *
-__db_db_extentsize_1(req)
-	__db_extentsize_msg *req;
-{
-	static __db_extentsize_reply reply; /* must be static */
-
-	__db_extentsize_1_proc(req->dbpcl_id,
-	    req->extentsize,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_flags_reply *
-__db_db_flags_1(req)
-	__db_flags_msg *req;
-{
-	static __db_flags_reply reply; /* must be static */
-
-	__db_flags_1_proc(req->dbpcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_get_reply *
-__db_db_get_1(req)
-	__db_get_msg *req;
-{
-	static __db_get_reply reply; /* must be static */
-	static int __db_get_free = 0; /* must be static */
-
-	if (__db_get_free)
-		xdr_free((xdrproc_t)xdr___db_get_reply, (void *)&reply);
-	__db_get_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-	reply.datadata.datadata_val = NULL;
-
-	__db_get_1_proc(req->dbpcl_id,
-	    req->txnpcl_id,
-	    req->keydlen,
-	    req->keydoff,
-	    req->keyflags,
-	    req->keydata.keydata_val,
-	    req->keydata.keydata_len,
-	    req->datadlen,
-	    req->datadoff,
-	    req->dataflags,
-	    req->datadata.datadata_val,
-	    req->datadata.datadata_len,
-	    req->flags,
-	    &reply,
-	    &__db_get_free);
-	return (&reply);
-}
-
-__db_h_ffactor_reply *
-__db_db_h_ffactor_1(req)
-	__db_h_ffactor_msg *req;
-{
-	static __db_h_ffactor_reply reply; /* must be static */
-
-	__db_h_ffactor_1_proc(req->dbpcl_id,
-	    req->ffactor,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_h_nelem_reply *
-__db_db_h_nelem_1(req)
-	__db_h_nelem_msg *req;
-{
-	static __db_h_nelem_reply reply; /* must be static */
-
-	__db_h_nelem_1_proc(req->dbpcl_id,
-	    req->nelem,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_key_range_reply *
-__db_db_key_range_1(req)
-	__db_key_range_msg *req;
-{
-	static __db_key_range_reply reply; /* must be static */
-
-	__db_key_range_1_proc(req->dbpcl_id,
-	    req->txnpcl_id,
-	    req->keydlen,
-	    req->keydoff,
-	    req->keyflags,
-	    req->keydata.keydata_val,
-	    req->keydata.keydata_len,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_lorder_reply *
-__db_db_lorder_1(req)
-	__db_lorder_msg *req;
-{
-	static __db_lorder_reply reply; /* must be static */
-
-	__db_lorder_1_proc(req->dbpcl_id,
-	    req->lorder,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_open_reply *
-__db_db_open_1(req)
-	__db_open_msg *req;
-{
-	static __db_open_reply reply; /* must be static */
-
-	__db_open_1_proc(req->dbpcl_id,
-	    (*req->name == '\0') ? NULL : req->name,
-	    (*req->subdb == '\0') ? NULL : req->subdb,
-	    req->type,
-	    req->flags,
-	    req->mode,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_pagesize_reply *
-__db_db_pagesize_1(req)
-	__db_pagesize_msg *req;
-{
-	static __db_pagesize_reply reply; /* must be static */
-
-	__db_pagesize_1_proc(req->dbpcl_id,
-	    req->pagesize,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_put_reply *
-__db_db_put_1(req)
-	__db_put_msg *req;
-{
-	static __db_put_reply reply; /* must be static */
-	static int __db_put_free = 0; /* must be static */
-
-	if (__db_put_free)
-		xdr_free((xdrproc_t)xdr___db_put_reply, (void *)&reply);
-	__db_put_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-
-	__db_put_1_proc(req->dbpcl_id,
-	    req->txnpcl_id,
-	    req->keydlen,
-	    req->keydoff,
-	    req->keyflags,
-	    req->keydata.keydata_val,
-	    req->keydata.keydata_len,
-	    req->datadlen,
-	    req->datadoff,
-	    req->dataflags,
-	    req->datadata.datadata_val,
-	    req->datadata.datadata_len,
-	    req->flags,
-	    &reply,
-	    &__db_put_free);
-	return (&reply);
-}
-
-__db_re_delim_reply *
-__db_db_re_delim_1(req)
-	__db_re_delim_msg *req;
-{
-	static __db_re_delim_reply reply; /* must be static */
-
-	__db_re_delim_1_proc(req->dbpcl_id,
-	    req->delim,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_re_len_reply *
-__db_db_re_len_1(req)
-	__db_re_len_msg *req;
-{
-	static __db_re_len_reply reply; /* must be static */
-
-	__db_re_len_1_proc(req->dbpcl_id,
-	    req->len,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_re_pad_reply *
-__db_db_re_pad_1(req)
-	__db_re_pad_msg *req;
-{
-	static __db_re_pad_reply reply; /* must be static */
-
-	__db_re_pad_1_proc(req->dbpcl_id,
-	    req->pad,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_remove_reply *
-__db_db_remove_1(req)
-	__db_remove_msg *req;
-{
-	static __db_remove_reply reply; /* must be static */
-
-	__db_remove_1_proc(req->dbpcl_id,
-	    (*req->name == '\0') ? NULL : req->name,
-	    (*req->subdb == '\0') ? NULL : req->subdb,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_rename_reply *
-__db_db_rename_1(req)
-	__db_rename_msg *req;
-{
-	static __db_rename_reply reply; /* must be static */
-
-	__db_rename_1_proc(req->dbpcl_id,
-	    (*req->name == '\0') ? NULL : req->name,
-	    (*req->subdb == '\0') ? NULL : req->subdb,
-	    (*req->newname == '\0') ? NULL : req->newname,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_stat_reply *
-__db_db_stat_1(req)
-	__db_stat_msg *req;
-{
-	static __db_stat_reply reply; /* must be static */
-	static int __db_stat_free = 0; /* must be static */
-
-	if (__db_stat_free)
-		xdr_free((xdrproc_t)xdr___db_stat_reply, (void *)&reply);
-	__db_stat_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.statslist = NULL;
-
-	__db_stat_1_proc(req->dbpcl_id,
-	    req->flags,
-	    &reply,
-	    &__db_stat_free);
-	return (&reply);
-}
-
-__db_swapped_reply *
-__db_db_swapped_1(req)
-	__db_swapped_msg *req;
-{
-	static __db_swapped_reply reply; /* must be static */
-
-	__db_swapped_1_proc(req->dbpcl_id,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_sync_reply *
-__db_db_sync_1(req)
-	__db_sync_msg *req;
-{
-	static __db_sync_reply reply; /* must be static */
-
-	__db_sync_1_proc(req->dbpcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__db_cursor_reply *
-__db_db_cursor_1(req)
-	__db_cursor_msg *req;
-{
-	static __db_cursor_reply reply; /* must be static */
-
-	__db_cursor_1_proc(req->dbpcl_id,
-	    req->txnpcl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-int __db_db_join_curslist __P((__db_join_curslist *, u_int32_t **));
-void __db_db_join_cursfree __P((u_int32_t *));
-
-__db_join_reply *
-__db_db_join_1(req)
-	__db_join_msg *req;
-{
-	u_int32_t *__db_curslist;
-	int ret;
-	static __db_join_reply reply; /* must be static */
-
-	if ((ret = __db_db_join_curslist(req->curslist, &__db_curslist)) != 0)
-		goto out;
-
-	__db_join_1_proc(req->dbpcl_id,
-	    __db_curslist,
-	    req->flags,
-	    &reply);
-
-	__db_db_join_cursfree(__db_curslist);
-
-out:
-	return (&reply);
-}
-
-int
-__db_db_join_curslist(locp, ppp)
-	__db_join_curslist *locp;
-	u_int32_t **ppp;
-{
-	u_int32_t *pp;
-	int cnt, ret, size;
-	__db_join_curslist *nl;
-
-	for (cnt = 0, nl = locp; nl != NULL; cnt++, nl = nl->next)
-		;
-
-	if (cnt == 0) {
-		*ppp = NULL;
-		return (0);
-	}
-	size = sizeof(*pp) * (cnt + 1);
-	if ((ret = __os_malloc(NULL, size, NULL, ppp)) != 0)
-		return (ret);
-	memset(*ppp, 0, size);
-	for (pp = *ppp, nl = locp; nl != NULL; nl = nl->next, pp++) {
-		*pp = *(u_int32_t *)nl->ent.ent_val;
-	}
-	return (0);
-}
-
-void
-__db_db_join_cursfree(pp)
-	u_int32_t *pp;
-{
-	size_t size;
-	u_int32_t *p;
-
-	if (pp == NULL)
-		return;
-	size = sizeof(*p);
-	for (p = pp; *p != 0; p++) {
-		size += sizeof(*p);
-	}
-	__os_free(pp, size);
-}
-
-__dbc_close_reply *
-__db_dbc_close_1(req)
-	__dbc_close_msg *req;
-{
-	static __dbc_close_reply reply; /* must be static */
-
-	__dbc_close_1_proc(req->dbccl_id,
-	    &reply);
-
-	return (&reply);
-}
-
-__dbc_count_reply *
-__db_dbc_count_1(req)
-	__dbc_count_msg *req;
-{
-	static __dbc_count_reply reply; /* must be static */
-
-	__dbc_count_1_proc(req->dbccl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__dbc_del_reply *
-__db_dbc_del_1(req)
-	__dbc_del_msg *req;
-{
-	static __dbc_del_reply reply; /* must be static */
-
-	__dbc_del_1_proc(req->dbccl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__dbc_dup_reply *
-__db_dbc_dup_1(req)
-	__dbc_dup_msg *req;
-{
-	static __dbc_dup_reply reply; /* must be static */
-
-	__dbc_dup_1_proc(req->dbccl_id,
-	    req->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-__dbc_get_reply *
-__db_dbc_get_1(req)
-	__dbc_get_msg *req;
-{
-	static __dbc_get_reply reply; /* must be static */
-	static int __dbc_get_free = 0; /* must be static */
-
-	if (__dbc_get_free)
-		xdr_free((xdrproc_t)xdr___dbc_get_reply, (void *)&reply);
-	__dbc_get_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-	reply.datadata.datadata_val = NULL;
-
-	__dbc_get_1_proc(req->dbccl_id,
-	    req->keydlen,
-	    req->keydoff,
-	    req->keyflags,
-	    req->keydata.keydata_val,
-	    req->keydata.keydata_len,
-	    req->datadlen,
-	    req->datadoff,
-	    req->dataflags,
-	    req->datadata.datadata_val,
-	    req->datadata.datadata_len,
-	    req->flags,
-	    &reply,
-	    &__dbc_get_free);
-	return (&reply);
-}
-
-__dbc_put_reply *
-__db_dbc_put_1(req)
-	__dbc_put_msg *req;
-{
-	static __dbc_put_reply reply; /* must be static */
-	static int __dbc_put_free = 0; /* must be static */
-
-	if (__dbc_put_free)
-		xdr_free((xdrproc_t)xdr___dbc_put_reply, (void *)&reply);
-	__dbc_put_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-
-	__dbc_put_1_proc(req->dbccl_id,
-	    req->keydlen,
-	    req->keydoff,
-	    req->keyflags,
-	    req->keydata.keydata_val,
-	    req->keydata.keydata_len,
-	    req->datadlen,
-	    req->datadoff,
-	    req->dataflags,
-	    req->datadata.datadata_val,
-	    req->datadata.datadata_len,
-	    req->flags,
-	    &reply,
-	    &__dbc_put_free);
-	return (&reply);
-}
-
diff --git a/db/rpc_server/java/AssociateCallbacks.java b/db/rpc_server/java/AssociateCallbacks.java
deleted file mode 100644
index 4e8e24d51..000000000
--- a/db/rpc_server/java/AssociateCallbacks.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: AssociateCallbacks.java,v 1.3 2004/04/06 20:43:41 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-
-/** Implementations of the callbacks required by the Tcl test suite. **/
-class AssociateCallbacks {
-    /*
-     * Tcl passes one of these special flags for the callbacks used in the
-     * test suite.  Note: these must match db_int.in!
-     */
-    static final int DB_RPC2ND_REVERSEDATA = 0x00100000;
-    static final int DB_RPC2ND_NOOP = 0x00200000;
-    static final int DB_RPC2ND_CONCATKEYDATA = 0x00300000;
-    static final int DB_RPC2ND_CONCATDATAKEY = 0x00400000;
-    static final int DB_RPC2ND_REVERSECONCAT = 0x00500000;
-    static final int DB_RPC2ND_TRUNCDATA = 0x00600000;
-    static final int DB_RPC2ND_CONSTANT = 0x00700000;
-    static final int DB_RPC2ND_GETZIP = 0x00800000;
-    static final int DB_RPC2ND_GETNAME = 0x00900000;
-
-    static final int DB_RPC2ND_MASK = 0x00f00000;
-
-    static SecondaryKeyCreator getCallback(int flags) {
-        switch(flags & DB_RPC2ND_MASK) {
-        case 0:
-            return null;
-
-        case DB_RPC2ND_REVERSEDATA:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    byte[] dataBuf = data.getData();
-                    int dataSize = data.getSize();
-                    byte[] buf = new byte[dataSize];
-                    for (int i = 0; i < dataSize; i++)
-                        buf[dataSize - 1 - i] = dataBuf[i];
-                    result.setData(buf);
-                    result.setSize(buf.length);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_NOOP:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    result.setData(data.getData());
-                    result.setSize(data.getSize());
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_CONCATKEYDATA:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    byte[] buf = new byte[key.getSize() +
-                                          data.getSize()];
-                    System.arraycopy(key.getData(), 0,
-                                     buf, 0,
-                                     key.getSize());
-                    System.arraycopy(data.getData(), 0,
-                                     buf, key.getSize(),
-                                     data.getSize());
-                    result.setData(buf);
-                    result.setSize(buf.length);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_CONCATDATAKEY:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    byte[] buf = new byte[key.getSize() +
-                                          data.getSize()];
-                    System.arraycopy(data.getData(), 0,
-                                     buf, 0,
-                                     data.getSize());
-                    System.arraycopy(key.getData(), 0,
-                                     buf, data.getSize(),
-                                     key.getSize());
-                    result.setData(buf);
-                    result.setSize(buf.length);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_REVERSECONCAT:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    byte[] keyBuf = key.getData();
-                    int keySize = key.getSize();
-                    byte[] dataBuf = data.getData();
-                    int dataSize = data.getSize();
-                    byte[] buf = new byte[keySize + dataSize];
-                    for (int i = 0; i < keySize; i++)
-                        buf[buf.length - 1 - i] = keyBuf[i];
-                    for (int i = 0; i < dataSize; i++)
-                        buf[dataSize - 1 - i] = dataBuf[i];
-                    result.setData(buf);
-                    result.setSize(buf.length);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_TRUNCDATA:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    result.setData(data.getData());
-                    result.setOffset(1);
-                    result.setSize(data.getSize() - 1);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_CONSTANT:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    byte[] buf = "constant data".getBytes();
-                    result.setData(buf);
-                    result.setSize(buf.length);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_GETZIP:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    result.setData(data.getData());
-                    result.setSize(5);
-                    return true;
-                }
-            };
-
-        case DB_RPC2ND_GETNAME:
-            return new SecondaryKeyCreator() {
-                public boolean createSecondaryKey(SecondaryDatabase secondary,
-                                                  DatabaseEntry key, DatabaseEntry data, DatabaseEntry result)
-                    throws DatabaseException {
-                    result.setData(data.getData());
-                    result.setOffset(5);
-                    result.setSize(data.getSize() - 5);
-                    return true;
-                }
-            };
-
-        default:
-            Server.err.println("Warning: Java RPC server doesn't implement callback: " + (flags & DB_RPC2ND_MASK));
-            return null;
-        }
-    }
-
-    // Utility classes should not have a public or default constructor
-    protected AssociateCallbacks() {
-    }
-}
diff --git a/db/rpc_server/java/Dispatcher.java b/db/rpc_server/java/Dispatcher.java
deleted file mode 100644
index 618cb9295..000000000
--- a/db/rpc_server/java/Dispatcher.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: Dispatcher.java,v 1.1 2004/04/06 20:43:41 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-import java.io.IOException;
-import org.acplt.oncrpc.OncRpcException;
-
-/**
- * Dispatcher for RPC messages for the Java RPC server.
- * These are hooks that translate between RPC msg/reply structures and
- * DB calls, which keeps the real implementation code in Rpc* classes cleaner.
- */
-public abstract class Dispatcher extends ServerStubs {
-    abstract int addEnv(RpcDbEnv rdbenv);
-    abstract int addDatabase(RpcDb rdb);
-    abstract int addTxn(RpcDbTxn rtxn);
-    abstract int addCursor(RpcDbc rdbc);
-    abstract void delEnv(RpcDbEnv rdbenv, boolean dispose);
-    abstract void delDatabase(RpcDb rdb, boolean dispose);
-    abstract void delTxn(RpcDbTxn rtxn, boolean dispose);
-    abstract void delCursor(RpcDbc rdbc, boolean dispose);
-    abstract RpcDbEnv getEnv(int envid);
-    abstract RpcDb getDatabase(int dbid);
-    abstract RpcDbTxn getTxn(int txnbid);
-    abstract RpcDbc getCursor(int dbcid);
-
-    public Dispatcher() throws IOException, OncRpcException {
-        super();
-    }
-
-    //// Database methods
-
-    public  __db_associate_reply __DB_db_associate_4003(__db_associate_msg args) {
-        __db_associate_reply reply = new __db_associate_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.associate(this, args, reply);
-        return reply;
-    }
-
-    public  __db_bt_maxkey_reply __DB_db_bt_maxkey_4003(__db_bt_maxkey_msg args) {
-        __db_bt_maxkey_reply reply = new __db_bt_maxkey_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_bt_maxkey(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_bt_minkey_reply __DB_db_get_bt_minkey_4003(__db_get_bt_minkey_msg args) {
-        __db_get_bt_minkey_reply reply = new __db_get_bt_minkey_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_bt_minkey(this, args, reply);
-        return reply;
-    }
-
-    public  __db_bt_minkey_reply __DB_db_bt_minkey_4003(__db_bt_minkey_msg args) {
-        __db_bt_minkey_reply reply = new __db_bt_minkey_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_bt_minkey(this, args, reply);
-        return reply;
-    }
-
-    public  __db_close_reply __DB_db_close_4003(__db_close_msg args)  {
-        __db_close_reply reply = new __db_close_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.close(this, args, reply);
-        return reply;
-    }
-
-    public  __db_create_reply __DB_db_create_4003(__db_create_msg args) {
-        __db_create_reply reply = new __db_create_reply();
-        RpcDb rdb = new RpcDb(getEnv(args.dbenvcl_id));
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.create(this, args, reply);
-        return reply;
-    }
-
-    public  __db_cursor_reply __DB_db_cursor_4003(__db_cursor_msg args) {
-        __db_cursor_reply reply = new __db_cursor_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.cursor(this, args, reply);
-        return reply;
-    }
-
-    public  __db_del_reply __DB_db_del_4003(__db_del_msg args) {
-        __db_del_reply reply = new __db_del_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.del(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_encrypt_flags_reply __DB_db_get_encrypt_flags_4003(__db_get_encrypt_flags_msg args) {
-        __db_get_encrypt_flags_reply reply = new __db_get_encrypt_flags_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_encrypt_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __db_encrypt_reply __DB_db_encrypt_4003(__db_encrypt_msg args) {
-        __db_encrypt_reply reply = new __db_encrypt_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_encrypt(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_extentsize_reply __DB_db_get_extentsize_4003(__db_get_extentsize_msg args) {
-        __db_get_extentsize_reply reply = new __db_get_extentsize_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_q_extentsize(this, args, reply);
-        return reply;
-    }
-
-    public  __db_extentsize_reply __DB_db_extentsize_4003(__db_extentsize_msg args) {
-        __db_extentsize_reply reply = new __db_extentsize_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_q_extentsize(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_flags_reply __DB_db_get_flags_4003(__db_get_flags_msg args) {
-        __db_get_flags_reply reply = new __db_get_flags_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __db_flags_reply __DB_db_flags_4003(__db_flags_msg args) {
-        __db_flags_reply reply = new __db_flags_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __db_get_reply __DB_db_get_4003(__db_get_msg args) {
-        __db_get_reply reply = new __db_get_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_h_ffactor_reply __DB_db_get_h_ffactor_4003(__db_get_h_ffactor_msg args) {
-        __db_get_h_ffactor_reply reply = new __db_get_h_ffactor_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_h_ffactor(this, args, reply);
-        return reply;
-    }
-
-    public  __db_h_ffactor_reply __DB_db_h_ffactor_4003(__db_h_ffactor_msg args) {
-        __db_h_ffactor_reply reply = new __db_h_ffactor_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_h_ffactor(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_h_nelem_reply __DB_db_get_h_nelem_4003(__db_get_h_nelem_msg args) {
-        __db_get_h_nelem_reply reply = new __db_get_h_nelem_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_h_nelem(this, args, reply);
-        return reply;
-    }
-
-    public  __db_h_nelem_reply __DB_db_h_nelem_4003(__db_h_nelem_msg args) {
-        __db_h_nelem_reply reply = new __db_h_nelem_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_h_nelem(this, args, reply);
-        return reply;
-    }
-
-    public  __db_join_reply __DB_db_join_4003(__db_join_msg args) {
-        __db_join_reply reply = new __db_join_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.join(this, args, reply);
-        return reply;
-    }
-
-    public  __db_key_range_reply __DB_db_key_range_4003(__db_key_range_msg args) {
-        __db_key_range_reply reply = new __db_key_range_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.key_range(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_lorder_reply __DB_db_get_lorder_4003(__db_get_lorder_msg args) {
-        __db_get_lorder_reply reply = new __db_get_lorder_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_lorder(this, args, reply);
-        return reply;
-    }
-
-    public  __db_lorder_reply __DB_db_lorder_4003(__db_lorder_msg args) {
-        __db_lorder_reply reply = new __db_lorder_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_lorder(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_name_reply __DB_db_get_name_4003(__db_get_name_msg args) {
-        __db_get_name_reply reply = new __db_get_name_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_name(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_open_flags_reply __DB_db_get_open_flags_4003(__db_get_open_flags_msg args) {
-        __db_get_open_flags_reply reply = new __db_get_open_flags_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_open_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __db_open_reply __DB_db_open_4003(__db_open_msg args) {
-        __db_open_reply reply = new __db_open_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.open(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_pagesize_reply __DB_db_get_pagesize_4003(__db_get_pagesize_msg args) {
-        __db_get_pagesize_reply reply = new __db_get_pagesize_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_pagesize(this, args, reply);
-        return reply;
-    }
-
-    public  __db_pagesize_reply __DB_db_pagesize_4003(__db_pagesize_msg args) {
-        __db_pagesize_reply reply = new __db_pagesize_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_pagesize(this, args, reply);
-        return reply;
-    }
-
-    public  __db_pget_reply __DB_db_pget_4003(__db_pget_msg args) {
-        __db_pget_reply reply = new __db_pget_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.pget(this, args, reply);
-        return reply;
-    }
-
-    public  __db_put_reply __DB_db_put_4003(__db_put_msg args) {
-        __db_put_reply reply = new __db_put_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.put(this, args, reply);
-        return reply;
-    }
-
-    public  __db_remove_reply __DB_db_remove_4003(__db_remove_msg args) {
-        __db_remove_reply reply = new __db_remove_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.remove(this, args, reply);
-        return reply;
-    }
-
-    public  __db_rename_reply __DB_db_rename_4003(__db_rename_msg args) {
-        __db_rename_reply reply = new __db_rename_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.rename(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_re_delim_reply __DB_db_get_re_delim_4003(__db_get_re_delim_msg args) {
-        __db_get_re_delim_reply reply = new __db_get_re_delim_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_re_delim(this, args, reply);
-        return reply;
-    }
-
-    public  __db_re_delim_reply __DB_db_re_delim_4003(__db_re_delim_msg args) {
-        __db_re_delim_reply reply = new __db_re_delim_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_re_delim(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_re_len_reply __DB_db_get_re_len_4003(__db_get_re_len_msg args) {
-        __db_get_re_len_reply reply = new __db_get_re_len_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_re_len(this, args, reply);
-        return reply;
-    }
-
-    public  __db_re_len_reply __DB_db_re_len_4003(__db_re_len_msg args) {
-        __db_re_len_reply reply = new __db_re_len_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_re_len(this, args, reply);
-        return reply;
-    }
-
-    public __db_get_re_pad_reply __DB_db_get_re_pad_4003(__db_get_re_pad_msg args) {
-        __db_get_re_pad_reply reply = new __db_get_re_pad_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.get_re_pad(this, args, reply);
-        return reply;
-    }
-
-    public  __db_re_pad_reply __DB_db_re_pad_4003(__db_re_pad_msg args) {
-        __db_re_pad_reply reply = new __db_re_pad_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.set_re_pad(this, args, reply);
-        return reply;
-    }
-
-    public  __db_stat_reply __DB_db_stat_4003(__db_stat_msg args) {
-        __db_stat_reply reply = new __db_stat_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.stat(this, args, reply);
-        return reply;
-    }
-
-    public  __db_sync_reply __DB_db_sync_4003(__db_sync_msg args) {
-        __db_sync_reply reply = new __db_sync_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.sync(this, args, reply);
-        return reply;
-    }
-
-    public  __db_truncate_reply __DB_db_truncate_4003(__db_truncate_msg args) {
-        __db_truncate_reply reply = new __db_truncate_reply();
-        RpcDb rdb = getDatabase(args.dbpcl_id);
-        if (rdb == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdb.truncate(this, args, reply);
-        return reply;
-    }
-
-    //// Cursor methods
-
-    public  __dbc_close_reply __DB_dbc_close_4003(__dbc_close_msg args) {
-        __dbc_close_reply reply = new __dbc_close_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.close(this, args, reply);
-        return reply;
-    }
-
-    public  __dbc_count_reply __DB_dbc_count_4003(__dbc_count_msg args) {
-        __dbc_count_reply reply = new __dbc_count_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.count(this, args, reply);
-        return reply;
-    }
-
-    public  __dbc_del_reply __DB_dbc_del_4003(__dbc_del_msg args) {
-        __dbc_del_reply reply = new __dbc_del_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.del(this, args, reply);
-        return reply;
-    }
-
-    public  __dbc_dup_reply __DB_dbc_dup_4003(__dbc_dup_msg args) {
-        __dbc_dup_reply reply = new __dbc_dup_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.dup(this, args, reply);
-        return reply;
-    }
-
-    public  __dbc_get_reply __DB_dbc_get_4003(__dbc_get_msg args) {
-        __dbc_get_reply reply = new __dbc_get_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.get(this, args, reply);
-        return reply;
-    }
-
-    public  __dbc_pget_reply __DB_dbc_pget_4003(__dbc_pget_msg args) {
-        __dbc_pget_reply reply = new __dbc_pget_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.pget(this, args, reply);
-        return reply;
-    }
-
-    public  __dbc_put_reply __DB_dbc_put_4003(__dbc_put_msg args) {
-        __dbc_put_reply reply = new __dbc_put_reply();
-        RpcDbc rdbc = getCursor(args.dbccl_id);
-        if (rdbc == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbc.put(this, args, reply);
-        return reply;
-    }
-
-    //// Environment methods
-
-    public __env_get_cachesize_reply __DB_env_get_cachesize_4003(__env_get_cachesize_msg args) {
-        __env_get_cachesize_reply reply = new __env_get_cachesize_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.get_cachesize(this, args, reply);
-        return reply;
-    }
-
-    public  __env_cachesize_reply __DB_env_cachesize_4003(__env_cachesize_msg args) {
-        __env_cachesize_reply reply = new __env_cachesize_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.set_cachesize(this, args, reply);
-        return reply;
-    }
-
-    public  __env_close_reply __DB_env_close_4003(__env_close_msg args) {
-        __env_close_reply reply = new __env_close_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.close(this, args, reply);
-        return reply;
-    }
-
-    public  __env_create_reply __DB_env_create_4003(__env_create_msg args) {
-        __env_create_reply reply = new __env_create_reply();
-        RpcDbEnv rdbenv = new RpcDbEnv();
-        rdbenv.create(this, args, reply);
-        return reply;
-    }
-
-    public  __env_dbremove_reply __DB_env_dbremove_4003(__env_dbremove_msg args) {
-        __env_dbremove_reply reply = new __env_dbremove_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.dbremove(this, args, reply);
-        return reply;
-    }
-
-    public  __env_dbrename_reply __DB_env_dbrename_4003(__env_dbrename_msg args) {
-        __env_dbrename_reply reply = new __env_dbrename_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.dbrename(this, args, reply);
-        return reply;
-    }
-
-    public __env_get_encrypt_flags_reply __DB_env_get_encrypt_flags_4003(__env_get_encrypt_flags_msg args) {
-        __env_get_encrypt_flags_reply reply = new __env_get_encrypt_flags_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.get_encrypt_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __env_encrypt_reply __DB_env_encrypt_4003(__env_encrypt_msg args) {
-        __env_encrypt_reply reply = new __env_encrypt_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.set_encrypt(this, args, reply);
-        return reply;
-    }
-
-    public __env_get_flags_reply __DB_env_get_flags_4003(__env_get_flags_msg args) {
-        __env_get_flags_reply reply = new __env_get_flags_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.get_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __env_flags_reply __DB_env_flags_4003(__env_flags_msg args) {
-        __env_flags_reply reply = new __env_flags_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.set_flags(this, args, reply);
-        return reply;
-    }
-
-    public __env_get_home_reply __DB_env_get_home_4003(__env_get_home_msg args) {
-        __env_get_home_reply reply = new __env_get_home_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.get_home(this, args, reply);
-        return reply;
-    }
-
-    public __env_get_open_flags_reply __DB_env_get_open_flags_4003(__env_get_open_flags_msg args) {
-        __env_get_open_flags_reply reply = new __env_get_open_flags_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.get_open_flags(this, args, reply);
-        return reply;
-    }
-
-    public  __env_open_reply __DB_env_open_4003(__env_open_msg args) {
-        __env_open_reply reply = new __env_open_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.open(this, args, reply);
-        return reply;
-    }
-
-    public  __env_remove_reply __DB_env_remove_4003(__env_remove_msg args) {
-        __env_remove_reply reply = new __env_remove_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.remove(this, args, reply);
-        return reply;
-    }
-
-    //// Transaction methods
-
-    public  __txn_abort_reply __DB_txn_abort_4003(__txn_abort_msg args) {
-        __txn_abort_reply reply = new __txn_abort_reply();
-        RpcDbTxn rdbtxn = getTxn(args.txnpcl_id);
-        if (rdbtxn == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbtxn.abort(this, args, reply);
-        return reply;
-    }
-
-    public  __txn_begin_reply __DB_txn_begin_4003(__txn_begin_msg args) {
-        __txn_begin_reply reply = new __txn_begin_reply();
-        RpcDbTxn rdbtxn = new RpcDbTxn(getEnv(args.dbenvcl_id), null);
-        rdbtxn.begin(this, args, reply);
-        return reply;
-    }
-
-    public  __txn_commit_reply __DB_txn_commit_4003(__txn_commit_msg args) {
-        __txn_commit_reply reply = new __txn_commit_reply();
-        RpcDbTxn rdbtxn = getTxn(args.txnpcl_id);
-        if (rdbtxn == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbtxn.commit(this, args, reply);
-        return reply;
-    }
-
-    public  __txn_discard_reply __DB_txn_discard_4003(__txn_discard_msg args) {
-        __txn_discard_reply reply = new __txn_discard_reply();
-        RpcDbTxn rdbtxn = getTxn(args.txnpcl_id);
-        if (rdbtxn == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbtxn.discard(this, args, reply);
-        return reply;
-    }
-
-    public  __txn_prepare_reply __DB_txn_prepare_4003(__txn_prepare_msg args) {
-        __txn_prepare_reply reply = new __txn_prepare_reply();
-        RpcDbTxn rdbtxn = getTxn(args.txnpcl_id);
-        if (rdbtxn == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbtxn.prepare(this, args, reply);
-        return reply;
-    }
-
-    public  __txn_recover_reply __DB_txn_recover_4003(__txn_recover_msg args) {
-        __txn_recover_reply reply = new __txn_recover_reply();
-        RpcDbEnv rdbenv = getEnv(args.dbenvcl_id);
-        if (rdbenv == null)
-            reply.status = DbConstants.DB_NOSERVER_ID;
-        else
-            rdbenv.txn_recover(this, args, reply);
-        return reply;
-    }
-}
diff --git a/db/rpc_server/java/FreeList.java b/db/rpc_server/java/FreeList.java
deleted file mode 100644
index bec2b8772..000000000
--- a/db/rpc_server/java/FreeList.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: FreeList.java,v 1.7 2004/04/06 20:43:41 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import java.util.*;
-
-/**
- * Keep track of a list of objects by id with a free list.
- * Intentionally package-protected exposure.
- */
-class FreeList {
-    class FreeIndex {
-        int index;
-        FreeIndex(int index) { this.index = index; }
-        int getIndex() { return index; }
-    }
-
-    Vector items = new Vector();
-    FreeIndex free_head = null;
-
-    public synchronized int add(Object obj) {
-        int pos;
-        if (free_head == null) {
-            pos = items.size();
-            items.addElement(obj);
-            if (pos + 1 % 1000 == 0)
-                Server.err.println(this + " grew to size " + (pos + 1));
-        } else {
-            pos = free_head.getIndex();
-            free_head = (FreeIndex)items.elementAt(pos);
-            items.setElementAt(obj, pos);
-        }
-        return pos;
-    }
-
-    public synchronized void del(int pos) {
-        Object obj = items.elementAt(pos);
-        if (obj != null && obj instanceof FreeIndex)
-            throw new NoSuchElementException("index " + pos + " has already been freed");
-        items.setElementAt(free_head, pos);
-        free_head = new FreeIndex(pos);
-    }
-
-    public void del(Object obj) {
-        del(items.indexOf(obj));
-    }
-
-    public Object get(int pos) {
-        Object obj = items.elementAt(pos);
-        if (obj instanceof FreeIndex)
-            obj = null;
-        return obj;
-    }
-
-    public LocalIterator iterator() {
-        return new FreeListIterator();
-    }
-
-    /**
-     * Iterator for a FreeList.  Note that this class doesn't implement
-     * java.util.Iterator to maintain compatibility with Java 1.1
-     * Intentionally package-protected exposure.
-     */
-    class FreeListIterator implements LocalIterator {
-        int current;
-
-        FreeListIterator() { current = findNext(-1); }
-
-        private int findNext(int start) {
-            int next = start;
-            while (++next < items.size()) {
-                Object obj = items.elementAt(next);
-                if (obj == null || !(obj instanceof FreeIndex))
-                    break;
-            }
-            return next;
-        }
-
-        public boolean hasNext() {
-            return (findNext(current) < items.size());
-        }
-
-        public Object next() {
-            current = findNext(current);
-            if (current == items.size())
-                throw new NoSuchElementException("enumerated past end of FreeList");
-            return items.elementAt(current);
-        }
-
-        public void remove() {
-            del(current);
-        }
-    }
-}
diff --git a/db/rpc_server/java/JoinCursorAdapter.java b/db/rpc_server/java/JoinCursorAdapter.java
deleted file mode 100644
index 78495f28f..000000000
--- a/db/rpc_server/java/JoinCursorAdapter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: JoinCursorAdapter.java,v 1.1 2004/04/06 20:43:41 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-
-class JoinCursorAdapter extends Cursor {
-    JoinCursor jc;
-
-    JoinCursorAdapter(Database database, JoinCursor jc)
-        throws DatabaseException {
-        this.database = database;
-        this.config = new CursorConfig();
-        this.jc = jc;
-    }
-
-    public synchronized void close()
-        throws DatabaseException {
-        jc.close();
-    }
-
-    public Cursor dup(boolean samePosition)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public int count()
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus delete()
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getCurrent(DatabaseEntry key,
-                                      DatabaseEntry data,
-                                      LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getFirst(DatabaseEntry key,
-                                    DatabaseEntry data,
-                                    LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getLast(DatabaseEntry key,
-                                   DatabaseEntry data,
-                                   LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getNext(DatabaseEntry key,
-                                   DatabaseEntry data,
-                                   LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getNextDup(DatabaseEntry key,
-                                      DatabaseEntry data,
-                                      LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getNextNoDup(DatabaseEntry key,
-                                        DatabaseEntry data,
-                                        LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getPrev(DatabaseEntry key,
-                                   DatabaseEntry data,
-                                   LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getPrevDup(DatabaseEntry key,
-                                      DatabaseEntry data,
-                                      LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getPrevNoDup(DatabaseEntry key,
-                                        DatabaseEntry data,
-                                        LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getRecordNumber(DatabaseEntry recno,
-                                           LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getSearchKey(DatabaseEntry key,
-                                        DatabaseEntry data,
-                                        LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getSearchKeyRange(DatabaseEntry key,
-                                             DatabaseEntry data,
-                                             LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getSearchBoth(DatabaseEntry key,
-                                         DatabaseEntry data,
-                                         LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus getSearchBothRange(DatabaseEntry key,
-                                              DatabaseEntry data,
-                                              LockMode lockMode)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus put(DatabaseEntry key, DatabaseEntry data)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus putNoOverwrite(DatabaseEntry key, DatabaseEntry data)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus putKeyFirst(DatabaseEntry key, DatabaseEntry data)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus putKeyLast(DatabaseEntry key, DatabaseEntry data)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus putNoDupData(DatabaseEntry key, DatabaseEntry data)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-
-    public OperationStatus putCurrent(DatabaseEntry data)
-        throws DatabaseException {
-        throw new UnsupportedOperationException("not supported on join cursors");
-    }
-}
diff --git a/db/rpc_server/java/LocalIterator.java b/db/rpc_server/java/LocalIterator.java
deleted file mode 100644
index f142eb318..000000000
--- a/db/rpc_server/java/LocalIterator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: LocalIterator.java,v 1.5 2004/04/06 20:43:41 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import java.util.*;
-
-/**
- * Iterator interface.  Note that this matches java.util.Iterator
- * but maintains compatibility with Java 1.1
- * Intentionally package-protected exposure.
- */
-interface LocalIterator {
-    boolean hasNext();
-    Object next();
-    void remove();
-}
diff --git a/db/rpc_server/java/README b/db/rpc_server/java/README
deleted file mode 100644
index f29c87805..000000000
--- a/db/rpc_server/java/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Berkeley DB Java RPC server.
-
-Copyright (c) 2002-2004
-	Sleepycat Software.  All rights reserved.
-
-The Java implementation of the Berkeley DB RPC server is intended
-primarily for testing purposes.  It provides the same interface
-as the C and C++ RPC servers, but is implemented via the Java API
-rather than the C or C++ APIs.  This allows the existing Tcl test
-suite to exercise the Java API without modification.
-
-The Java RPC server relies on a Java version of rpcgen to
-automatically generate appropriate Java classes from the RPC
-interface specification (../db_server.x).  We use jrpcgen, which
-is part of the Remote Tea for Java project:
-  acplt.plt.rwth-aachen.de/ks/english/remotetea.html
-
-To rebuild the Java stubs from db_server.x, you will need to
-download the full Remote Tea package, but if you just want to
-compile the Java sources and run the Java RPC server, the runtime
-component of Remote Tea is included in oncrpc.jar.  Building
-the Java RPC server is automatic when Berkeley DB is configured
-with the both --enable-rpc and --enable-java.
-
-All of the Remote Tea project is licensed under the Library GNU
-Public License, and we have made no modifications to their
-released code.
diff --git a/db/rpc_server/java/RpcDb.java b/db/rpc_server/java/RpcDb.java
deleted file mode 100644
index bcdb861e3..000000000
--- a/db/rpc_server/java/RpcDb.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: RpcDb.java,v 1.24 2004/11/05 00:42:40 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-import java.io.*;
-import java.util.*;
-
-/**
- * RPC wrapper around a db object for the Java RPC server.
- */
-public class RpcDb extends Timer {
-    static final byte[] empty = new byte[0];
-    DatabaseConfig config;
-    Database db;
-    RpcDbEnv rdbenv;
-    int refcount = 0;
-    String dbname, subdbname;
-    int type, setflags, openflags;
-
-    public RpcDb(RpcDbEnv rdbenv) {
-        this.rdbenv = rdbenv;
-    }
-
-    void dispose() {
-        if (db != null) {
-            try {
-                db.close();
-            } catch (Throwable t) {
-                Util.handleException(t);
-            }
-            db = null;
-        }
-    }
-
-    public  void associate(Dispatcher server,
-                           __db_associate_msg args, __db_associate_reply reply) {
-        try {
-            // The semantics of the new API are a little different.
-            // The secondary database will already be open, here, so we first
-            // have to close it and then call openSecondaryDatabase.
-            RpcDb secondary = server.getDatabase(args.sdbpcl_id);
-            try {
-                secondary.db.close();
-            } finally {
-                secondary.db = null;
-            }
-
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-
-            args.flags &= ~AssociateCallbacks.DB_RPC2ND_MASK;
-            SecondaryConfig secondaryConfig = new SecondaryConfig();
-            // The secondary has already been opened once, so we don't
-            // need all of the settings here, only a few:
-            secondaryConfig.setReadOnly(secondary.config.getReadOnly());
-            secondaryConfig.setTransactional(secondary.config.getTransactional());
-            secondaryConfig.setKeyCreator(AssociateCallbacks.getCallback(args.flags));
-            secondaryConfig.setAllowPopulate((args.flags & DbConstants.DB_CREATE) != 0);
-            secondary.db = rdbenv.dbenv.openSecondaryDatabase(txn, secondary.dbname, secondary.subdbname, db, secondaryConfig);
-            secondary.config = secondary.db.getConfig();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public void close(Dispatcher server,
-                       __db_close_msg args, __db_close_reply reply) {
-        if (refcount == 0 || --refcount > 0) {
-            reply.status = 0;
-            return;
-        }
-
-        try {
-            server.delDatabase(this, false);
-            if (db != null)
-                db.close((args.flags & DbConstants.DB_NOSYNC) != 0);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            db = null;
-        }
-    }
-
-    public  void create(Dispatcher server,
-                        __db_create_msg args, __db_create_reply reply) {
-        try {
-            config = new DatabaseConfig();
-            config.setXACreate((args.flags & DbConstants.DB_XA_CREATE) != 0);
-            reply.dbcl_id = server.addDatabase(this);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void cursor(Dispatcher server,
-                        __db_cursor_msg args, __db_cursor_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-
-            CursorConfig config = new CursorConfig();
-            config.setDirtyRead((args.flags & DbConstants.DB_DIRTY_READ) != 0);
-            config.setDegree2((args.flags & DbConstants.DB_DEGREE_2) != 0);
-            config.setWriteCursor((args.flags & DbConstants.DB_WRITECURSOR) != 0);
-
-            Cursor dbc = db.openCursor(txn, config);
-            RpcDbc rdbc = new RpcDbc(this, dbc, false);
-            rdbc.timer = (rtxn != null) ? rtxn.timer : this;
-            reply.dbcidcl_id = server.addCursor(rdbc);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void del(Dispatcher server,
-                     __db_del_msg args, __db_del_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            DatabaseEntry key = Util.makeDatabaseEntry(args.keydata, args.keydlen, args.keydoff, args.keyulen, args.keyflags);
-
-            db.delete(txn, key /* args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get(Dispatcher server,
-                     __db_get_msg args, __db_get_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            DatabaseEntry key = Util.makeDatabaseEntry(args.keydata, args.keydlen, args.keydoff, args.keyulen, args.keyflags);
-            DatabaseEntry data = Util.makeDatabaseEntry(args.datadata,
-                args.datadlen, args.datadoff, args.dataulen, args.dataflags,
-                args.flags & DbConstants.DB_MULTIPLE);
-
-            OperationStatus status;
-            switch(args.flags & ~Server.DB_MODIFIER_MASK) {
-            case 0:
-                status = db.get(txn, key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_CONSUME:
-                status = db.consume(txn, key, data, false);
-                break;
-
-            case DbConstants.DB_CONSUME_WAIT:
-                status = db.consume(txn, key, data, true);
-                break;
-
-            case DbConstants.DB_GET_BOTH:
-                status = db.getSearchBoth(txn, key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET_RECNO:
-                status = db.getSearchRecordNumber(txn, key, data, Util.getLockMode(args.flags));
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            reply.status = Util.getStatus(status);
-
-            reply.keydata = Util.returnDatabaseEntry(key);
-            reply.datadata = Util.returnDatabaseEntry(data);
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.keydata = reply.datadata = empty;
-        }
-    }
-
-    public  void join(Dispatcher server,
-                      __db_join_msg args, __db_join_reply reply) {
-        try {
-            Cursor[] cursors = new Cursor[args.curs.length + 1];
-            for (int i = 0; i < args.curs.length; i++) {
-                RpcDbc rdbc = server.getCursor(args.curs[i]);
-                if (rdbc == null) {
-                    reply.status = DbConstants.DB_NOSERVER_ID;
-                    return;
-                }
-                cursors[i] = rdbc.dbc;
-            }
-            cursors[args.curs.length] = null;
-
-            JoinConfig config = new JoinConfig();
-            config.setNoSort(args.flags == DbConstants.DB_JOIN_NOSORT);
-            JoinCursor jdbc = db.join(cursors, config);
-
-            RpcDbc rjdbc = new RpcDbc(this, new JoinCursorAdapter(db, jdbc), true);
-            /*
-             * If our curslist has a parent txn, we need to use it too
-             * for the activity timeout.  All cursors must be part of
-             * the same transaction, so just check the first.
-             */
-            RpcDbc rdbc0 = server.getCursor(args.curs[0]);
-            if (rdbc0.timer != rdbc0)
-                rjdbc.timer = rdbc0.timer;
-
-            /*
-             * All of the curslist cursors must point to the join
-             * cursor's timeout so that we do not timeout any of the
-             * curlist cursors while the join cursor is active.
-             */
-            for (int i = 0; i < args.curs.length; i++) {
-                RpcDbc rdbc = server.getCursor(args.curs[i]);
-                rdbc.orig_timer = rdbc.timer;
-                rdbc.timer = rjdbc;
-            }
-            reply.dbcidcl_id = server.addCursor(rjdbc);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void key_range(Dispatcher server,
-                           __db_key_range_msg args, __db_key_range_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            DatabaseEntry key = Util.makeDatabaseEntry(args.keydata, args.keydlen, args.keydoff, args.keyulen, args.keyflags);
-
-            KeyRange range = db.getKeyRange(txn, key /*, args.flags == 0 */);
-            reply.status = 0;
-            reply.less = range.less;
-            reply.equal = range.equal;
-            reply.greater = range.greater;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    private boolean findSharedDatabase(Dispatcher server, __db_open_reply reply)
-        throws DatabaseException {
-        RpcDb rdb = null;
-        boolean matchFound = false;
-        LocalIterator i = ((Server)server).db_list.iterator();
-
-        while (!matchFound && i.hasNext()) {
-            rdb = (RpcDb)i.next();
-            if (rdb != null && rdb != this && rdb.rdbenv == rdbenv &&
-                (type == DbConstants.DB_UNKNOWN || rdb.type == type) &&
-                openflags == rdb.openflags &&
-                setflags == rdb.setflags &&
-                dbname != null && rdb.dbname != null &&
-                dbname.equals(rdb.dbname) &&
-                (subdbname == rdb.subdbname ||
-                 (subdbname != null && rdb.subdbname != null &&
-                  subdbname.equals(rdb.subdbname))))
-                matchFound = true;
-        }
-
-        if (matchFound) {
-            ++rdb.refcount;
-            reply.dbcl_id = ((FreeList.FreeListIterator)i).current;
-            reply.type = Util.fromDatabaseType(rdb.config.getType());
-            reply.lorder = rdb.config.getByteOrder();
-            reply.status = 0;
-
-            // Server.err.println("Sharing Database: " + reply.dbcl_id);
-        }
-
-        return matchFound;
-    }
-
-    public  void get_name(Dispatcher server,
-                          __db_get_name_msg args, __db_get_name_reply reply) {
-        reply.filename = dbname;
-        reply.dbname = subdbname;
-        reply.status = 0;
-    }
-
-    public  void get_open_flags(Dispatcher server,
-                                __db_get_open_flags_msg args, __db_get_open_flags_reply reply) {
-        try {
-            reply.flags = 0;
-            if (config.getAllowCreate()) reply.flags |= DbConstants.DB_CREATE;
-            if (config.getExclusiveCreate()) reply.flags |= DbConstants.DB_EXCL;
-            if (config.getReadOnly()) reply.flags |= DbConstants.DB_RDONLY;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void open(Dispatcher server,
-                      __db_open_msg args, __db_open_reply reply) {
-        try {
-            dbname = (args.name.length() > 0) ? args.name : null;
-            subdbname = (args.subdb.length() > 0) ? args.subdb : null;
-            type = args.type;
-            openflags = args.flags & Server.DB_SERVER_DBFLAGS;
-
-            if (findSharedDatabase(server, reply)) {
-                server.delDatabase(this, true);
-            } else {
-                RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-                Transaction txn = (rtxn != null) ? rtxn.txn : null;
-
-                // Server.err.println("Calling db.open(" + null + ", " + dbname + ", " + subdbname + ", " + args.type + ", " + Integer.toHexString(args.flags) + ", " + args.mode + ")");
-
-                config.setAllowCreate((args.flags & DbConstants.DB_CREATE) != 0);
-                config.setExclusiveCreate((args.flags & DbConstants.DB_EXCL) != 0);
-                config.setReadOnly((args.flags & DbConstants.DB_RDONLY) != 0);
-                config.setTransactional(txn != null || (args.flags & DbConstants.DB_AUTO_COMMIT) != 0);
-                config.setTruncate((args.flags & DbConstants.DB_TRUNCATE) != 0);
-                config.setType(Util.toDatabaseType(args.type));
-                config.setMode(args.mode);
-
-                db = rdbenv.dbenv.openDatabase(txn, dbname, subdbname, config);
-                ++refcount;
-
-                // Refresh config in case we didn't know the full story before opening
-                config = db.getConfig();
-
-                reply.dbcl_id = args.dbpcl_id;
-                type = reply.type = Util.fromDatabaseType(config.getType());
-                reply.lorder = config.getByteOrder();
-                reply.status = 0;
-            }
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-
-        // System.err.println("Database.open: reply.status = " + reply.status + ", reply.dbcl_id = " + reply.dbcl_id);
-    }
-
-    public  void pget(Dispatcher server,
-                      __db_pget_msg args, __db_pget_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            DatabaseEntry skey = Util.makeDatabaseEntry(args.skeydata, args.skeydlen, args.skeydoff, args.skeyulen, args.skeyflags);
-            DatabaseEntry pkey = Util.makeDatabaseEntry(args.pkeydata, args.pkeydlen, args.pkeydoff, args.pkeyulen, args.pkeyflags);
-            DatabaseEntry data = Util.makeDatabaseEntry(args.datadata, args.datadlen, args.datadoff, args.dataulen, args.dataflags);
-
-            OperationStatus status;
-            switch(args.flags & ~Server.DB_MODIFIER_MASK) {
-            case 0:
-                status = ((SecondaryDatabase)db).get(txn, skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_BOTH:
-                status = ((SecondaryDatabase)db).getSearchBoth(txn, skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET_RECNO:
-                status = ((SecondaryDatabase)db).getSearchRecordNumber(txn, skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            reply.status = Util.getStatus(status);
-
-            reply.skeydata = Util.returnDatabaseEntry(skey);
-            reply.pkeydata = Util.returnDatabaseEntry(pkey);
-            reply.datadata = Util.returnDatabaseEntry(data);
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.skeydata = reply.pkeydata = reply.datadata = empty;
-        }
-    }
-
-    public  void put(Dispatcher server,
-                     __db_put_msg args, __db_put_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-
-            DatabaseEntry key = Util.makeDatabaseEntry(args.keydata, args.keydlen, args.keydoff, args.keyulen, args.keyflags);
-            DatabaseEntry data = Util.makeDatabaseEntry(args.datadata, args.datadlen, args.datadoff, args.dataulen, args.dataflags);
-
-            reply.keydata = empty;
-            OperationStatus status;
-            switch(args.flags & ~Server.DB_MODIFIER_MASK) {
-            case 0:
-                status = db.put(txn, key, data);
-                break;
-
-            case DbConstants.DB_APPEND:
-                status = db.append(txn, key, data);
-                reply.keydata = Util.returnDatabaseEntry(key);
-                break;
-
-            case DbConstants.DB_NODUPDATA:
-                status = db.putNoDupData(txn, key, data);
-                break;
-
-            case DbConstants.DB_NOOVERWRITE:
-                status = db.putNoOverwrite(txn, key, data);
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            reply.status = Util.getStatus(status);
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.keydata = empty;
-        }
-    }
-
-    public  void remove(Dispatcher server,
-                        __db_remove_msg args, __db_remove_reply reply) {
-        try {
-            args.name = (args.name.length() > 0) ? args.name : null;
-            args.subdb = (args.subdb.length() > 0) ? args.subdb : null;
-            Database.remove(args.name, args.subdb, config);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delDatabase(this, false);
-        }
-    }
-
-    public  void rename(Dispatcher server,
-                        __db_rename_msg args, __db_rename_reply reply) {
-        try {
-            args.name = (args.name.length() > 0) ? args.name : null;
-            args.subdb = (args.subdb.length() > 0) ? args.subdb : null;
-            args.newname = (args.newname.length() > 0) ? args.newname : null;
-            Database.rename(args.name, args.subdb, args.newname, config);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delDatabase(this, false);
-        }
-    }
-
-    public  void set_bt_maxkey(Dispatcher server,
-                               __db_bt_maxkey_msg args, __db_bt_maxkey_reply reply) {
-        try {
-            // XXX: check what to do about: config.setBtreeMaxKey(args.maxkey);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_bt_minkey(Dispatcher server,
-                               __db_get_bt_minkey_msg args, __db_get_bt_minkey_reply reply) {
-        try {
-            reply.minkey = config.getBtreeMinKey();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_bt_minkey(Dispatcher server,
-                               __db_bt_minkey_msg args, __db_bt_minkey_reply reply) {
-        try {
-            config.setBtreeMinKey(args.minkey);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_encrypt_flags(Dispatcher server,
-                                   __db_get_encrypt_flags_msg args, __db_get_encrypt_flags_reply reply) {
-        try {
-            reply.flags = config.getEncrypted() ? DbConstants.DB_ENCRYPT_AES : 0;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_encrypt(Dispatcher server,
-                             __db_encrypt_msg args, __db_encrypt_reply reply) {
-        try {
-            config.setEncrypted(args.passwd /*, args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_flags(Dispatcher server,
-                           __db_get_flags_msg args, __db_get_flags_reply reply) {
-        try {
-            reply.flags = 0;
-            if (config.getChecksum()) reply.flags |= DbConstants.DB_CHKSUM;
-            if (config.getEncrypted()) reply.flags |= DbConstants.DB_ENCRYPT;
-            if (config.getBtreeRecordNumbers()) reply.flags |= DbConstants.DB_RECNUM;
-            if (config.getRenumbering()) reply.flags |= DbConstants.DB_RENUMBER;
-            if (config.getReverseSplitOff()) reply.flags |= DbConstants.DB_REVSPLITOFF;
-            if (config.getSortedDuplicates()) reply.flags |= DbConstants.DB_DUPSORT;
-            if (config.getSnapshot()) reply.flags |= DbConstants.DB_SNAPSHOT;
-            if (config.getUnsortedDuplicates()) reply.flags |= DbConstants.DB_DUP;
-            if (config.getTransactionNotDurable()) reply.flags |= DbConstants.DB_TXN_NOT_DURABLE;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_flags(Dispatcher server,
-                           __db_flags_msg args, __db_flags_reply reply) {
-        try {
-            // Server.err.println("Calling db.setflags(" + Integer.toHexString(args.flags) + ")");
-            config.setChecksum((args.flags & DbConstants.DB_CHKSUM) != 0);
-            config.setBtreeRecordNumbers((args.flags & DbConstants.DB_RECNUM) != 0);
-            config.setRenumbering((args.flags & DbConstants.DB_RENUMBER) != 0);
-            config.setReverseSplitOff((args.flags & DbConstants.DB_REVSPLITOFF) != 0);
-            config.setSortedDuplicates((args.flags & DbConstants.DB_DUPSORT) != 0);
-            config.setSnapshot((args.flags & DbConstants.DB_SNAPSHOT) != 0);
-            config.setUnsortedDuplicates((args.flags & DbConstants.DB_DUP) != 0);
-            config.setTransactionNotDurable((args.flags & DbConstants.DB_TXN_NOT_DURABLE) != 0);
-
-            setflags |= args.flags;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_h_ffactor(Dispatcher server,
-                               __db_get_h_ffactor_msg args, __db_get_h_ffactor_reply reply) {
-        try {
-            reply.ffactor = config.getHashFillFactor();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_h_ffactor(Dispatcher server,
-                               __db_h_ffactor_msg args, __db_h_ffactor_reply reply) {
-        try {
-            config.setHashFillFactor(args.ffactor);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_h_nelem(Dispatcher server,
-                             __db_get_h_nelem_msg args, __db_get_h_nelem_reply reply) {
-        try {
-            reply.nelem = config.getHashNumElements();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_h_nelem(Dispatcher server,
-                             __db_h_nelem_msg args, __db_h_nelem_reply reply) {
-        try {
-            config.setHashNumElements(args.nelem);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_lorder(Dispatcher server,
-                            __db_get_lorder_msg args, __db_get_lorder_reply reply) {
-        try {
-            reply.lorder = config.getByteOrder();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_lorder(Dispatcher server,
-                            __db_lorder_msg args, __db_lorder_reply reply) {
-        try {
-            config.setByteOrder(args.lorder);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_pagesize(Dispatcher server,
-                              __db_get_pagesize_msg args, __db_get_pagesize_reply reply) {
-        try {
-            reply.pagesize = config.getPageSize();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_pagesize(Dispatcher server,
-                              __db_pagesize_msg args, __db_pagesize_reply reply) {
-        try {
-            config.setPageSize(args.pagesize);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_q_extentsize(Dispatcher server,
-                                  __db_get_extentsize_msg args, __db_get_extentsize_reply reply) {
-        try {
-            reply.extentsize = config.getQueueExtentSize();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_q_extentsize(Dispatcher server,
-                                  __db_extentsize_msg args, __db_extentsize_reply reply) {
-        try {
-            config.setQueueExtentSize(args.extentsize);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_re_delim(Dispatcher server,
-                              __db_get_re_delim_msg args, __db_get_re_delim_reply reply) {
-        try {
-            reply.delim = config.getRecordDelimiter();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_re_delim(Dispatcher server,
-                              __db_re_delim_msg args, __db_re_delim_reply reply) {
-        try {
-            config.setRecordDelimiter(args.delim);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_re_len(Dispatcher server,
-                            __db_get_re_len_msg args, __db_get_re_len_reply reply) {
-        try {
-            reply.len = config.getRecordLength();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_re_len(Dispatcher server,
-                            __db_re_len_msg args, __db_re_len_reply reply) {
-        try {
-            config.setRecordLength(args.len);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_re_pad(Dispatcher server,
-                            __db_get_re_pad_msg args, __db_get_re_pad_reply reply) {
-        try {
-            reply.pad = config.getRecordPad();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_re_pad(Dispatcher server,
-                            __db_re_pad_msg args, __db_re_pad_reply reply) {
-        try {
-            config.setRecordPad(args.pad);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void stat(Dispatcher server,
-                      __db_stat_msg args, __db_stat_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            StatsConfig config = new StatsConfig();
-            config.setClear((args.flags & DbConstants.DB_STAT_CLEAR) != 0);
-            config.setFast((args.flags & DbConstants.DB_FAST_STAT) != 0);
-            DatabaseStats raw_stat = db.getStats(txn, config);
-
-            if (raw_stat instanceof BtreeStats) {
-                BtreeStats bs = (BtreeStats)raw_stat;
-                int[] raw_stats = {
-                    bs.getMagic(), bs.getVersion(),
-                    bs.getMetaFlags(), bs.getNumKeys(),
-                    bs.getNumData(), bs.getPageSize(),
-                    bs.getMaxKey(), bs.getMinKey(),
-                    bs.getReLen(), bs.getRePad(),
-                    bs.getLevels(), bs.getIntPages(),
-                    bs.getLeafPages(), bs.getDupPages(),
-                    bs.getOverPages(), bs.getFree(),
-                    bs.getIntPagesFree(), bs.getLeafPagesFree(),
-                    bs.getDupPagesFree(), bs.getOverPagesFree()
-                };
-                reply.stats = raw_stats;
-            } else if (raw_stat instanceof HashStats) {
-                HashStats hs = (HashStats)raw_stat;
-                int[] raw_stats = {
-                    hs.getMagic(), hs.getVersion(),
-                    hs.getMetaFlags(), hs.getNumKeys(),
-                    hs.getNumData(), hs.getPageSize(),
-                    hs.getFfactor(), hs.getBuckets(),
-                    hs.getFree(), hs.getBFree(),
-                    hs.getBigPages(), hs.getBigBFree(),
-                    hs.getOverflows(), hs.getOvflFree(),
-                    hs.getDup(), hs.getDupFree()
-                };
-                reply.stats = raw_stats;
-            } else if (raw_stat instanceof QueueStats) {
-                QueueStats qs = (QueueStats)raw_stat;
-                int[] raw_stats = {
-                    qs.getMagic(), qs.getVersion(),
-                    qs.getMetaFlags(), qs.getNumKeys(),
-                    qs.getNumData(), qs.getPageSize(),
-                    qs.getExtentSize(), qs.getPages(),
-                    qs.getReLen(), qs.getRePad(),
-                    qs.getPagesFree(), qs.getFirstRecno(),
-                    qs.getCurRecno()
-                };
-                reply.stats = raw_stats;
-            } else
-                throw new DatabaseException("Invalid return type from db.stat()", DbConstants.DB_NOTFOUND);
-
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.stats = new int[0];
-        }
-    }
-
-    public  void sync(Dispatcher server,
-                      __db_sync_msg args, __db_sync_reply reply) {
-        try {
-            db.sync(/* args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void truncate(Dispatcher server,
-                          __db_truncate_msg args, __db_truncate_reply reply) {
-        try {
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            reply.count = db.truncate(txn, true /*, args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.count = 0;
-        }
-    }
-}
diff --git a/db/rpc_server/java/RpcDbEnv.java b/db/rpc_server/java/RpcDbEnv.java
deleted file mode 100644
index 71e134f7f..000000000
--- a/db/rpc_server/java/RpcDbEnv.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: RpcDbEnv.java,v 1.15 2004/04/21 01:09:11 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-import java.io.*;
-import java.util.*;
-
-/**
- * RPC wrapper around a dbenv for the Java RPC server.
- */
-public class RpcDbEnv extends Timer {
-    EnvironmentConfig config;
-    Environment dbenv;
-    String home;
-    long idletime, timeout;
-    int openflags, onflags, offflags;
-    int refcount = 1;
-
-    void dispose() {
-        if (dbenv != null) {
-            try {
-                dbenv.close();
-            } catch (Throwable t) {
-                Util.handleException(t);
-            }
-            dbenv = null;
-        }
-    }
-
-    public  void close(Dispatcher server,
-                       __env_close_msg args, __env_close_reply reply) {
-        if (--refcount != 0) {
-            reply.status = 0;
-            return;
-        }
-
-        try {
-            server.delEnv(this, false);
-            if (dbenv != null)
-                dbenv.close(/* args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            dbenv = null;
-        }
-    }
-
-    public  void create(Dispatcher server,
-                        __env_create_msg args, __env_create_reply reply) {
-        this.idletime = (args.timeout != 0) ? args.timeout : Server.idleto;
-        this.timeout = Server.defto;
-        try {
-            config = new EnvironmentConfig();
-            config.setErrorStream(Server.errstream);
-            reply.envcl_id = server.addEnv(this);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void dbremove(Dispatcher server,
-                          __env_dbremove_msg args, __env_dbremove_reply reply) {
-        try {
-            args.name = (args.name.length() > 0) ? args.name : null;
-            args.subdb = (args.subdb.length() > 0) ? args.subdb : null;
-
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            dbenv.removeDatabase(txn, args.name, args.subdb /*, args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void dbrename(Dispatcher server,
-                          __env_dbrename_msg args, __env_dbrename_reply reply) {
-        try {
-            args.name = (args.name.length() > 0) ? args.name : null;
-            args.subdb = (args.subdb.length() > 0) ? args.subdb : null;
-            args.newname = (args.newname.length() > 0) ? args.newname : null;
-
-            RpcDbTxn rtxn = server.getTxn(args.txnpcl_id);
-            Transaction txn = (rtxn != null) ? rtxn.txn : null;
-            dbenv.renameDatabase(txn, args.name, args.subdb, args.newname /*, args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    private boolean findSharedEnvironment(Dispatcher server, __env_open_reply reply)
-        throws DatabaseException {
-        RpcDbEnv rdbenv = null;
-        boolean matchFound = false;
-        LocalIterator i = ((Server)server).env_list.iterator();
-
-        while (!matchFound && i.hasNext()) {
-            rdbenv = (RpcDbEnv)i.next();
-            if (rdbenv != null && rdbenv != this &&
-                (home == rdbenv.home ||
-                 (home != null && home.equals(rdbenv.home))) &&
-                openflags == rdbenv.openflags &&
-                onflags == rdbenv.onflags &&
-                offflags == rdbenv.offflags)
-                matchFound = true;
-        }
-
-        if (matchFound) {
-            /*
-             * The only thing left to check is the timeout.
-             * Since the server timeout set by the client is a hint, for sharing
-             * we'll give them the benefit of the doubt and grant them the
-             * longer timeout.
-             */
-            if (rdbenv.timeout < timeout)
-                rdbenv.timeout = timeout;
-
-            ++rdbenv.refcount;
-            reply.envcl_id = ((FreeList.FreeListIterator)i).current;
-            reply.status = 0;
-
-            Server.err.println("Sharing Environment: " + reply.envcl_id);
-        }
-
-        return matchFound;
-    }
-
-    public  void get_home(Dispatcher server,
-                          __env_get_home_msg args, __env_get_home_reply reply) {
-        try {
-            reply.home = dbenv.getHome().toString();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_open_flags(Dispatcher server,
-                                __env_get_open_flags_msg args, __env_get_open_flags_reply reply) {
-        try {
-            reply.flags = 0;
-            if (config.getAllowCreate()) reply.flags |= DbConstants.DB_CREATE;
-            if (config.getInitializeCache()) reply.flags |= DbConstants.DB_INIT_MPOOL;
-            if (config.getInitializeCDB()) reply.flags |= DbConstants.DB_INIT_CDB;
-            if (config.getInitializeLocking()) reply.flags |= DbConstants.DB_INIT_LOCK;
-            if (config.getInitializeLogging()) reply.flags |= DbConstants.DB_INIT_LOG;
-            if (config.getInitializeReplication()) reply.flags |= DbConstants.DB_INIT_REP;
-            if (config.getJoinEnvironment()) reply.flags |= DbConstants.DB_JOINENV;
-            if (config.getLockDown()) reply.flags |= DbConstants.DB_LOCKDOWN;
-            if (config.getPrivate()) reply.flags |= DbConstants.DB_PRIVATE;
-            if (config.getReadOnly()) reply.flags |= DbConstants.DB_RDONLY;
-            if (config.getRunRecovery()) reply.flags |= DbConstants.DB_RECOVER;
-            if (config.getRunFatalRecovery()) reply.flags |= DbConstants.DB_RECOVER_FATAL;
-            if (config.getSystemMemory()) reply.flags |= DbConstants.DB_SYSTEM_MEM;
-            if (config.getTransactional()) reply.flags |= DbConstants.DB_INIT_TXN;
-            if (config.getUseEnvironment()) reply.flags |= DbConstants.DB_USE_ENVIRON;
-            if (config.getUseEnvironmentRoot()) reply.flags |= DbConstants.DB_USE_ENVIRON_ROOT;
-
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void open(Dispatcher server,
-                      __env_open_msg args, __env_open_reply reply) {
-        try {
-            home = (args.home.length() > 0) ? args.home : null;
-
-            /*
-             * If they are using locking do deadlock detection for
-             * them, internally.
-             */
-            if ((args.flags & DbConstants.DB_INIT_LOCK) != 0)
-                config.setLockDetectMode(LockDetectMode.DEFAULT);
-
-            // adjust flags for RPC
-            int newflags = (args.flags & ~Server.DB_SERVER_FLAGMASK);
-            openflags = (newflags & Server.DB_SERVER_ENVFLAGS);
-
-            config.setAllowCreate((args.flags & DbConstants.DB_CREATE) != 0);
-            config.setInitializeCache((args.flags & DbConstants.DB_INIT_MPOOL) != 0);
-            config.setInitializeCDB((args.flags & DbConstants.DB_INIT_CDB) != 0);
-            config.setInitializeLocking((args.flags & DbConstants.DB_INIT_LOCK) != 0);
-            config.setInitializeLogging((args.flags & DbConstants.DB_INIT_LOG) != 0);
-            config.setInitializeReplication((args.flags & DbConstants.DB_INIT_REP) != 0);
-            config.setJoinEnvironment((args.flags & DbConstants.DB_JOINENV) != 0);
-            config.setLockDown((args.flags & DbConstants.DB_LOCKDOWN) != 0);
-            config.setPrivate((args.flags & DbConstants.DB_PRIVATE) != 0);
-            config.setReadOnly((args.flags & DbConstants.DB_RDONLY) != 0);
-            config.setRunRecovery((args.flags & DbConstants.DB_RECOVER) != 0);
-            config.setRunFatalRecovery((args.flags & DbConstants.DB_RECOVER_FATAL) != 0);
-            config.setSystemMemory((args.flags & DbConstants.DB_SYSTEM_MEM) != 0);
-            config.setTransactional((args.flags & DbConstants.DB_INIT_TXN) != 0);
-            config.setUseEnvironment((args.flags & DbConstants.DB_USE_ENVIRON) != 0);
-            config.setUseEnvironmentRoot((args.flags & DbConstants.DB_USE_ENVIRON_ROOT) != 0);
-
-            if (findSharedEnvironment(server, reply))
-                dbenv = null;
-            else if (Server.check_home(home)) {
-                dbenv = new Environment(new File(home), config);
-                // Get the configuration after opening -- it may have changed if we're joining an environment
-                config = dbenv.getConfig();
-                reply.status = 0;
-                reply.envcl_id = args.dbenvcl_id;
-            } else
-                reply.status = DbConstants.DB_NOSERVER_HOME;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-
-        // System.err.println("Environment.open: reply.status = " + reply.status + ", reply.envcl_id = " + reply.envcl_id);
-    }
-
-    public  void remove(Dispatcher server,
-                        __env_remove_msg args, __env_remove_reply reply) {
-        Server.err.println("RpcDbEnv.remove(" + args.home + ")");
-        try {
-            args.home = (args.home.length() > 0) ? args.home : null;
-            // TODO: check home?
-
-            boolean force = (args.flags & DbConstants.DB_FORCE) != 0;
-            config.setUseEnvironment((args.flags & DbConstants.DB_USE_ENVIRON) != 0);
-            config.setUseEnvironmentRoot((args.flags & DbConstants.DB_USE_ENVIRON_ROOT) != 0);
-
-            Environment.remove(new File(args.home), force, config);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delEnv(this, false);
-        }
-    }
-
-    public  void get_cachesize(Dispatcher server,
-                               __env_get_cachesize_msg args, __env_get_cachesize_reply reply) {
-        try {
-            long cachesize = config.getCacheSize();
-            final long GIGABYTE = 1073741824;
-            reply.gbytes = (int)(cachesize / GIGABYTE);
-            reply.bytes = (int)(cachesize % GIGABYTE);
-            reply.ncache = config.getCacheCount();
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_cachesize(Dispatcher server,
-                               __env_cachesize_msg args, __env_cachesize_reply reply) {
-        try {
-            long bytes = (long)args.gbytes * 1024 * 1024 * 1024;
-            bytes += args.bytes;
-            config.setCacheSize(bytes);
-            config.setCacheCount(args.ncache);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_encrypt_flags(Dispatcher server,
-                                   __env_get_encrypt_flags_msg args, __env_get_encrypt_flags_reply reply) {
-        try {
-            reply.flags = config.getEncrypted() ? DbConstants.DB_ENCRYPT_AES : 0;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_encrypt(Dispatcher server,
-                             __env_encrypt_msg args, __env_encrypt_reply reply) {
-        try {
-            config.setEncrypted(args.passwd);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get_flags(Dispatcher server,
-                           __env_get_flags_msg args, __env_get_flags_reply reply) {
-        try {
-            reply.flags = 0;
-            if (config.getCDBLockAllDatabases()) reply.flags |= DbConstants.DB_CDB_ALLDB;
-            if (config.getDirectDatabaseIO()) reply.flags |= DbConstants.DB_DIRECT_DB;
-            if (config.getDirectLogIO()) reply.flags |= DbConstants.DB_DIRECT_LOG;
-            if (config.getInitializeRegions()) reply.flags |= DbConstants.DB_REGION_INIT;
-            if (config.getLogAutoRemove()) reply.flags |= DbConstants.DB_LOG_AUTOREMOVE;
-            if (config.getNoLocking()) reply.flags |= DbConstants.DB_NOLOCKING;
-            if (config.getNoMMap()) reply.flags |= DbConstants.DB_NOMMAP;
-            if (config.getNoPanic()) reply.flags |= DbConstants.DB_NOPANIC;
-            if (config.getOverwrite()) reply.flags |= DbConstants.DB_OVERWRITE;
-            if (config.getTxnNoSync()) reply.flags |= DbConstants.DB_TXN_NOSYNC;
-            if (config.getTxnNotDurable()) reply.flags |= DbConstants.DB_TXN_NOT_DURABLE;
-            if (config.getTxnWriteNoSync()) reply.flags |= DbConstants.DB_TXN_WRITE_NOSYNC;
-            if (config.getYieldCPU()) reply.flags |= DbConstants.DB_YIELDCPU;
-
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void set_flags(Dispatcher server,
-                           __env_flags_msg args, __env_flags_reply reply) {
-        try {
-            boolean onoff = (args.onoff != 0);
-            if (onoff)
-                onflags |= args.flags;
-            else
-                offflags |= args.flags;
-
-            if ((args.flags & DbConstants.DB_CDB_ALLDB) != 0) config.setCDBLockAllDatabases(onoff);
-            if ((args.flags & DbConstants.DB_DIRECT_DB) != 0) config.setDirectDatabaseIO(onoff);
-            if ((args.flags & DbConstants.DB_DIRECT_LOG) != 0) config.setDirectLogIO(onoff);
-            if ((args.flags & DbConstants.DB_REGION_INIT) != 0) config.setInitializeRegions(onoff);
-            if ((args.flags & DbConstants.DB_LOG_AUTOREMOVE) != 0) config.setLogAutoRemove(onoff);
-            if ((args.flags & DbConstants.DB_NOLOCKING) != 0) config.setNoLocking(onoff);
-            if ((args.flags & DbConstants.DB_NOMMAP) != 0) config.setNoMMap(onoff);
-            if ((args.flags & DbConstants.DB_NOPANIC) != 0) config.setNoPanic(onoff);
-            if ((args.flags & DbConstants.DB_OVERWRITE) != 0) config.setOverwrite(onoff);
-            if ((args.flags & DbConstants.DB_TXN_NOSYNC) != 0) config.setTxnNoSync(onoff);
-            if ((args.flags & DbConstants.DB_TXN_NOT_DURABLE) != 0) config.setTxnNotDurable(onoff);
-            if ((args.flags & DbConstants.DB_TXN_WRITE_NOSYNC) != 0) config.setTxnWriteNoSync(onoff);
-            if ((args.flags & DbConstants.DB_YIELDCPU) != 0) config.setYieldCPU(onoff);
-
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    // txn_recover implementation
-    public  void txn_recover(Dispatcher server,
-                             __txn_recover_msg args, __txn_recover_reply reply) {
-        try {
-            PreparedTransaction[] prep_list = dbenv.recover(args.count, args.flags == DbConstants.DB_NEXT);
-            if (prep_list != null && prep_list.length > 0) {
-                int count = prep_list.length;
-                reply.retcount = count;
-                reply.txn = new int[count];
-                reply.gid = new byte[count * DbConstants.DB_XIDDATASIZE];
-
-                for (int i = 0; i < count; i++) {
-                    reply.txn[i] = server.addTxn(new RpcDbTxn(this, prep_list[i].getTransaction()));
-                    System.arraycopy(prep_list[i].getGID(), 0, reply.gid, i * DbConstants.DB_XIDDATASIZE, DbConstants.DB_XIDDATASIZE);
-                }
-            }
-
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-}
diff --git a/db/rpc_server/java/RpcDbTxn.java b/db/rpc_server/java/RpcDbTxn.java
deleted file mode 100644
index 85cdad038..000000000
--- a/db/rpc_server/java/RpcDbTxn.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: RpcDbTxn.java,v 1.9 2004/05/04 13:45:33 sue Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-import java.io.*;
-import java.util.*;
-
-/**
- * RPC wrapper around a txn object for the Java RPC server.
- */
-public class RpcDbTxn extends Timer {
-    RpcDbEnv rdbenv;
-    Transaction txn;
-
-    public RpcDbTxn(RpcDbEnv rdbenv, Transaction txn) {
-        this.rdbenv = rdbenv;
-        this.txn = txn;
-    }
-
-    void dispose() {
-        if (txn != null) {
-            try {
-                txn.abort();
-            } catch (DatabaseException e) {
-                e.printStackTrace(Server.err);
-            }
-            txn = null;
-        }
-    }
-
-    public  void abort(Dispatcher server,
-                       __txn_abort_msg args, __txn_abort_reply reply) {
-        try {
-            txn.abort();
-            txn = null;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delTxn(this, false);
-        }
-    }
-
-    public  void begin(Dispatcher server,
-                       __txn_begin_msg args, __txn_begin_reply reply) {
-        try {
-            if (rdbenv == null) {
-                reply.status = DbConstants.DB_NOSERVER_ID;
-                return;
-            }
-            Environment dbenv = rdbenv.dbenv;
-            RpcDbTxn rparent = server.getTxn(args.parentcl_id);
-            Transaction parent = (rparent != null) ? rparent.txn : null;
-
-            TransactionConfig config = new TransactionConfig();
-            config.setDegree2((args.flags & DbConstants.DB_DEGREE_2) != 0);
-            config.setDirtyRead((args.flags & DbConstants.DB_DIRTY_READ) != 0);
-            config.setNoSync((args.flags & DbConstants.DB_TXN_NOSYNC) != 0);
-            config.setNoWait(true);
-            config.setSync((args.flags & DbConstants.DB_TXN_SYNC) != 0);
-
-            txn = dbenv.beginTransaction(parent, config);
-
-            if (rparent != null)
-                timer = rparent.timer;
-            reply.txnidcl_id = server.addTxn(this);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void commit(Dispatcher server,
-                        __txn_commit_msg args, __txn_commit_reply reply) {
-        try {
-            switch(args.flags) {
-            case 0:
-                txn.commit();
-                break;
-
-            case DbConstants.DB_TXN_SYNC:
-                txn.commitSync();
-                break;
-
-            case DbConstants.DB_TXN_NOSYNC:
-                txn.commitSync();
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            txn = null;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delTxn(this, false);
-        }
-    }
-
-    public  void discard(Dispatcher server,
-                         __txn_discard_msg args, __txn_discard_reply reply) {
-        try {
-            txn.discard(/* args.flags == 0 */);
-            txn = null;
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delTxn(this, false);
-        }
-    }
-
-    public  void prepare(Dispatcher server,
-                         __txn_prepare_msg args, __txn_prepare_reply reply) {
-        try {
-            txn.prepare(args.gid);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-}
diff --git a/db/rpc_server/java/RpcDbc.java b/db/rpc_server/java/RpcDbc.java
deleted file mode 100644
index 75f644c4b..000000000
--- a/db/rpc_server/java/RpcDbc.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: RpcDbc.java,v 1.13 2004/11/05 01:08:31 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-import java.io.*;
-import java.util.*;
-
-/**
- * RPC wrapper around a dbc object for the Java RPC server.
- */
-public class RpcDbc extends Timer {
-    static final byte[] empty = new byte[0];
-    RpcDbEnv rdbenv;
-    RpcDb rdb;
-    Cursor dbc;
-    Timer orig_timer;
-    boolean isJoin;
-
-    public RpcDbc(RpcDb rdb, Cursor dbc, boolean isJoin) {
-        this.rdb = rdb;
-        this.rdbenv = rdb.rdbenv;
-        this.dbc = dbc;
-        this.isJoin = isJoin;
-    }
-
-    void dispose() {
-        if (dbc != null) {
-            try {
-                dbc.close();
-            } catch (Throwable t) {
-                Util.handleException(t);
-            }
-            dbc = null;
-        }
-    }
-
-    public  void close(Dispatcher server,
-                       __dbc_close_msg args, __dbc_close_reply reply) {
-        try {
-            dbc.close();
-            dbc = null;
-
-            if (isJoin)
-                for (LocalIterator i = ((Server)server).cursor_list.iterator(); i.hasNext();) {
-                    RpcDbc rdbc = (RpcDbc)i.next();
-                    // Unjoin cursors that were joined to create this
-                    if (rdbc != null && rdbc.timer == this)
-                        rdbc.timer = rdbc.orig_timer;
-                }
-
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        } finally {
-            server.delCursor(this, false);
-        }
-    }
-
-    public  void count(Dispatcher server,
-                       __dbc_count_msg args, __dbc_count_reply reply) {
-        try {
-            reply.dupcount = dbc.count(/* args.flags == 0 */);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void del(Dispatcher server,
-                     __dbc_del_msg args, __dbc_del_reply reply) {
-        try {
-            reply.status = Util.getStatus(dbc.delete(/* args.flags == 0 */));
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void dup(Dispatcher server,
-                     __dbc_dup_msg args, __dbc_dup_reply reply) {
-        try {
-            Cursor newdbc = dbc.dup(args.flags == DbConstants.DB_POSITION);
-            RpcDbc rdbc = new RpcDbc(rdb, newdbc, false);
-            /* If this cursor has a parent txn, we need to use it too. */
-            if (timer != this)
-                rdbc.timer = timer;
-            reply.dbcidcl_id = server.addCursor(rdbc);
-            reply.status = 0;
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-        }
-    }
-
-    public  void get(Dispatcher server,
-                     __dbc_get_msg args, __dbc_get_reply reply) {
-        try {
-            DatabaseEntry key = Util.makeDatabaseEntry(args.keydata, args.keydlen, args.keydoff, args.keyulen, args.keyflags);
-            DatabaseEntry data = Util.makeDatabaseEntry(args.datadata,
-                args.datadlen, args.datadoff, args.dataulen, args.dataflags,
-                args.flags & (DbConstants.DB_MULTIPLE | DbConstants.DB_MULTIPLE_KEY));
-
-            OperationStatus status;
-            switch(args.flags & ~Server.DB_MODIFIER_MASK) {
-            case DbConstants.DB_CURRENT:
-                status = dbc.getCurrent(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_FIRST:
-                status = dbc.getFirst(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_LAST:
-                status = dbc.getLast(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_NEXT:
-                status = dbc.getNext(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_NEXT_DUP:
-                status = dbc.getNextDup(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_NEXT_NODUP:
-                status = dbc.getNextNoDup(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_PREV:
-                status = dbc.getPrev(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_PREV_NODUP:
-                status = dbc.getPrevNoDup(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_RECNO:
-                status = dbc.getRecordNumber(data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET:
-                status = dbc.getSearchKey(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET_RANGE:
-                status = dbc.getSearchKeyRange(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_BOTH:
-                status = dbc.getSearchBoth(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_BOTH_RANGE:
-                status = dbc.getSearchBothRange(key, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET_RECNO:
-                status = dbc.getSearchRecordNumber(key, data, Util.getLockMode(args.flags));
-                break;
-
-                /* Join cursors */
-            case 0:
-                status = ((JoinCursorAdapter)dbc).jc.getNext(key, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_JOIN_ITEM:
-                status = ((JoinCursorAdapter)dbc).jc.getNext(key, Util.getLockMode(args.flags));
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            reply.status = Util.getStatus(status);
-            reply.keydata = Util.returnDatabaseEntry(key);
-            reply.datadata = Util.returnDatabaseEntry(data);
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.keydata = reply.datadata = empty;
-        }
-    }
-
-    public  void pget(Dispatcher server,
-                      __dbc_pget_msg args, __dbc_pget_reply reply) {
-        try {
-            DatabaseEntry skey = Util.makeDatabaseEntry(args.skeydata, args.skeydlen, args.skeydoff, args.skeyulen, args.skeyflags);
-            DatabaseEntry pkey = Util.makeDatabaseEntry(args.pkeydata, args.pkeydlen, args.pkeydoff, args.pkeyulen, args.pkeyflags);
-            DatabaseEntry data = Util.makeDatabaseEntry(args.datadata, args.datadlen, args.datadoff, args.dataulen, args.dataflags);
-
-            OperationStatus status;
-            switch(args.flags & ~Server.DB_MODIFIER_MASK) {
-            case DbConstants.DB_CURRENT:
-                status = ((SecondaryCursor)dbc).getCurrent(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_FIRST:
-                status = ((SecondaryCursor)dbc).getFirst(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_LAST:
-                status = ((SecondaryCursor)dbc).getLast(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_NEXT:
-                status = ((SecondaryCursor)dbc).getNext(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_NEXT_DUP:
-                status = ((SecondaryCursor)dbc).getNextDup(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_NEXT_NODUP:
-                status = ((SecondaryCursor)dbc).getNextNoDup(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_PREV:
-                status = ((SecondaryCursor)dbc).getPrev(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_PREV_NODUP:
-                status = ((SecondaryCursor)dbc).getPrevNoDup(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_RECNO:
-                status = ((SecondaryCursor)dbc).getRecordNumber(pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET:
-                status = ((SecondaryCursor)dbc).getSearchKey(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET_RANGE:
-                status = ((SecondaryCursor)dbc).getSearchKeyRange(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_BOTH:
-                status = ((SecondaryCursor)dbc).getSearchBoth(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_GET_BOTH_RANGE:
-                status = ((SecondaryCursor)dbc).getSearchBothRange(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            case DbConstants.DB_SET_RECNO:
-                status = ((SecondaryCursor)dbc).getSearchRecordNumber(skey, pkey, data, Util.getLockMode(args.flags));
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            reply.status = Util.getStatus(status);
-            reply.skeydata = Util.returnDatabaseEntry(skey);
-            reply.pkeydata = Util.returnDatabaseEntry(pkey);
-            reply.datadata = Util.returnDatabaseEntry(data);
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.skeydata = reply.pkeydata = reply.datadata = empty;
-        }
-    }
-
-    public  void put(Dispatcher server,
-                     __dbc_put_msg args, __dbc_put_reply reply) {
-        try {
-            DatabaseEntry key = Util.makeDatabaseEntry(args.keydata, args.keydlen, args.keydoff, args.keyulen, args.keyflags);
-            DatabaseEntry data = Util.makeDatabaseEntry(args.datadata, args.datadlen, args.datadoff, args.dataulen, args.dataflags);
-
-            OperationStatus status;
-            switch(args.flags & ~Server.DB_MODIFIER_MASK) {
-            case 0:
-                status = dbc.put(key, data);
-                break;
-
-            case DbConstants.DB_AFTER:
-                status = dbc.putAfter(key, data);
-                break;
-
-            case DbConstants.DB_BEFORE:
-                status = dbc.putBefore(key, data);
-                break;
-
-            case DbConstants.DB_NOOVERWRITE:
-                status = dbc.putNoOverwrite(key, data);
-                break;
-
-            case DbConstants.DB_KEYFIRST:
-                status = dbc.putKeyFirst(key, data);
-                break;
-
-            case DbConstants.DB_KEYLAST:
-                status = dbc.putKeyLast(key, data);
-                break;
-
-            case DbConstants.DB_NODUPDATA:
-                status = dbc.putNoDupData(key, data);
-                break;
-
-            case DbConstants.DB_CURRENT:
-                status = dbc.putCurrent(data);
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Unknown flag: " + (args.flags & ~Server.DB_MODIFIER_MASK));
-            }
-            reply.status = Util.getStatus(status);
-            reply.keydata = Util.returnDatabaseEntry(key);
-        } catch (Throwable t) {
-            reply.status = Util.handleException(t);
-            reply.keydata = empty;
-        }
-    }
-}
diff --git a/db/rpc_server/java/Server.java b/db/rpc_server/java/Server.java
deleted file mode 100644
index 32eba6a16..000000000
--- a/db/rpc_server/java/Server.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: Server.java,v 1.1 2004/04/06 20:43:42 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-import java.io.*;
-import java.util.*;
-import org.acplt.oncrpc.OncRpcException;
-import org.acplt.oncrpc.server.OncRpcCallInformation;
-
-/**
- * Main entry point for the Java version of the Berkeley DB RPC server
- */
-public class Server extends Dispatcher {
-    public static long idleto = 10 * 60 * 1000; // 5 minutes
-    public static long defto = 5 * 60 * 1000;   // 5 minutes
-    public static long maxto = 60 * 60 * 1000;  // 1 hour
-    public static String passwd = null;
-    public static OutputStream errstream;
-    public static PrintWriter err;
-
-    long now, hint; // updated each operation
-    FreeList env_list = new FreeList();
-    FreeList db_list = new FreeList();
-    FreeList txn_list = new FreeList();
-    FreeList cursor_list = new FreeList();
-
-    public Server() throws IOException, OncRpcException {
-        super();
-        init_lists();
-    }
-
-    public void dispatchOncRpcCall(OncRpcCallInformation call, int program,
-                                   int version, int procedure) throws OncRpcException, IOException {
-        long newnow = System.currentTimeMillis();
-        // Server.err.println("Dispatching RPC call " + procedure + " after delay of " + (newnow - now));
-        now = newnow;
-        try {
-            super.dispatchOncRpcCall(call, program, version, procedure);
-            doTimeouts();
-        } catch (Throwable t) {
-            System.err.println("Caught " + t + " while dispatching RPC call " + procedure);
-            t.printStackTrace(Server.err);
-        } finally {
-            Server.err.flush();
-        }
-    }
-
-    // Internal methods to track context
-    private void init_lists() {
-        // We do this so that getEnv/Database/etc(0) == null
-        env_list.add(null);
-        db_list.add(null);
-        txn_list.add(null);
-        cursor_list.add(null);
-    }
-
-    int addEnv(RpcDbEnv rdbenv) {
-        rdbenv.timer.last_access = now;
-        int id = env_list.add(rdbenv);
-        return id;
-    }
-
-    int addDatabase(RpcDb rdb) {
-        int id = db_list.add(rdb);
-        return id;
-    }
-
-    int addTxn(RpcDbTxn rtxn) {
-        rtxn.timer.last_access = now;
-        int id = txn_list.add(rtxn);
-        return id;
-    }
-
-    int addCursor(RpcDbc rdbc) {
-        rdbc.timer.last_access = now;
-        int id = cursor_list.add(rdbc);
-        return id;
-    }
-
-    void delEnv(RpcDbEnv rdbenv, boolean dispose) {
-        env_list.del(rdbenv);
-
-        // cursors and transactions will already have been cleaned up
-        for (LocalIterator i = db_list.iterator(); i.hasNext();) {
-            RpcDb rdb = (RpcDb)i.next();
-            if (rdb != null && rdb.rdbenv == rdbenv)
-                delDatabase(rdb, true);
-        }
-
-        if (dispose)
-            rdbenv.dispose();
-    }
-
-    void delDatabase(RpcDb rdb, boolean dispose) {
-        db_list.del(rdb);
-
-        for (LocalIterator i = cursor_list.iterator(); i.hasNext();) {
-            RpcDbc rdbc = (RpcDbc)i.next();
-            if (rdbc != null && rdbc.timer == rdb) {
-                i.remove();
-                rdbc.dispose();
-            }
-        }
-
-        if (dispose)
-            rdb.dispose();
-    }
-
-    void delTxn(RpcDbTxn rtxn, boolean dispose) {
-        txn_list.del(rtxn);
-
-        for (LocalIterator i = cursor_list.iterator(); i.hasNext();) {
-            RpcDbc rdbc = (RpcDbc)i.next();
-            if (rdbc != null && rdbc.timer == rtxn) {
-                i.remove();
-                rdbc.dispose();
-            }
-        }
-
-        for (LocalIterator i = txn_list.iterator(); i.hasNext();) {
-            RpcDbTxn rtxn_child = (RpcDbTxn)i.next();
-            if (rtxn_child != null && rtxn_child.timer == rtxn) {
-                i.remove();
-                rtxn_child.dispose();
-            }
-        }
-
-        if (dispose)
-            rtxn.dispose();
-    }
-
-    void delCursor(RpcDbc rdbc, boolean dispose) {
-        cursor_list.del(rdbc);
-        if (dispose)
-            rdbc.dispose();
-    }
-
-    RpcDbEnv getEnv(int envid) {
-        RpcDbEnv rdbenv = (RpcDbEnv)env_list.get(envid);
-        if (rdbenv != null)
-            rdbenv.timer.last_access = now;
-        return rdbenv;
-    }
-
-    RpcDb getDatabase(int dbid) {
-        RpcDb rdb = (RpcDb)db_list.get(dbid);
-        if (rdb != null)
-            rdb.rdbenv.timer.last_access = now;
-        return rdb;
-    }
-
-    RpcDbTxn getTxn(int txnid) {
-        RpcDbTxn rtxn = (RpcDbTxn)txn_list.get(txnid);
-        if (rtxn != null)
-            rtxn.timer.last_access = rtxn.rdbenv.timer.last_access = now;
-        return rtxn;
-    }
-
-    RpcDbc getCursor(int dbcid) {
-        RpcDbc rdbc = (RpcDbc)cursor_list.get(dbcid);
-        if (rdbc != null)
-            rdbc.last_access = rdbc.timer.last_access = rdbc.rdbenv.timer.last_access = now;
-        return rdbc;
-    }
-
-    void doTimeouts() {
-        if (now < hint) {
-            // Server.err.println("Skipping cleaner sweep - now = " + now + ", hint = " + hint);
-            return;
-        }
-
-        // Server.err.println("Starting a cleaner sweep");
-        hint = now + Server.maxto;
-
-        for (LocalIterator i = cursor_list.iterator(); i.hasNext();) {
-            RpcDbc rdbc = (RpcDbc)i.next();
-            if (rdbc == null)
-                continue;
-
-            long end_time = rdbc.timer.last_access + rdbc.rdbenv.timeout;
-            // Server.err.println("Examining " + rdbc + ", time left = " + (end_time - now));
-            if (end_time < now) {
-                Server.err.println("Cleaning up " + rdbc);
-                delCursor(rdbc, true);
-            } else if (end_time < hint)
-                hint = end_time;
-        }
-
-        for (LocalIterator i = txn_list.iterator(); i.hasNext();) {
-            RpcDbTxn rtxn = (RpcDbTxn)i.next();
-            if (rtxn == null)
-                continue;
-
-            long end_time = rtxn.timer.last_access + rtxn.rdbenv.timeout;
-            // Server.err.println("Examining " + rtxn + ", time left = " + (end_time - now));
-            if (end_time < now) {
-                Server.err.println("Cleaning up " + rtxn);
-                delTxn(rtxn, true);
-            } else if (end_time < hint)
-                hint = end_time;
-        }
-
-        for (LocalIterator i = env_list.iterator(); i.hasNext();) {
-            RpcDbEnv rdbenv = (RpcDbEnv)i.next();
-            if (rdbenv == null)
-                continue;
-
-            long end_time = rdbenv.timer.last_access + rdbenv.idletime;
-            // Server.err.println("Examining " + rdbenv + ", time left = " + (end_time - now));
-            if (end_time < now) {
-                Server.err.println("Cleaning up " + rdbenv);
-                delEnv(rdbenv, true);
-            }
-        }
-
-        // if we didn't find anything, reset the hint
-        if (hint == now + Server.maxto)
-            hint = 0;
-
-        // Server.err.println("Finishing a cleaner sweep");
-    }
-
-    // Some constants that aren't available elsewhere
-    static final int ENOENT = 2;
-    static final int EACCES = 13;
-    static final int EEXIST = 17;
-    static final int EINVAL = 22;
-    static final int DB_SERVER_FLAGMASK = DbConstants.DB_LOCKDOWN |
-        DbConstants.DB_PRIVATE | DbConstants.DB_RECOVER | DbConstants.DB_RECOVER_FATAL |
-        DbConstants.DB_SYSTEM_MEM | DbConstants.DB_USE_ENVIRON |
-        DbConstants.DB_USE_ENVIRON_ROOT;
-    static final int DB_SERVER_ENVFLAGS = DbConstants.DB_INIT_CDB |
-        DbConstants.DB_INIT_LOCK | DbConstants.DB_INIT_LOG | DbConstants.DB_INIT_MPOOL |
-        DbConstants.DB_INIT_TXN | DbConstants.DB_JOINENV;
-    static final int DB_SERVER_DBFLAGS = DbConstants.DB_DIRTY_READ |
-        DbConstants.DB_NOMMAP | DbConstants.DB_RDONLY;
-    static final int DB_SERVER_DBNOSHARE = DbConstants.DB_EXCL | DbConstants.DB_TRUNCATE;
-    static final int DB_MODIFIER_MASK = 0xff000000;
-
-    static Vector homes = new Vector();
-
-    static void add_home(String home) {
-        File f = new File(home);
-        try {
-            home = f.getCanonicalPath();
-        } catch (IOException e) {
-            // ignored
-        }
-        homes.addElement(home);
-    }
-
-    static boolean check_home(String home) {
-        if (home == null)
-            return false;
-        File f = new File(home);
-        try {
-            home = f.getCanonicalPath();
-        } catch (IOException e) {
-            // ignored
-        }
-        return homes.contains(home);
-    }
-
-    public static void main(String[] args) {
-        System.out.println("Starting Server...");
-        for (int i = 0; i < args.length; i++) {
-            if (args[i].charAt(0) != '-')
-                usage();
-
-            switch (args[i].charAt(1)) {
-            case 'h':
-                add_home(args[++i]);
-                break;
-            case 'I':
-                idleto = Long.parseLong(args[++i]) * 1000L;
-                break;
-            case 'P':
-                passwd = args[++i];
-                break;
-            case 't':
-                defto = Long.parseLong(args[++i]) * 1000L;
-                break;
-            case 'T':
-                maxto = Long.parseLong(args[++i]) * 1000L;
-                break;
-            case 'V':
-                // version;
-                break;
-            case 'v':
-                // verbose
-                break;
-            default:
-                usage();
-            }
-        }
-
-        try {
-            // Server.errstream = System.err;
-            Server.errstream = new FileOutputStream("JavaRPCServer.trace", true);
-            Server.err = new PrintWriter(Server.errstream);
-            Server server = new Server();
-            server.run();
-        } catch (Throwable e) {
-            System.err.println("Server exception:");
-            e.printStackTrace(Server.err);
-        } finally {
-            if (Server.err != null)
-                Server.err.close();
-        }
-
-        System.out.println("Server stopped.");
-    }
-
-    static void usage() {
-        System.err.println("usage: java com.sleepycat.db.rpcserver.Server \\");
-        System.err.println("[-Vv] [-h home] [-P passwd] [-I idletimeout] [-L logfile] [-t def_timeout] [-T maxtimeout]");
-        System.exit(1);
-    }
-}
diff --git a/db/rpc_server/java/Timer.java b/db/rpc_server/java/Timer.java
deleted file mode 100644
index 469ad1ad4..000000000
--- a/db/rpc_server/java/Timer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: Timer.java,v 1.4 2004/04/06 20:43:42 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-/**
- * Class to keep track of access times. This is slightly devious by having
- * both the access_time and a reference to another Timer that can be
- * used to group/share access times. This is done to keep the Java code
- * close to the canonical C implementation of the RPC server.
- */
-public class Timer {
-    Timer timer = this;
-    long last_access;
-}
diff --git a/db/rpc_server/java/Util.java b/db/rpc_server/java/Util.java
deleted file mode 100644
index cd7797fa7..000000000
--- a/db/rpc_server/java/Util.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2004
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: Util.java,v 1.6 2004/11/05 00:42:41 mjc Exp $
- */
-
-package com.sleepycat.db.rpcserver;
-
-import java.io.FileNotFoundException;
-
-import com.sleepycat.db.*;
-import com.sleepycat.db.internal.DbConstants;
-
-/**
- * Helper methods for Java API <-> C API mapping
- */
-public class Util {
-    static int handleException(Throwable t) {
-        int ret = Server.EINVAL;
-
-        if (t instanceof DatabaseException) {
-            ret = ((DatabaseException)t).getErrno();
-            if (ret == DbConstants.DB_LOCK_NOTGRANTED)
-                ret = DbConstants.DB_LOCK_DEADLOCK;
-        } else if (t instanceof FileNotFoundException)
-            ret = Server.ENOENT;
-
-        t.printStackTrace(Server.err);
-        Server.err.println("handleException(" + t + ") returned " + ret);
-        return ret;
-    }
-
-    static int notSupported(String meth) {
-        Server.err.println("Unsupported functionality with JE: " + meth);
-        return Server.EINVAL;
-    }
-
-    static int ignored(String meth) {
-        Server.err.println("Warning functionality ignored with JE: " + meth);
-        return 0;
-    }
-
-    static DatabaseEntry makeDatabaseEntry(byte[] data, int dlen, int doff, int ulen, int flags, int multiFlags) throws DatabaseException {
-        DatabaseEntry dbt;
-        switch (multiFlags) {
-        case DbConstants.DB_MULTIPLE:
-            dbt = new MultipleDataEntry(new byte[ulen]);
-            break;
-        case DbConstants.DB_MULTIPLE_KEY:
-            dbt = new MultipleKeyDataEntry(new byte[ulen]);
-            break;
-        default:
-            dbt = new DatabaseEntry(data);
-            break;
-        }
-        dbt.setPartial(doff, dlen, (flags & DbConstants.DB_DBT_PARTIAL) != 0);
-        return dbt;
-    }
-
-    static DatabaseEntry makeDatabaseEntry(byte[] data, int dlen, int doff, int ulen, int flags) throws DatabaseException {
-        return makeDatabaseEntry(data, dlen, doff, ulen, flags, 0);
-    }
-
-    static byte[] returnDatabaseEntry(DatabaseEntry dbt) throws DatabaseException {
-        if (dbt.getData().length == dbt.getSize())
-            return dbt.getData();
-        else {
-            byte[] newdata = new byte[dbt.getSize()];
-            System.arraycopy(dbt.getData(), 0, newdata, 0, dbt.getSize());
-            return newdata;
-        }
-    }
-
-    private static final String separator = ":::";
-
-    static String makeFileName(String file, String database) {
-        return null;
-    }
-
-    static String makeDatabaseName(String file, String database) {
-        if (file == null && database == null)
-            return null;
-        else if (database.length() == 0 && file.indexOf(separator) >= 0)
-            return file;
-        return file + separator + database;
-    }
-
-    static String makeRenameTarget(String file, String database, String newname) {
-        if (database.length() == 0)
-            return makeDatabaseName(newname, database);
-        else
-            return makeDatabaseName(file, newname);
-    }
-
-    static String getFileName(String fullname) {
-        if (fullname == null)
-            return null;
-        int pos = fullname.indexOf(separator);
-        return fullname.substring(0, pos);
-    }
-
-    static String getDatabaseName(String fullname) {
-        if (fullname == null)
-            return null;
-        int pos = fullname.indexOf(separator);
-        return fullname.substring(pos + separator.length());
-    }
-
-    static LockMode getLockMode(int flags) {
-        switch(flags & Server.DB_MODIFIER_MASK) {
-        case DbConstants.DB_DIRTY_READ:
-            return LockMode.DIRTY_READ;
-        case DbConstants.DB_DEGREE_2:
-            return LockMode.DEGREE_2;
-        case DbConstants.DB_RMW:
-            return LockMode.RMW;
-        default:
-            return LockMode.DEFAULT;
-        }
-    }
-
-    static int getStatus(OperationStatus status) {
-        if (status == OperationStatus.SUCCESS)
-            return 0;
-        else if (status == OperationStatus.KEYEXIST)
-            return DbConstants.DB_KEYEXIST;
-        else if (status == OperationStatus.KEYEMPTY)
-            return DbConstants.DB_KEYEMPTY;
-        else if (status == OperationStatus.NOTFOUND)
-            return DbConstants.DB_NOTFOUND;
-        else
-            throw new IllegalArgumentException("Unknown status: " + status);
-    }
-
-    static int fromDatabaseType(DatabaseType type) {
-        if (type == DatabaseType.BTREE)
-            return DbConstants.DB_BTREE;
-        else if (type == DatabaseType.HASH)
-            return DbConstants.DB_HASH;
-        else if (type == DatabaseType.QUEUE)
-            return DbConstants.DB_QUEUE;
-        else if (type == DatabaseType.RECNO)
-            return DbConstants.DB_RECNO;
-        else
-            throw new
-                IllegalArgumentException("Unknown database type: " + type);
-    }
-
-    static DatabaseType toDatabaseType(int type) {
-        switch (type) {
-        case DbConstants.DB_BTREE:
-            return DatabaseType.BTREE;
-        case DbConstants.DB_HASH:
-            return DatabaseType.HASH;
-        case DbConstants.DB_QUEUE:
-            return DatabaseType.QUEUE;
-        case DbConstants.DB_RECNO:
-            return DatabaseType.RECNO;
-        case DbConstants.DB_UNKNOWN:
-            return DatabaseType.UNKNOWN;
-        default:
-            throw new IllegalArgumentException("Unknown database type ID: " + type);
-        }
-    }
-
-    // Utility classes should not have a public or default constructor
-    protected Util() {
-    }
-}
diff --git a/db/rpc_server/java/gen/ServerStubs.java b/db/rpc_server/java/gen/ServerStubs.java
deleted file mode 100644
index 48e24f179..000000000
--- a/db/rpc_server/java/gen/ServerStubs.java
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 4/6/04 2:22 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-import org.acplt.oncrpc.server.*;
-
-/**
- */
-public abstract class ServerStubs extends OncRpcServerStub implements OncRpcDispatchable {
-
-    public ServerStubs()
-           throws OncRpcException, IOException {
-        this(0);
-    }
-
-    public ServerStubs(int port)
-           throws OncRpcException, IOException {
-        info = new OncRpcServerTransportRegistrationInfo [] {
-            new OncRpcServerTransportRegistrationInfo(db_server.DB_RPC_SERVERPROG, 4003),
-        };
-        transports = new OncRpcServerTransport [] {
-            new OncRpcUdpServerTransport(this, port, info, 32768),
-            new OncRpcTcpServerTransport(this, port, info, 32768)
-        };
-    }
-
-    public void dispatchOncRpcCall(OncRpcCallInformation call, int program, int version, int procedure)
-           throws OncRpcException, IOException {
-        if ( version == 4003 ) {
-            switch ( procedure ) {
-            case 1: {
-                __env_get_cachesize_msg args$ = new __env_get_cachesize_msg();
-                call.retrieveCall(args$);
-                __env_get_cachesize_reply result$ = __DB_env_get_cachesize_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 2: {
-                __env_cachesize_msg args$ = new __env_cachesize_msg();
-                call.retrieveCall(args$);
-                __env_cachesize_reply result$ = __DB_env_cachesize_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 3: {
-                __env_close_msg args$ = new __env_close_msg();
-                call.retrieveCall(args$);
-                __env_close_reply result$ = __DB_env_close_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 4: {
-                __env_create_msg args$ = new __env_create_msg();
-                call.retrieveCall(args$);
-                __env_create_reply result$ = __DB_env_create_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 5: {
-                __env_dbremove_msg args$ = new __env_dbremove_msg();
-                call.retrieveCall(args$);
-                __env_dbremove_reply result$ = __DB_env_dbremove_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 6: {
-                __env_dbrename_msg args$ = new __env_dbrename_msg();
-                call.retrieveCall(args$);
-                __env_dbrename_reply result$ = __DB_env_dbrename_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 7: {
-                __env_get_encrypt_flags_msg args$ = new __env_get_encrypt_flags_msg();
-                call.retrieveCall(args$);
-                __env_get_encrypt_flags_reply result$ = __DB_env_get_encrypt_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 8: {
-                __env_encrypt_msg args$ = new __env_encrypt_msg();
-                call.retrieveCall(args$);
-                __env_encrypt_reply result$ = __DB_env_encrypt_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 9: {
-                __env_get_flags_msg args$ = new __env_get_flags_msg();
-                call.retrieveCall(args$);
-                __env_get_flags_reply result$ = __DB_env_get_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 10: {
-                __env_flags_msg args$ = new __env_flags_msg();
-                call.retrieveCall(args$);
-                __env_flags_reply result$ = __DB_env_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 11: {
-                __env_get_home_msg args$ = new __env_get_home_msg();
-                call.retrieveCall(args$);
-                __env_get_home_reply result$ = __DB_env_get_home_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 12: {
-                __env_get_open_flags_msg args$ = new __env_get_open_flags_msg();
-                call.retrieveCall(args$);
-                __env_get_open_flags_reply result$ = __DB_env_get_open_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 13: {
-                __env_open_msg args$ = new __env_open_msg();
-                call.retrieveCall(args$);
-                __env_open_reply result$ = __DB_env_open_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 14: {
-                __env_remove_msg args$ = new __env_remove_msg();
-                call.retrieveCall(args$);
-                __env_remove_reply result$ = __DB_env_remove_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 15: {
-                __txn_abort_msg args$ = new __txn_abort_msg();
-                call.retrieveCall(args$);
-                __txn_abort_reply result$ = __DB_txn_abort_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 16: {
-                __txn_begin_msg args$ = new __txn_begin_msg();
-                call.retrieveCall(args$);
-                __txn_begin_reply result$ = __DB_txn_begin_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 17: {
-                __txn_commit_msg args$ = new __txn_commit_msg();
-                call.retrieveCall(args$);
-                __txn_commit_reply result$ = __DB_txn_commit_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 18: {
-                __txn_discard_msg args$ = new __txn_discard_msg();
-                call.retrieveCall(args$);
-                __txn_discard_reply result$ = __DB_txn_discard_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 19: {
-                __txn_prepare_msg args$ = new __txn_prepare_msg();
-                call.retrieveCall(args$);
-                __txn_prepare_reply result$ = __DB_txn_prepare_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 20: {
-                __txn_recover_msg args$ = new __txn_recover_msg();
-                call.retrieveCall(args$);
-                __txn_recover_reply result$ = __DB_txn_recover_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 21: {
-                __db_associate_msg args$ = new __db_associate_msg();
-                call.retrieveCall(args$);
-                __db_associate_reply result$ = __DB_db_associate_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 22: {
-                __db_bt_maxkey_msg args$ = new __db_bt_maxkey_msg();
-                call.retrieveCall(args$);
-                __db_bt_maxkey_reply result$ = __DB_db_bt_maxkey_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 23: {
-                __db_get_bt_minkey_msg args$ = new __db_get_bt_minkey_msg();
-                call.retrieveCall(args$);
-                __db_get_bt_minkey_reply result$ = __DB_db_get_bt_minkey_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 24: {
-                __db_bt_minkey_msg args$ = new __db_bt_minkey_msg();
-                call.retrieveCall(args$);
-                __db_bt_minkey_reply result$ = __DB_db_bt_minkey_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 25: {
-                __db_close_msg args$ = new __db_close_msg();
-                call.retrieveCall(args$);
-                __db_close_reply result$ = __DB_db_close_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 26: {
-                __db_create_msg args$ = new __db_create_msg();
-                call.retrieveCall(args$);
-                __db_create_reply result$ = __DB_db_create_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 27: {
-                __db_del_msg args$ = new __db_del_msg();
-                call.retrieveCall(args$);
-                __db_del_reply result$ = __DB_db_del_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 28: {
-                __db_get_encrypt_flags_msg args$ = new __db_get_encrypt_flags_msg();
-                call.retrieveCall(args$);
-                __db_get_encrypt_flags_reply result$ = __DB_db_get_encrypt_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 29: {
-                __db_encrypt_msg args$ = new __db_encrypt_msg();
-                call.retrieveCall(args$);
-                __db_encrypt_reply result$ = __DB_db_encrypt_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 30: {
-                __db_get_extentsize_msg args$ = new __db_get_extentsize_msg();
-                call.retrieveCall(args$);
-                __db_get_extentsize_reply result$ = __DB_db_get_extentsize_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 31: {
-                __db_extentsize_msg args$ = new __db_extentsize_msg();
-                call.retrieveCall(args$);
-                __db_extentsize_reply result$ = __DB_db_extentsize_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 32: {
-                __db_get_flags_msg args$ = new __db_get_flags_msg();
-                call.retrieveCall(args$);
-                __db_get_flags_reply result$ = __DB_db_get_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 33: {
-                __db_flags_msg args$ = new __db_flags_msg();
-                call.retrieveCall(args$);
-                __db_flags_reply result$ = __DB_db_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 34: {
-                __db_get_msg args$ = new __db_get_msg();
-                call.retrieveCall(args$);
-                __db_get_reply result$ = __DB_db_get_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 35: {
-                __db_get_name_msg args$ = new __db_get_name_msg();
-                call.retrieveCall(args$);
-                __db_get_name_reply result$ = __DB_db_get_name_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 36: {
-                __db_get_open_flags_msg args$ = new __db_get_open_flags_msg();
-                call.retrieveCall(args$);
-                __db_get_open_flags_reply result$ = __DB_db_get_open_flags_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 37: {
-                __db_get_h_ffactor_msg args$ = new __db_get_h_ffactor_msg();
-                call.retrieveCall(args$);
-                __db_get_h_ffactor_reply result$ = __DB_db_get_h_ffactor_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 38: {
-                __db_h_ffactor_msg args$ = new __db_h_ffactor_msg();
-                call.retrieveCall(args$);
-                __db_h_ffactor_reply result$ = __DB_db_h_ffactor_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 39: {
-                __db_get_h_nelem_msg args$ = new __db_get_h_nelem_msg();
-                call.retrieveCall(args$);
-                __db_get_h_nelem_reply result$ = __DB_db_get_h_nelem_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 40: {
-                __db_h_nelem_msg args$ = new __db_h_nelem_msg();
-                call.retrieveCall(args$);
-                __db_h_nelem_reply result$ = __DB_db_h_nelem_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 41: {
-                __db_key_range_msg args$ = new __db_key_range_msg();
-                call.retrieveCall(args$);
-                __db_key_range_reply result$ = __DB_db_key_range_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 42: {
-                __db_get_lorder_msg args$ = new __db_get_lorder_msg();
-                call.retrieveCall(args$);
-                __db_get_lorder_reply result$ = __DB_db_get_lorder_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 43: {
-                __db_lorder_msg args$ = new __db_lorder_msg();
-                call.retrieveCall(args$);
-                __db_lorder_reply result$ = __DB_db_lorder_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 44: {
-                __db_open_msg args$ = new __db_open_msg();
-                call.retrieveCall(args$);
-                __db_open_reply result$ = __DB_db_open_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 45: {
-                __db_get_pagesize_msg args$ = new __db_get_pagesize_msg();
-                call.retrieveCall(args$);
-                __db_get_pagesize_reply result$ = __DB_db_get_pagesize_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 46: {
-                __db_pagesize_msg args$ = new __db_pagesize_msg();
-                call.retrieveCall(args$);
-                __db_pagesize_reply result$ = __DB_db_pagesize_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 47: {
-                __db_pget_msg args$ = new __db_pget_msg();
-                call.retrieveCall(args$);
-                __db_pget_reply result$ = __DB_db_pget_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 48: {
-                __db_put_msg args$ = new __db_put_msg();
-                call.retrieveCall(args$);
-                __db_put_reply result$ = __DB_db_put_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 49: {
-                __db_get_re_delim_msg args$ = new __db_get_re_delim_msg();
-                call.retrieveCall(args$);
-                __db_get_re_delim_reply result$ = __DB_db_get_re_delim_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 50: {
-                __db_re_delim_msg args$ = new __db_re_delim_msg();
-                call.retrieveCall(args$);
-                __db_re_delim_reply result$ = __DB_db_re_delim_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 51: {
-                __db_get_re_len_msg args$ = new __db_get_re_len_msg();
-                call.retrieveCall(args$);
-                __db_get_re_len_reply result$ = __DB_db_get_re_len_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 52: {
-                __db_re_len_msg args$ = new __db_re_len_msg();
-                call.retrieveCall(args$);
-                __db_re_len_reply result$ = __DB_db_re_len_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 53: {
-                __db_re_pad_msg args$ = new __db_re_pad_msg();
-                call.retrieveCall(args$);
-                __db_re_pad_reply result$ = __DB_db_re_pad_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 54: {
-                __db_get_re_pad_msg args$ = new __db_get_re_pad_msg();
-                call.retrieveCall(args$);
-                __db_get_re_pad_reply result$ = __DB_db_get_re_pad_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 55: {
-                __db_remove_msg args$ = new __db_remove_msg();
-                call.retrieveCall(args$);
-                __db_remove_reply result$ = __DB_db_remove_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 56: {
-                __db_rename_msg args$ = new __db_rename_msg();
-                call.retrieveCall(args$);
-                __db_rename_reply result$ = __DB_db_rename_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 57: {
-                __db_stat_msg args$ = new __db_stat_msg();
-                call.retrieveCall(args$);
-                __db_stat_reply result$ = __DB_db_stat_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 58: {
-                __db_sync_msg args$ = new __db_sync_msg();
-                call.retrieveCall(args$);
-                __db_sync_reply result$ = __DB_db_sync_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 59: {
-                __db_truncate_msg args$ = new __db_truncate_msg();
-                call.retrieveCall(args$);
-                __db_truncate_reply result$ = __DB_db_truncate_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 60: {
-                __db_cursor_msg args$ = new __db_cursor_msg();
-                call.retrieveCall(args$);
-                __db_cursor_reply result$ = __DB_db_cursor_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 61: {
-                __db_join_msg args$ = new __db_join_msg();
-                call.retrieveCall(args$);
-                __db_join_reply result$ = __DB_db_join_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 62: {
-                __dbc_close_msg args$ = new __dbc_close_msg();
-                call.retrieveCall(args$);
-                __dbc_close_reply result$ = __DB_dbc_close_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 63: {
-                __dbc_count_msg args$ = new __dbc_count_msg();
-                call.retrieveCall(args$);
-                __dbc_count_reply result$ = __DB_dbc_count_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 64: {
-                __dbc_del_msg args$ = new __dbc_del_msg();
-                call.retrieveCall(args$);
-                __dbc_del_reply result$ = __DB_dbc_del_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 65: {
-                __dbc_dup_msg args$ = new __dbc_dup_msg();
-                call.retrieveCall(args$);
-                __dbc_dup_reply result$ = __DB_dbc_dup_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 66: {
-                __dbc_get_msg args$ = new __dbc_get_msg();
-                call.retrieveCall(args$);
-                __dbc_get_reply result$ = __DB_dbc_get_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 67: {
-                __dbc_pget_msg args$ = new __dbc_pget_msg();
-                call.retrieveCall(args$);
-                __dbc_pget_reply result$ = __DB_dbc_pget_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            case 68: {
-                __dbc_put_msg args$ = new __dbc_put_msg();
-                call.retrieveCall(args$);
-                __dbc_put_reply result$ = __DB_dbc_put_4003(args$);
-                call.reply(result$);
-                break;
-            }
-            default:
-                call.failProcedureUnavailable();
-            }
-        } else {
-            call.failProcedureUnavailable();
-        }
-    }
-
-    public abstract __env_get_cachesize_reply __DB_env_get_cachesize_4003(__env_get_cachesize_msg arg1);
-
-    public abstract __env_cachesize_reply __DB_env_cachesize_4003(__env_cachesize_msg arg1);
-
-    public abstract __env_close_reply __DB_env_close_4003(__env_close_msg arg1);
-
-    public abstract __env_create_reply __DB_env_create_4003(__env_create_msg arg1);
-
-    public abstract __env_dbremove_reply __DB_env_dbremove_4003(__env_dbremove_msg arg1);
-
-    public abstract __env_dbrename_reply __DB_env_dbrename_4003(__env_dbrename_msg arg1);
-
-    public abstract __env_get_encrypt_flags_reply __DB_env_get_encrypt_flags_4003(__env_get_encrypt_flags_msg arg1);
-
-    public abstract __env_encrypt_reply __DB_env_encrypt_4003(__env_encrypt_msg arg1);
-
-    public abstract __env_get_flags_reply __DB_env_get_flags_4003(__env_get_flags_msg arg1);
-
-    public abstract __env_flags_reply __DB_env_flags_4003(__env_flags_msg arg1);
-
-    public abstract __env_get_home_reply __DB_env_get_home_4003(__env_get_home_msg arg1);
-
-    public abstract __env_get_open_flags_reply __DB_env_get_open_flags_4003(__env_get_open_flags_msg arg1);
-
-    public abstract __env_open_reply __DB_env_open_4003(__env_open_msg arg1);
-
-    public abstract __env_remove_reply __DB_env_remove_4003(__env_remove_msg arg1);
-
-    public abstract __txn_abort_reply __DB_txn_abort_4003(__txn_abort_msg arg1);
-
-    public abstract __txn_begin_reply __DB_txn_begin_4003(__txn_begin_msg arg1);
-
-    public abstract __txn_commit_reply __DB_txn_commit_4003(__txn_commit_msg arg1);
-
-    public abstract __txn_discard_reply __DB_txn_discard_4003(__txn_discard_msg arg1);
-
-    public abstract __txn_prepare_reply __DB_txn_prepare_4003(__txn_prepare_msg arg1);
-
-    public abstract __txn_recover_reply __DB_txn_recover_4003(__txn_recover_msg arg1);
-
-    public abstract __db_associate_reply __DB_db_associate_4003(__db_associate_msg arg1);
-
-    public abstract __db_bt_maxkey_reply __DB_db_bt_maxkey_4003(__db_bt_maxkey_msg arg1);
-
-    public abstract __db_get_bt_minkey_reply __DB_db_get_bt_minkey_4003(__db_get_bt_minkey_msg arg1);
-
-    public abstract __db_bt_minkey_reply __DB_db_bt_minkey_4003(__db_bt_minkey_msg arg1);
-
-    public abstract __db_close_reply __DB_db_close_4003(__db_close_msg arg1);
-
-    public abstract __db_create_reply __DB_db_create_4003(__db_create_msg arg1);
-
-    public abstract __db_del_reply __DB_db_del_4003(__db_del_msg arg1);
-
-    public abstract __db_get_encrypt_flags_reply __DB_db_get_encrypt_flags_4003(__db_get_encrypt_flags_msg arg1);
-
-    public abstract __db_encrypt_reply __DB_db_encrypt_4003(__db_encrypt_msg arg1);
-
-    public abstract __db_get_extentsize_reply __DB_db_get_extentsize_4003(__db_get_extentsize_msg arg1);
-
-    public abstract __db_extentsize_reply __DB_db_extentsize_4003(__db_extentsize_msg arg1);
-
-    public abstract __db_get_flags_reply __DB_db_get_flags_4003(__db_get_flags_msg arg1);
-
-    public abstract __db_flags_reply __DB_db_flags_4003(__db_flags_msg arg1);
-
-    public abstract __db_get_reply __DB_db_get_4003(__db_get_msg arg1);
-
-    public abstract __db_get_name_reply __DB_db_get_name_4003(__db_get_name_msg arg1);
-
-    public abstract __db_get_open_flags_reply __DB_db_get_open_flags_4003(__db_get_open_flags_msg arg1);
-
-    public abstract __db_get_h_ffactor_reply __DB_db_get_h_ffactor_4003(__db_get_h_ffactor_msg arg1);
-
-    public abstract __db_h_ffactor_reply __DB_db_h_ffactor_4003(__db_h_ffactor_msg arg1);
-
-    public abstract __db_get_h_nelem_reply __DB_db_get_h_nelem_4003(__db_get_h_nelem_msg arg1);
-
-    public abstract __db_h_nelem_reply __DB_db_h_nelem_4003(__db_h_nelem_msg arg1);
-
-    public abstract __db_key_range_reply __DB_db_key_range_4003(__db_key_range_msg arg1);
-
-    public abstract __db_get_lorder_reply __DB_db_get_lorder_4003(__db_get_lorder_msg arg1);
-
-    public abstract __db_lorder_reply __DB_db_lorder_4003(__db_lorder_msg arg1);
-
-    public abstract __db_open_reply __DB_db_open_4003(__db_open_msg arg1);
-
-    public abstract __db_get_pagesize_reply __DB_db_get_pagesize_4003(__db_get_pagesize_msg arg1);
-
-    public abstract __db_pagesize_reply __DB_db_pagesize_4003(__db_pagesize_msg arg1);
-
-    public abstract __db_pget_reply __DB_db_pget_4003(__db_pget_msg arg1);
-
-    public abstract __db_put_reply __DB_db_put_4003(__db_put_msg arg1);
-
-    public abstract __db_get_re_delim_reply __DB_db_get_re_delim_4003(__db_get_re_delim_msg arg1);
-
-    public abstract __db_re_delim_reply __DB_db_re_delim_4003(__db_re_delim_msg arg1);
-
-    public abstract __db_get_re_len_reply __DB_db_get_re_len_4003(__db_get_re_len_msg arg1);
-
-    public abstract __db_re_len_reply __DB_db_re_len_4003(__db_re_len_msg arg1);
-
-    public abstract __db_re_pad_reply __DB_db_re_pad_4003(__db_re_pad_msg arg1);
-
-    public abstract __db_get_re_pad_reply __DB_db_get_re_pad_4003(__db_get_re_pad_msg arg1);
-
-    public abstract __db_remove_reply __DB_db_remove_4003(__db_remove_msg arg1);
-
-    public abstract __db_rename_reply __DB_db_rename_4003(__db_rename_msg arg1);
-
-    public abstract __db_stat_reply __DB_db_stat_4003(__db_stat_msg arg1);
-
-    public abstract __db_sync_reply __DB_db_sync_4003(__db_sync_msg arg1);
-
-    public abstract __db_truncate_reply __DB_db_truncate_4003(__db_truncate_msg arg1);
-
-    public abstract __db_cursor_reply __DB_db_cursor_4003(__db_cursor_msg arg1);
-
-    public abstract __db_join_reply __DB_db_join_4003(__db_join_msg arg1);
-
-    public abstract __dbc_close_reply __DB_dbc_close_4003(__dbc_close_msg arg1);
-
-    public abstract __dbc_count_reply __DB_dbc_count_4003(__dbc_count_msg arg1);
-
-    public abstract __dbc_del_reply __DB_dbc_del_4003(__dbc_del_msg arg1);
-
-    public abstract __dbc_dup_reply __DB_dbc_dup_4003(__dbc_dup_msg arg1);
-
-    public abstract __dbc_get_reply __DB_dbc_get_4003(__dbc_get_msg arg1);
-
-    public abstract __dbc_pget_reply __DB_dbc_pget_4003(__dbc_pget_msg arg1);
-
-    public abstract __dbc_put_reply __DB_dbc_put_4003(__dbc_put_msg arg1);
-
-}
-// End of ServerStubs.java
diff --git a/db/rpc_server/java/gen/__db_associate_msg.java b/db/rpc_server/java/gen/__db_associate_msg.java
deleted file mode 100644
index 8977303b9..000000000
--- a/db/rpc_server/java/gen/__db_associate_msg.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 4/25/02 11:01 AM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_associate_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int sdbpcl_id;
-    public int flags;
-
-    public __db_associate_msg() {
-    }
-
-    public __db_associate_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(sdbpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        sdbpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_associate_msg.java
diff --git a/db/rpc_server/java/gen/__db_associate_reply.java b/db/rpc_server/java/gen/__db_associate_reply.java
deleted file mode 100644
index 476d0868b..000000000
--- a/db/rpc_server/java/gen/__db_associate_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_associate_reply implements XdrAble {
-    public int status;
-
-    public __db_associate_reply() {
-    }
-
-    public __db_associate_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_associate_reply.java
diff --git a/db/rpc_server/java/gen/__db_bt_maxkey_msg.java b/db/rpc_server/java/gen/__db_bt_maxkey_msg.java
deleted file mode 100644
index 007ce16a9..000000000
--- a/db/rpc_server/java/gen/__db_bt_maxkey_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_bt_maxkey_msg implements XdrAble {
-    public int dbpcl_id;
-    public int maxkey;
-
-    public __db_bt_maxkey_msg() {
-    }
-
-    public __db_bt_maxkey_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(maxkey);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        maxkey = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_bt_maxkey_msg.java
diff --git a/db/rpc_server/java/gen/__db_bt_maxkey_reply.java b/db/rpc_server/java/gen/__db_bt_maxkey_reply.java
deleted file mode 100644
index 855573271..000000000
--- a/db/rpc_server/java/gen/__db_bt_maxkey_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_bt_maxkey_reply implements XdrAble {
-    public int status;
-
-    public __db_bt_maxkey_reply() {
-    }
-
-    public __db_bt_maxkey_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_bt_maxkey_reply.java
diff --git a/db/rpc_server/java/gen/__db_bt_minkey_msg.java b/db/rpc_server/java/gen/__db_bt_minkey_msg.java
deleted file mode 100644
index c86ec3824..000000000
--- a/db/rpc_server/java/gen/__db_bt_minkey_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_bt_minkey_msg implements XdrAble {
-    public int dbpcl_id;
-    public int minkey;
-
-    public __db_bt_minkey_msg() {
-    }
-
-    public __db_bt_minkey_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(minkey);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        minkey = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_bt_minkey_msg.java
diff --git a/db/rpc_server/java/gen/__db_bt_minkey_reply.java b/db/rpc_server/java/gen/__db_bt_minkey_reply.java
deleted file mode 100644
index 4d944b6bf..000000000
--- a/db/rpc_server/java/gen/__db_bt_minkey_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_bt_minkey_reply implements XdrAble {
-    public int status;
-
-    public __db_bt_minkey_reply() {
-    }
-
-    public __db_bt_minkey_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_bt_minkey_reply.java
diff --git a/db/rpc_server/java/gen/__db_close_msg.java b/db/rpc_server/java/gen/__db_close_msg.java
deleted file mode 100644
index ce8d21370..000000000
--- a/db/rpc_server/java/gen/__db_close_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_close_msg implements XdrAble {
-    public int dbpcl_id;
-    public int flags;
-
-    public __db_close_msg() {
-    }
-
-    public __db_close_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_close_msg.java
diff --git a/db/rpc_server/java/gen/__db_close_reply.java b/db/rpc_server/java/gen/__db_close_reply.java
deleted file mode 100644
index a9380e9c0..000000000
--- a/db/rpc_server/java/gen/__db_close_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_close_reply implements XdrAble {
-    public int status;
-
-    public __db_close_reply() {
-    }
-
-    public __db_close_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_close_reply.java
diff --git a/db/rpc_server/java/gen/__db_create_msg.java b/db/rpc_server/java/gen/__db_create_msg.java
deleted file mode 100644
index d21ca50f8..000000000
--- a/db/rpc_server/java/gen/__db_create_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_create_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int flags;
-
-    public __db_create_msg() {
-    }
-
-    public __db_create_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_create_msg.java
diff --git a/db/rpc_server/java/gen/__db_create_reply.java b/db/rpc_server/java/gen/__db_create_reply.java
deleted file mode 100644
index e3dcbbab1..000000000
--- a/db/rpc_server/java/gen/__db_create_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_create_reply implements XdrAble {
-    public int status;
-    public int dbcl_id;
-
-    public __db_create_reply() {
-    }
-
-    public __db_create_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(dbcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        dbcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_create_reply.java
diff --git a/db/rpc_server/java/gen/__db_cursor_msg.java b/db/rpc_server/java/gen/__db_cursor_msg.java
deleted file mode 100644
index 60e09db6e..000000000
--- a/db/rpc_server/java/gen/__db_cursor_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_cursor_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int flags;
-
-    public __db_cursor_msg() {
-    }
-
-    public __db_cursor_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_cursor_msg.java
diff --git a/db/rpc_server/java/gen/__db_cursor_reply.java b/db/rpc_server/java/gen/__db_cursor_reply.java
deleted file mode 100644
index bafd2817c..000000000
--- a/db/rpc_server/java/gen/__db_cursor_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_cursor_reply implements XdrAble {
-    public int status;
-    public int dbcidcl_id;
-
-    public __db_cursor_reply() {
-    }
-
-    public __db_cursor_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(dbcidcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        dbcidcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_cursor_reply.java
diff --git a/db/rpc_server/java/gen/__db_del_msg.java b/db/rpc_server/java/gen/__db_del_msg.java
deleted file mode 100644
index fdf47907d..000000000
--- a/db/rpc_server/java/gen/__db_del_msg.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_del_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int keydlen;
-    public int keydoff;
-    public int keyulen;
-    public int keyflags;
-    public byte [] keydata;
-    public int flags;
-
-    public __db_del_msg() {
-    }
-
-    public __db_del_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(keydlen);
-        xdr.xdrEncodeInt(keydoff);
-        xdr.xdrEncodeInt(keyulen);
-        xdr.xdrEncodeInt(keyflags);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        keydlen = xdr.xdrDecodeInt();
-        keydoff = xdr.xdrDecodeInt();
-        keyulen = xdr.xdrDecodeInt();
-        keyflags = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_del_msg.java
diff --git a/db/rpc_server/java/gen/__db_del_reply.java b/db/rpc_server/java/gen/__db_del_reply.java
deleted file mode 100644
index 8a5544594..000000000
--- a/db/rpc_server/java/gen/__db_del_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_del_reply implements XdrAble {
-    public int status;
-
-    public __db_del_reply() {
-    }
-
-    public __db_del_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_del_reply.java
diff --git a/db/rpc_server/java/gen/__db_encrypt_msg.java b/db/rpc_server/java/gen/__db_encrypt_msg.java
deleted file mode 100644
index 46d9f8ee7..000000000
--- a/db/rpc_server/java/gen/__db_encrypt_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 2/13/02 1:05 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_encrypt_msg implements XdrAble {
-    public int dbpcl_id;
-    public String passwd;
-    public int flags;
-
-    public __db_encrypt_msg() {
-    }
-
-    public __db_encrypt_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeString(passwd);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        passwd = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_encrypt_msg.java
diff --git a/db/rpc_server/java/gen/__db_encrypt_reply.java b/db/rpc_server/java/gen/__db_encrypt_reply.java
deleted file mode 100644
index a97cc98c9..000000000
--- a/db/rpc_server/java/gen/__db_encrypt_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 2/13/02 1:05 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_encrypt_reply implements XdrAble {
-    public int status;
-
-    public __db_encrypt_reply() {
-    }
-
-    public __db_encrypt_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_encrypt_reply.java
diff --git a/db/rpc_server/java/gen/__db_extentsize_msg.java b/db/rpc_server/java/gen/__db_extentsize_msg.java
deleted file mode 100644
index 41a51cff9..000000000
--- a/db/rpc_server/java/gen/__db_extentsize_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_extentsize_msg implements XdrAble {
-    public int dbpcl_id;
-    public int extentsize;
-
-    public __db_extentsize_msg() {
-    }
-
-    public __db_extentsize_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(extentsize);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        extentsize = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_extentsize_msg.java
diff --git a/db/rpc_server/java/gen/__db_extentsize_reply.java b/db/rpc_server/java/gen/__db_extentsize_reply.java
deleted file mode 100644
index 409625486..000000000
--- a/db/rpc_server/java/gen/__db_extentsize_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_extentsize_reply implements XdrAble {
-    public int status;
-
-    public __db_extentsize_reply() {
-    }
-
-    public __db_extentsize_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_extentsize_reply.java
diff --git a/db/rpc_server/java/gen/__db_flags_msg.java b/db/rpc_server/java/gen/__db_flags_msg.java
deleted file mode 100644
index d8752e2e4..000000000
--- a/db/rpc_server/java/gen/__db_flags_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_flags_msg implements XdrAble {
-    public int dbpcl_id;
-    public int flags;
-
-    public __db_flags_msg() {
-    }
-
-    public __db_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_flags_msg.java
diff --git a/db/rpc_server/java/gen/__db_flags_reply.java b/db/rpc_server/java/gen/__db_flags_reply.java
deleted file mode 100644
index c4ec253db..000000000
--- a/db/rpc_server/java/gen/__db_flags_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_flags_reply implements XdrAble {
-    public int status;
-
-    public __db_flags_reply() {
-    }
-
-    public __db_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_flags_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_bt_minkey_msg.java b/db/rpc_server/java/gen/__db_get_bt_minkey_msg.java
deleted file mode 100644
index 6cf11f930..000000000
--- a/db/rpc_server/java/gen/__db_get_bt_minkey_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_bt_minkey_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_bt_minkey_msg() {
-    }
-
-    public __db_get_bt_minkey_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_bt_minkey_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_bt_minkey_reply.java b/db/rpc_server/java/gen/__db_get_bt_minkey_reply.java
deleted file mode 100644
index 62fd2590e..000000000
--- a/db/rpc_server/java/gen/__db_get_bt_minkey_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_bt_minkey_reply implements XdrAble {
-    public int status;
-    public int minkey;
-
-    public __db_get_bt_minkey_reply() {
-    }
-
-    public __db_get_bt_minkey_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(minkey);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        minkey = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_bt_minkey_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_encrypt_flags_msg.java b/db/rpc_server/java/gen/__db_get_encrypt_flags_msg.java
deleted file mode 100644
index f302b4e27..000000000
--- a/db/rpc_server/java/gen/__db_get_encrypt_flags_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_encrypt_flags_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_encrypt_flags_msg() {
-    }
-
-    public __db_get_encrypt_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_encrypt_flags_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_encrypt_flags_reply.java b/db/rpc_server/java/gen/__db_get_encrypt_flags_reply.java
deleted file mode 100644
index 840112db1..000000000
--- a/db/rpc_server/java/gen/__db_get_encrypt_flags_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_encrypt_flags_reply implements XdrAble {
-    public int status;
-    public int flags;
-
-    public __db_get_encrypt_flags_reply() {
-    }
-
-    public __db_get_encrypt_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_encrypt_flags_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_extentsize_msg.java b/db/rpc_server/java/gen/__db_get_extentsize_msg.java
deleted file mode 100644
index c963be7b3..000000000
--- a/db/rpc_server/java/gen/__db_get_extentsize_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_extentsize_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_extentsize_msg() {
-    }
-
-    public __db_get_extentsize_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_extentsize_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_extentsize_reply.java b/db/rpc_server/java/gen/__db_get_extentsize_reply.java
deleted file mode 100644
index 4f97e35c2..000000000
--- a/db/rpc_server/java/gen/__db_get_extentsize_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_extentsize_reply implements XdrAble {
-    public int status;
-    public int extentsize;
-
-    public __db_get_extentsize_reply() {
-    }
-
-    public __db_get_extentsize_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(extentsize);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        extentsize = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_extentsize_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_flags_msg.java b/db/rpc_server/java/gen/__db_get_flags_msg.java
deleted file mode 100644
index f8a7a0e50..000000000
--- a/db/rpc_server/java/gen/__db_get_flags_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_flags_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_flags_msg() {
-    }
-
-    public __db_get_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_flags_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_flags_reply.java b/db/rpc_server/java/gen/__db_get_flags_reply.java
deleted file mode 100644
index 9c2ac44ee..000000000
--- a/db/rpc_server/java/gen/__db_get_flags_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_flags_reply implements XdrAble {
-    public int status;
-    public int flags;
-
-    public __db_get_flags_reply() {
-    }
-
-    public __db_get_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_flags_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_h_ffactor_msg.java b/db/rpc_server/java/gen/__db_get_h_ffactor_msg.java
deleted file mode 100644
index deb3723aa..000000000
--- a/db/rpc_server/java/gen/__db_get_h_ffactor_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_h_ffactor_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_h_ffactor_msg() {
-    }
-
-    public __db_get_h_ffactor_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_h_ffactor_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_h_ffactor_reply.java b/db/rpc_server/java/gen/__db_get_h_ffactor_reply.java
deleted file mode 100644
index 30b769cb3..000000000
--- a/db/rpc_server/java/gen/__db_get_h_ffactor_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_h_ffactor_reply implements XdrAble {
-    public int status;
-    public int ffactor;
-
-    public __db_get_h_ffactor_reply() {
-    }
-
-    public __db_get_h_ffactor_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(ffactor);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        ffactor = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_h_ffactor_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_h_nelem_msg.java b/db/rpc_server/java/gen/__db_get_h_nelem_msg.java
deleted file mode 100644
index cef259967..000000000
--- a/db/rpc_server/java/gen/__db_get_h_nelem_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_h_nelem_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_h_nelem_msg() {
-    }
-
-    public __db_get_h_nelem_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_h_nelem_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_h_nelem_reply.java b/db/rpc_server/java/gen/__db_get_h_nelem_reply.java
deleted file mode 100644
index c01c329ad..000000000
--- a/db/rpc_server/java/gen/__db_get_h_nelem_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_h_nelem_reply implements XdrAble {
-    public int status;
-    public int nelem;
-
-    public __db_get_h_nelem_reply() {
-    }
-
-    public __db_get_h_nelem_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(nelem);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        nelem = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_h_nelem_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_lorder_msg.java b/db/rpc_server/java/gen/__db_get_lorder_msg.java
deleted file mode 100644
index dc6ca97f5..000000000
--- a/db/rpc_server/java/gen/__db_get_lorder_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_lorder_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_lorder_msg() {
-    }
-
-    public __db_get_lorder_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_lorder_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_lorder_reply.java b/db/rpc_server/java/gen/__db_get_lorder_reply.java
deleted file mode 100644
index e6d302920..000000000
--- a/db/rpc_server/java/gen/__db_get_lorder_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_lorder_reply implements XdrAble {
-    public int status;
-    public int lorder;
-
-    public __db_get_lorder_reply() {
-    }
-
-    public __db_get_lorder_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(lorder);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        lorder = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_lorder_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_msg.java b/db/rpc_server/java/gen/__db_get_msg.java
deleted file mode 100644
index 3dfe8e9d8..000000000
--- a/db/rpc_server/java/gen/__db_get_msg.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int keydlen;
-    public int keydoff;
-    public int keyulen;
-    public int keyflags;
-    public byte [] keydata;
-    public int datadlen;
-    public int datadoff;
-    public int dataulen;
-    public int dataflags;
-    public byte [] datadata;
-    public int flags;
-
-    public __db_get_msg() {
-    }
-
-    public __db_get_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(keydlen);
-        xdr.xdrEncodeInt(keydoff);
-        xdr.xdrEncodeInt(keyulen);
-        xdr.xdrEncodeInt(keyflags);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeInt(datadlen);
-        xdr.xdrEncodeInt(datadoff);
-        xdr.xdrEncodeInt(dataulen);
-        xdr.xdrEncodeInt(dataflags);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        keydlen = xdr.xdrDecodeInt();
-        keydoff = xdr.xdrDecodeInt();
-        keyulen = xdr.xdrDecodeInt();
-        keyflags = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        datadlen = xdr.xdrDecodeInt();
-        datadoff = xdr.xdrDecodeInt();
-        dataulen = xdr.xdrDecodeInt();
-        dataflags = xdr.xdrDecodeInt();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_name_msg.java b/db/rpc_server/java/gen/__db_get_name_msg.java
deleted file mode 100644
index 77008ba3d..000000000
--- a/db/rpc_server/java/gen/__db_get_name_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_name_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_name_msg() {
-    }
-
-    public __db_get_name_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_name_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_name_reply.java b/db/rpc_server/java/gen/__db_get_name_reply.java
deleted file mode 100644
index 853157f47..000000000
--- a/db/rpc_server/java/gen/__db_get_name_reply.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_name_reply implements XdrAble {
-    public int status;
-    public String filename;
-    public String dbname;
-
-    public __db_get_name_reply() {
-    }
-
-    public __db_get_name_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeString(filename);
-        xdr.xdrEncodeString(dbname);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        filename = xdr.xdrDecodeString();
-        dbname = xdr.xdrDecodeString();
-    }
-
-}
-// End of __db_get_name_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_open_flags_msg.java b/db/rpc_server/java/gen/__db_get_open_flags_msg.java
deleted file mode 100644
index 372e07bf0..000000000
--- a/db/rpc_server/java/gen/__db_get_open_flags_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_open_flags_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_open_flags_msg() {
-    }
-
-    public __db_get_open_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_open_flags_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_open_flags_reply.java b/db/rpc_server/java/gen/__db_get_open_flags_reply.java
deleted file mode 100644
index 354b97a69..000000000
--- a/db/rpc_server/java/gen/__db_get_open_flags_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_open_flags_reply implements XdrAble {
-    public int status;
-    public int flags;
-
-    public __db_get_open_flags_reply() {
-    }
-
-    public __db_get_open_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_open_flags_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_pagesize_msg.java b/db/rpc_server/java/gen/__db_get_pagesize_msg.java
deleted file mode 100644
index b8fa483a4..000000000
--- a/db/rpc_server/java/gen/__db_get_pagesize_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_pagesize_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_pagesize_msg() {
-    }
-
-    public __db_get_pagesize_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_pagesize_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_pagesize_reply.java b/db/rpc_server/java/gen/__db_get_pagesize_reply.java
deleted file mode 100644
index 2a1442b9c..000000000
--- a/db/rpc_server/java/gen/__db_get_pagesize_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_pagesize_reply implements XdrAble {
-    public int status;
-    public int pagesize;
-
-    public __db_get_pagesize_reply() {
-    }
-
-    public __db_get_pagesize_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(pagesize);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        pagesize = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_pagesize_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_re_delim_msg.java b/db/rpc_server/java/gen/__db_get_re_delim_msg.java
deleted file mode 100644
index bd0ac3acd..000000000
--- a/db/rpc_server/java/gen/__db_get_re_delim_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_re_delim_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_re_delim_msg() {
-    }
-
-    public __db_get_re_delim_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_re_delim_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_re_delim_reply.java b/db/rpc_server/java/gen/__db_get_re_delim_reply.java
deleted file mode 100644
index 000a44816..000000000
--- a/db/rpc_server/java/gen/__db_get_re_delim_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_re_delim_reply implements XdrAble {
-    public int status;
-    public int delim;
-
-    public __db_get_re_delim_reply() {
-    }
-
-    public __db_get_re_delim_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(delim);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        delim = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_re_delim_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_re_len_msg.java b/db/rpc_server/java/gen/__db_get_re_len_msg.java
deleted file mode 100644
index afc7d7ba6..000000000
--- a/db/rpc_server/java/gen/__db_get_re_len_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_re_len_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_re_len_msg() {
-    }
-
-    public __db_get_re_len_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_re_len_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_re_len_reply.java b/db/rpc_server/java/gen/__db_get_re_len_reply.java
deleted file mode 100644
index 688f75a4b..000000000
--- a/db/rpc_server/java/gen/__db_get_re_len_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_re_len_reply implements XdrAble {
-    public int status;
-    public int len;
-
-    public __db_get_re_len_reply() {
-    }
-
-    public __db_get_re_len_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(len);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        len = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_re_len_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_re_pad_msg.java b/db/rpc_server/java/gen/__db_get_re_pad_msg.java
deleted file mode 100644
index f8678ccce..000000000
--- a/db/rpc_server/java/gen/__db_get_re_pad_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_re_pad_msg implements XdrAble {
-    public int dbpcl_id;
-
-    public __db_get_re_pad_msg() {
-    }
-
-    public __db_get_re_pad_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_re_pad_msg.java
diff --git a/db/rpc_server/java/gen/__db_get_re_pad_reply.java b/db/rpc_server/java/gen/__db_get_re_pad_reply.java
deleted file mode 100644
index 88d682854..000000000
--- a/db/rpc_server/java/gen/__db_get_re_pad_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_re_pad_reply implements XdrAble {
-    public int status;
-    public int pad;
-
-    public __db_get_re_pad_reply() {
-    }
-
-    public __db_get_re_pad_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(pad);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        pad = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_get_re_pad_reply.java
diff --git a/db/rpc_server/java/gen/__db_get_reply.java b/db/rpc_server/java/gen/__db_get_reply.java
deleted file mode 100644
index 64ce52572..000000000
--- a/db/rpc_server/java/gen/__db_get_reply.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_get_reply implements XdrAble {
-    public int status;
-    public byte [] keydata;
-    public byte [] datadata;
-
-    public __db_get_reply() {
-    }
-
-    public __db_get_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-    }
-
-}
-// End of __db_get_reply.java
diff --git a/db/rpc_server/java/gen/__db_h_ffactor_msg.java b/db/rpc_server/java/gen/__db_h_ffactor_msg.java
deleted file mode 100644
index 8d2ed1b1c..000000000
--- a/db/rpc_server/java/gen/__db_h_ffactor_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_h_ffactor_msg implements XdrAble {
-    public int dbpcl_id;
-    public int ffactor;
-
-    public __db_h_ffactor_msg() {
-    }
-
-    public __db_h_ffactor_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(ffactor);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        ffactor = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_h_ffactor_msg.java
diff --git a/db/rpc_server/java/gen/__db_h_ffactor_reply.java b/db/rpc_server/java/gen/__db_h_ffactor_reply.java
deleted file mode 100644
index 1885ec502..000000000
--- a/db/rpc_server/java/gen/__db_h_ffactor_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_h_ffactor_reply implements XdrAble {
-    public int status;
-
-    public __db_h_ffactor_reply() {
-    }
-
-    public __db_h_ffactor_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_h_ffactor_reply.java
diff --git a/db/rpc_server/java/gen/__db_h_nelem_msg.java b/db/rpc_server/java/gen/__db_h_nelem_msg.java
deleted file mode 100644
index 7d0843517..000000000
--- a/db/rpc_server/java/gen/__db_h_nelem_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_h_nelem_msg implements XdrAble {
-    public int dbpcl_id;
-    public int nelem;
-
-    public __db_h_nelem_msg() {
-    }
-
-    public __db_h_nelem_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(nelem);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        nelem = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_h_nelem_msg.java
diff --git a/db/rpc_server/java/gen/__db_h_nelem_reply.java b/db/rpc_server/java/gen/__db_h_nelem_reply.java
deleted file mode 100644
index 20c5c774e..000000000
--- a/db/rpc_server/java/gen/__db_h_nelem_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_h_nelem_reply implements XdrAble {
-    public int status;
-
-    public __db_h_nelem_reply() {
-    }
-
-    public __db_h_nelem_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_h_nelem_reply.java
diff --git a/db/rpc_server/java/gen/__db_join_msg.java b/db/rpc_server/java/gen/__db_join_msg.java
deleted file mode 100644
index 88c72dbd6..000000000
--- a/db/rpc_server/java/gen/__db_join_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_join_msg implements XdrAble {
-    public int dbpcl_id;
-    public int [] curs;
-    public int flags;
-
-    public __db_join_msg() {
-    }
-
-    public __db_join_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeIntVector(curs);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        curs = xdr.xdrDecodeIntVector();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_join_msg.java
diff --git a/db/rpc_server/java/gen/__db_join_reply.java b/db/rpc_server/java/gen/__db_join_reply.java
deleted file mode 100644
index 80980e23d..000000000
--- a/db/rpc_server/java/gen/__db_join_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_join_reply implements XdrAble {
-    public int status;
-    public int dbcidcl_id;
-
-    public __db_join_reply() {
-    }
-
-    public __db_join_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(dbcidcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        dbcidcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_join_reply.java
diff --git a/db/rpc_server/java/gen/__db_key_range_msg.java b/db/rpc_server/java/gen/__db_key_range_msg.java
deleted file mode 100644
index 233077e09..000000000
--- a/db/rpc_server/java/gen/__db_key_range_msg.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_key_range_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int keydlen;
-    public int keydoff;
-    public int keyulen;
-    public int keyflags;
-    public byte [] keydata;
-    public int flags;
-
-    public __db_key_range_msg() {
-    }
-
-    public __db_key_range_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(keydlen);
-        xdr.xdrEncodeInt(keydoff);
-        xdr.xdrEncodeInt(keyulen);
-        xdr.xdrEncodeInt(keyflags);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        keydlen = xdr.xdrDecodeInt();
-        keydoff = xdr.xdrDecodeInt();
-        keyulen = xdr.xdrDecodeInt();
-        keyflags = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_key_range_msg.java
diff --git a/db/rpc_server/java/gen/__db_key_range_reply.java b/db/rpc_server/java/gen/__db_key_range_reply.java
deleted file mode 100644
index 09244c13d..000000000
--- a/db/rpc_server/java/gen/__db_key_range_reply.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_key_range_reply implements XdrAble {
-    public int status;
-    public double less;
-    public double equal;
-    public double greater;
-
-    public __db_key_range_reply() {
-    }
-
-    public __db_key_range_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDouble(less);
-        xdr.xdrEncodeDouble(equal);
-        xdr.xdrEncodeDouble(greater);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        less = xdr.xdrDecodeDouble();
-        equal = xdr.xdrDecodeDouble();
-        greater = xdr.xdrDecodeDouble();
-    }
-
-}
-// End of __db_key_range_reply.java
diff --git a/db/rpc_server/java/gen/__db_lorder_msg.java b/db/rpc_server/java/gen/__db_lorder_msg.java
deleted file mode 100644
index 3399ad8da..000000000
--- a/db/rpc_server/java/gen/__db_lorder_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_lorder_msg implements XdrAble {
-    public int dbpcl_id;
-    public int lorder;
-
-    public __db_lorder_msg() {
-    }
-
-    public __db_lorder_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(lorder);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        lorder = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_lorder_msg.java
diff --git a/db/rpc_server/java/gen/__db_lorder_reply.java b/db/rpc_server/java/gen/__db_lorder_reply.java
deleted file mode 100644
index cdcda4d4f..000000000
--- a/db/rpc_server/java/gen/__db_lorder_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_lorder_reply implements XdrAble {
-    public int status;
-
-    public __db_lorder_reply() {
-    }
-
-    public __db_lorder_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_lorder_reply.java
diff --git a/db/rpc_server/java/gen/__db_open_msg.java b/db/rpc_server/java/gen/__db_open_msg.java
deleted file mode 100644
index 14dbd9e3b..000000000
--- a/db/rpc_server/java/gen/__db_open_msg.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 2/13/02 1:05 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_open_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public String name;
-    public String subdb;
-    public int type;
-    public int flags;
-    public int mode;
-
-    public __db_open_msg() {
-    }
-
-    public __db_open_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeString(name);
-        xdr.xdrEncodeString(subdb);
-        xdr.xdrEncodeInt(type);
-        xdr.xdrEncodeInt(flags);
-        xdr.xdrEncodeInt(mode);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        name = xdr.xdrDecodeString();
-        subdb = xdr.xdrDecodeString();
-        type = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-        mode = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_open_msg.java
diff --git a/db/rpc_server/java/gen/__db_open_reply.java b/db/rpc_server/java/gen/__db_open_reply.java
deleted file mode 100644
index 9b36b44a6..000000000
--- a/db/rpc_server/java/gen/__db_open_reply.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 7/15/04 4:39 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_open_reply implements XdrAble {
-    public int status;
-    public int dbcl_id;
-    public int type;
-    public int lorder;
-
-    public __db_open_reply() {
-    }
-
-    public __db_open_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(dbcl_id);
-        xdr.xdrEncodeInt(type);
-        xdr.xdrEncodeInt(lorder);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        dbcl_id = xdr.xdrDecodeInt();
-        type = xdr.xdrDecodeInt();
-        lorder = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_open_reply.java
diff --git a/db/rpc_server/java/gen/__db_pagesize_msg.java b/db/rpc_server/java/gen/__db_pagesize_msg.java
deleted file mode 100644
index a452ea4e3..000000000
--- a/db/rpc_server/java/gen/__db_pagesize_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_pagesize_msg implements XdrAble {
-    public int dbpcl_id;
-    public int pagesize;
-
-    public __db_pagesize_msg() {
-    }
-
-    public __db_pagesize_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(pagesize);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        pagesize = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_pagesize_msg.java
diff --git a/db/rpc_server/java/gen/__db_pagesize_reply.java b/db/rpc_server/java/gen/__db_pagesize_reply.java
deleted file mode 100644
index 830b2078b..000000000
--- a/db/rpc_server/java/gen/__db_pagesize_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_pagesize_reply implements XdrAble {
-    public int status;
-
-    public __db_pagesize_reply() {
-    }
-
-    public __db_pagesize_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_pagesize_reply.java
diff --git a/db/rpc_server/java/gen/__db_pget_msg.java b/db/rpc_server/java/gen/__db_pget_msg.java
deleted file mode 100644
index 11d27ca9e..000000000
--- a/db/rpc_server/java/gen/__db_pget_msg.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_pget_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int skeydlen;
-    public int skeydoff;
-    public int skeyulen;
-    public int skeyflags;
-    public byte [] skeydata;
-    public int pkeydlen;
-    public int pkeydoff;
-    public int pkeyulen;
-    public int pkeyflags;
-    public byte [] pkeydata;
-    public int datadlen;
-    public int datadoff;
-    public int dataulen;
-    public int dataflags;
-    public byte [] datadata;
-    public int flags;
-
-    public __db_pget_msg() {
-    }
-
-    public __db_pget_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(skeydlen);
-        xdr.xdrEncodeInt(skeydoff);
-        xdr.xdrEncodeInt(skeyulen);
-        xdr.xdrEncodeInt(skeyflags);
-        xdr.xdrEncodeDynamicOpaque(skeydata);
-        xdr.xdrEncodeInt(pkeydlen);
-        xdr.xdrEncodeInt(pkeydoff);
-        xdr.xdrEncodeInt(pkeyulen);
-        xdr.xdrEncodeInt(pkeyflags);
-        xdr.xdrEncodeDynamicOpaque(pkeydata);
-        xdr.xdrEncodeInt(datadlen);
-        xdr.xdrEncodeInt(datadoff);
-        xdr.xdrEncodeInt(dataulen);
-        xdr.xdrEncodeInt(dataflags);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        skeydlen = xdr.xdrDecodeInt();
-        skeydoff = xdr.xdrDecodeInt();
-        skeyulen = xdr.xdrDecodeInt();
-        skeyflags = xdr.xdrDecodeInt();
-        skeydata = xdr.xdrDecodeDynamicOpaque();
-        pkeydlen = xdr.xdrDecodeInt();
-        pkeydoff = xdr.xdrDecodeInt();
-        pkeyulen = xdr.xdrDecodeInt();
-        pkeyflags = xdr.xdrDecodeInt();
-        pkeydata = xdr.xdrDecodeDynamicOpaque();
-        datadlen = xdr.xdrDecodeInt();
-        datadoff = xdr.xdrDecodeInt();
-        dataulen = xdr.xdrDecodeInt();
-        dataflags = xdr.xdrDecodeInt();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_pget_msg.java
diff --git a/db/rpc_server/java/gen/__db_pget_reply.java b/db/rpc_server/java/gen/__db_pget_reply.java
deleted file mode 100644
index 86c9c2111..000000000
--- a/db/rpc_server/java/gen/__db_pget_reply.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_pget_reply implements XdrAble {
-    public int status;
-    public byte [] skeydata;
-    public byte [] pkeydata;
-    public byte [] datadata;
-
-    public __db_pget_reply() {
-    }
-
-    public __db_pget_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDynamicOpaque(skeydata);
-        xdr.xdrEncodeDynamicOpaque(pkeydata);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        skeydata = xdr.xdrDecodeDynamicOpaque();
-        pkeydata = xdr.xdrDecodeDynamicOpaque();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-    }
-
-}
-// End of __db_pget_reply.java
diff --git a/db/rpc_server/java/gen/__db_put_msg.java b/db/rpc_server/java/gen/__db_put_msg.java
deleted file mode 100644
index b6159cff3..000000000
--- a/db/rpc_server/java/gen/__db_put_msg.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_put_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int keydlen;
-    public int keydoff;
-    public int keyulen;
-    public int keyflags;
-    public byte [] keydata;
-    public int datadlen;
-    public int datadoff;
-    public int dataulen;
-    public int dataflags;
-    public byte [] datadata;
-    public int flags;
-
-    public __db_put_msg() {
-    }
-
-    public __db_put_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(keydlen);
-        xdr.xdrEncodeInt(keydoff);
-        xdr.xdrEncodeInt(keyulen);
-        xdr.xdrEncodeInt(keyflags);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeInt(datadlen);
-        xdr.xdrEncodeInt(datadoff);
-        xdr.xdrEncodeInt(dataulen);
-        xdr.xdrEncodeInt(dataflags);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        keydlen = xdr.xdrDecodeInt();
-        keydoff = xdr.xdrDecodeInt();
-        keyulen = xdr.xdrDecodeInt();
-        keyflags = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        datadlen = xdr.xdrDecodeInt();
-        datadoff = xdr.xdrDecodeInt();
-        dataulen = xdr.xdrDecodeInt();
-        dataflags = xdr.xdrDecodeInt();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_put_msg.java
diff --git a/db/rpc_server/java/gen/__db_put_reply.java b/db/rpc_server/java/gen/__db_put_reply.java
deleted file mode 100644
index fc89ae1c3..000000000
--- a/db/rpc_server/java/gen/__db_put_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_put_reply implements XdrAble {
-    public int status;
-    public byte [] keydata;
-
-    public __db_put_reply() {
-    }
-
-    public __db_put_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-    }
-
-}
-// End of __db_put_reply.java
diff --git a/db/rpc_server/java/gen/__db_re_delim_msg.java b/db/rpc_server/java/gen/__db_re_delim_msg.java
deleted file mode 100644
index c386bddd2..000000000
--- a/db/rpc_server/java/gen/__db_re_delim_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_re_delim_msg implements XdrAble {
-    public int dbpcl_id;
-    public int delim;
-
-    public __db_re_delim_msg() {
-    }
-
-    public __db_re_delim_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(delim);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        delim = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_re_delim_msg.java
diff --git a/db/rpc_server/java/gen/__db_re_delim_reply.java b/db/rpc_server/java/gen/__db_re_delim_reply.java
deleted file mode 100644
index aa8a797f5..000000000
--- a/db/rpc_server/java/gen/__db_re_delim_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_re_delim_reply implements XdrAble {
-    public int status;
-
-    public __db_re_delim_reply() {
-    }
-
-    public __db_re_delim_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_re_delim_reply.java
diff --git a/db/rpc_server/java/gen/__db_re_len_msg.java b/db/rpc_server/java/gen/__db_re_len_msg.java
deleted file mode 100644
index 664de5c89..000000000
--- a/db/rpc_server/java/gen/__db_re_len_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_re_len_msg implements XdrAble {
-    public int dbpcl_id;
-    public int len;
-
-    public __db_re_len_msg() {
-    }
-
-    public __db_re_len_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(len);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        len = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_re_len_msg.java
diff --git a/db/rpc_server/java/gen/__db_re_len_reply.java b/db/rpc_server/java/gen/__db_re_len_reply.java
deleted file mode 100644
index dda27c8c1..000000000
--- a/db/rpc_server/java/gen/__db_re_len_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_re_len_reply implements XdrAble {
-    public int status;
-
-    public __db_re_len_reply() {
-    }
-
-    public __db_re_len_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_re_len_reply.java
diff --git a/db/rpc_server/java/gen/__db_re_pad_msg.java b/db/rpc_server/java/gen/__db_re_pad_msg.java
deleted file mode 100644
index 2c1290b6e..000000000
--- a/db/rpc_server/java/gen/__db_re_pad_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_re_pad_msg implements XdrAble {
-    public int dbpcl_id;
-    public int pad;
-
-    public __db_re_pad_msg() {
-    }
-
-    public __db_re_pad_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(pad);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        pad = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_re_pad_msg.java
diff --git a/db/rpc_server/java/gen/__db_re_pad_reply.java b/db/rpc_server/java/gen/__db_re_pad_reply.java
deleted file mode 100644
index f0aaa9a3a..000000000
--- a/db/rpc_server/java/gen/__db_re_pad_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_re_pad_reply implements XdrAble {
-    public int status;
-
-    public __db_re_pad_reply() {
-    }
-
-    public __db_re_pad_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_re_pad_reply.java
diff --git a/db/rpc_server/java/gen/__db_remove_msg.java b/db/rpc_server/java/gen/__db_remove_msg.java
deleted file mode 100644
index dfa9066a7..000000000
--- a/db/rpc_server/java/gen/__db_remove_msg.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_remove_msg implements XdrAble {
-    public int dbpcl_id;
-    public String name;
-    public String subdb;
-    public int flags;
-
-    public __db_remove_msg() {
-    }
-
-    public __db_remove_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeString(name);
-        xdr.xdrEncodeString(subdb);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        name = xdr.xdrDecodeString();
-        subdb = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_remove_msg.java
diff --git a/db/rpc_server/java/gen/__db_remove_reply.java b/db/rpc_server/java/gen/__db_remove_reply.java
deleted file mode 100644
index a2b86c049..000000000
--- a/db/rpc_server/java/gen/__db_remove_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_remove_reply implements XdrAble {
-    public int status;
-
-    public __db_remove_reply() {
-    }
-
-    public __db_remove_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_remove_reply.java
diff --git a/db/rpc_server/java/gen/__db_rename_msg.java b/db/rpc_server/java/gen/__db_rename_msg.java
deleted file mode 100644
index 12b434e33..000000000
--- a/db/rpc_server/java/gen/__db_rename_msg.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_rename_msg implements XdrAble {
-    public int dbpcl_id;
-    public String name;
-    public String subdb;
-    public String newname;
-    public int flags;
-
-    public __db_rename_msg() {
-    }
-
-    public __db_rename_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeString(name);
-        xdr.xdrEncodeString(subdb);
-        xdr.xdrEncodeString(newname);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        name = xdr.xdrDecodeString();
-        subdb = xdr.xdrDecodeString();
-        newname = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_rename_msg.java
diff --git a/db/rpc_server/java/gen/__db_rename_reply.java b/db/rpc_server/java/gen/__db_rename_reply.java
deleted file mode 100644
index 4e4a22be5..000000000
--- a/db/rpc_server/java/gen/__db_rename_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_rename_reply implements XdrAble {
-    public int status;
-
-    public __db_rename_reply() {
-    }
-
-    public __db_rename_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_rename_reply.java
diff --git a/db/rpc_server/java/gen/__db_stat_msg.java b/db/rpc_server/java/gen/__db_stat_msg.java
deleted file mode 100644
index 419ee14a6..000000000
--- a/db/rpc_server/java/gen/__db_stat_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 7/15/04 4:39 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_stat_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int flags;
-
-    public __db_stat_msg() {
-    }
-
-    public __db_stat_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_stat_msg.java
diff --git a/db/rpc_server/java/gen/__db_stat_reply.java b/db/rpc_server/java/gen/__db_stat_reply.java
deleted file mode 100644
index 8df146014..000000000
--- a/db/rpc_server/java/gen/__db_stat_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_stat_reply implements XdrAble {
-    public int status;
-    public int [] stats;
-
-    public __db_stat_reply() {
-    }
-
-    public __db_stat_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeIntVector(stats);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        stats = xdr.xdrDecodeIntVector();
-    }
-
-}
-// End of __db_stat_reply.java
diff --git a/db/rpc_server/java/gen/__db_sync_msg.java b/db/rpc_server/java/gen/__db_sync_msg.java
deleted file mode 100644
index c6594670f..000000000
--- a/db/rpc_server/java/gen/__db_sync_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_sync_msg implements XdrAble {
-    public int dbpcl_id;
-    public int flags;
-
-    public __db_sync_msg() {
-    }
-
-    public __db_sync_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_sync_msg.java
diff --git a/db/rpc_server/java/gen/__db_sync_reply.java b/db/rpc_server/java/gen/__db_sync_reply.java
deleted file mode 100644
index d0a8bc8b1..000000000
--- a/db/rpc_server/java/gen/__db_sync_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_sync_reply implements XdrAble {
-    public int status;
-
-    public __db_sync_reply() {
-    }
-
-    public __db_sync_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_sync_reply.java
diff --git a/db/rpc_server/java/gen/__db_truncate_msg.java b/db/rpc_server/java/gen/__db_truncate_msg.java
deleted file mode 100644
index 38810d656..000000000
--- a/db/rpc_server/java/gen/__db_truncate_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_truncate_msg implements XdrAble {
-    public int dbpcl_id;
-    public int txnpcl_id;
-    public int flags;
-
-    public __db_truncate_msg() {
-    }
-
-    public __db_truncate_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbpcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbpcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_truncate_msg.java
diff --git a/db/rpc_server/java/gen/__db_truncate_reply.java b/db/rpc_server/java/gen/__db_truncate_reply.java
deleted file mode 100644
index c4f688690..000000000
--- a/db/rpc_server/java/gen/__db_truncate_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __db_truncate_reply implements XdrAble {
-    public int status;
-    public int count;
-
-    public __db_truncate_reply() {
-    }
-
-    public __db_truncate_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(count);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        count = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __db_truncate_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_close_msg.java b/db/rpc_server/java/gen/__dbc_close_msg.java
deleted file mode 100644
index eb1ca7f7e..000000000
--- a/db/rpc_server/java/gen/__dbc_close_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_close_msg implements XdrAble {
-    public int dbccl_id;
-
-    public __dbc_close_msg() {
-    }
-
-    public __dbc_close_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_close_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_close_reply.java b/db/rpc_server/java/gen/__dbc_close_reply.java
deleted file mode 100644
index 47459aace..000000000
--- a/db/rpc_server/java/gen/__dbc_close_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_close_reply implements XdrAble {
-    public int status;
-
-    public __dbc_close_reply() {
-    }
-
-    public __dbc_close_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_close_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_count_msg.java b/db/rpc_server/java/gen/__dbc_count_msg.java
deleted file mode 100644
index 5f554e18a..000000000
--- a/db/rpc_server/java/gen/__dbc_count_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_count_msg implements XdrAble {
-    public int dbccl_id;
-    public int flags;
-
-    public __dbc_count_msg() {
-    }
-
-    public __dbc_count_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_count_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_count_reply.java b/db/rpc_server/java/gen/__dbc_count_reply.java
deleted file mode 100644
index 4daecdd22..000000000
--- a/db/rpc_server/java/gen/__dbc_count_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_count_reply implements XdrAble {
-    public int status;
-    public int dupcount;
-
-    public __dbc_count_reply() {
-    }
-
-    public __dbc_count_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(dupcount);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        dupcount = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_count_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_del_msg.java b/db/rpc_server/java/gen/__dbc_del_msg.java
deleted file mode 100644
index bc4bd05f5..000000000
--- a/db/rpc_server/java/gen/__dbc_del_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_del_msg implements XdrAble {
-    public int dbccl_id;
-    public int flags;
-
-    public __dbc_del_msg() {
-    }
-
-    public __dbc_del_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_del_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_del_reply.java b/db/rpc_server/java/gen/__dbc_del_reply.java
deleted file mode 100644
index e55ac9ffa..000000000
--- a/db/rpc_server/java/gen/__dbc_del_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_del_reply implements XdrAble {
-    public int status;
-
-    public __dbc_del_reply() {
-    }
-
-    public __dbc_del_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_del_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_dup_msg.java b/db/rpc_server/java/gen/__dbc_dup_msg.java
deleted file mode 100644
index 9a3894e61..000000000
--- a/db/rpc_server/java/gen/__dbc_dup_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_dup_msg implements XdrAble {
-    public int dbccl_id;
-    public int flags;
-
-    public __dbc_dup_msg() {
-    }
-
-    public __dbc_dup_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_dup_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_dup_reply.java b/db/rpc_server/java/gen/__dbc_dup_reply.java
deleted file mode 100644
index 6b942f1a6..000000000
--- a/db/rpc_server/java/gen/__dbc_dup_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_dup_reply implements XdrAble {
-    public int status;
-    public int dbcidcl_id;
-
-    public __dbc_dup_reply() {
-    }
-
-    public __dbc_dup_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(dbcidcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        dbcidcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_dup_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_get_msg.java b/db/rpc_server/java/gen/__dbc_get_msg.java
deleted file mode 100644
index 672ace43f..000000000
--- a/db/rpc_server/java/gen/__dbc_get_msg.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_get_msg implements XdrAble {
-    public int dbccl_id;
-    public int keydlen;
-    public int keydoff;
-    public int keyulen;
-    public int keyflags;
-    public byte [] keydata;
-    public int datadlen;
-    public int datadoff;
-    public int dataulen;
-    public int dataflags;
-    public byte [] datadata;
-    public int flags;
-
-    public __dbc_get_msg() {
-    }
-
-    public __dbc_get_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-        xdr.xdrEncodeInt(keydlen);
-        xdr.xdrEncodeInt(keydoff);
-        xdr.xdrEncodeInt(keyulen);
-        xdr.xdrEncodeInt(keyflags);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeInt(datadlen);
-        xdr.xdrEncodeInt(datadoff);
-        xdr.xdrEncodeInt(dataulen);
-        xdr.xdrEncodeInt(dataflags);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-        keydlen = xdr.xdrDecodeInt();
-        keydoff = xdr.xdrDecodeInt();
-        keyulen = xdr.xdrDecodeInt();
-        keyflags = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        datadlen = xdr.xdrDecodeInt();
-        datadoff = xdr.xdrDecodeInt();
-        dataulen = xdr.xdrDecodeInt();
-        dataflags = xdr.xdrDecodeInt();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_get_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_get_reply.java b/db/rpc_server/java/gen/__dbc_get_reply.java
deleted file mode 100644
index 8671fec63..000000000
--- a/db/rpc_server/java/gen/__dbc_get_reply.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_get_reply implements XdrAble {
-    public int status;
-    public byte [] keydata;
-    public byte [] datadata;
-
-    public __dbc_get_reply() {
-    }
-
-    public __dbc_get_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-    }
-
-}
-// End of __dbc_get_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_pget_msg.java b/db/rpc_server/java/gen/__dbc_pget_msg.java
deleted file mode 100644
index 8ca3c6171..000000000
--- a/db/rpc_server/java/gen/__dbc_pget_msg.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_pget_msg implements XdrAble {
-    public int dbccl_id;
-    public int skeydlen;
-    public int skeydoff;
-    public int skeyulen;
-    public int skeyflags;
-    public byte [] skeydata;
-    public int pkeydlen;
-    public int pkeydoff;
-    public int pkeyulen;
-    public int pkeyflags;
-    public byte [] pkeydata;
-    public int datadlen;
-    public int datadoff;
-    public int dataulen;
-    public int dataflags;
-    public byte [] datadata;
-    public int flags;
-
-    public __dbc_pget_msg() {
-    }
-
-    public __dbc_pget_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-        xdr.xdrEncodeInt(skeydlen);
-        xdr.xdrEncodeInt(skeydoff);
-        xdr.xdrEncodeInt(skeyulen);
-        xdr.xdrEncodeInt(skeyflags);
-        xdr.xdrEncodeDynamicOpaque(skeydata);
-        xdr.xdrEncodeInt(pkeydlen);
-        xdr.xdrEncodeInt(pkeydoff);
-        xdr.xdrEncodeInt(pkeyulen);
-        xdr.xdrEncodeInt(pkeyflags);
-        xdr.xdrEncodeDynamicOpaque(pkeydata);
-        xdr.xdrEncodeInt(datadlen);
-        xdr.xdrEncodeInt(datadoff);
-        xdr.xdrEncodeInt(dataulen);
-        xdr.xdrEncodeInt(dataflags);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-        skeydlen = xdr.xdrDecodeInt();
-        skeydoff = xdr.xdrDecodeInt();
-        skeyulen = xdr.xdrDecodeInt();
-        skeyflags = xdr.xdrDecodeInt();
-        skeydata = xdr.xdrDecodeDynamicOpaque();
-        pkeydlen = xdr.xdrDecodeInt();
-        pkeydoff = xdr.xdrDecodeInt();
-        pkeyulen = xdr.xdrDecodeInt();
-        pkeyflags = xdr.xdrDecodeInt();
-        pkeydata = xdr.xdrDecodeDynamicOpaque();
-        datadlen = xdr.xdrDecodeInt();
-        datadoff = xdr.xdrDecodeInt();
-        dataulen = xdr.xdrDecodeInt();
-        dataflags = xdr.xdrDecodeInt();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_pget_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_pget_reply.java b/db/rpc_server/java/gen/__dbc_pget_reply.java
deleted file mode 100644
index 16cc79587..000000000
--- a/db/rpc_server/java/gen/__dbc_pget_reply.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_pget_reply implements XdrAble {
-    public int status;
-    public byte [] skeydata;
-    public byte [] pkeydata;
-    public byte [] datadata;
-
-    public __dbc_pget_reply() {
-    }
-
-    public __dbc_pget_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDynamicOpaque(skeydata);
-        xdr.xdrEncodeDynamicOpaque(pkeydata);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        skeydata = xdr.xdrDecodeDynamicOpaque();
-        pkeydata = xdr.xdrDecodeDynamicOpaque();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-    }
-
-}
-// End of __dbc_pget_reply.java
diff --git a/db/rpc_server/java/gen/__dbc_put_msg.java b/db/rpc_server/java/gen/__dbc_put_msg.java
deleted file mode 100644
index 98d12423d..000000000
--- a/db/rpc_server/java/gen/__dbc_put_msg.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_put_msg implements XdrAble {
-    public int dbccl_id;
-    public int keydlen;
-    public int keydoff;
-    public int keyulen;
-    public int keyflags;
-    public byte [] keydata;
-    public int datadlen;
-    public int datadoff;
-    public int dataulen;
-    public int dataflags;
-    public byte [] datadata;
-    public int flags;
-
-    public __dbc_put_msg() {
-    }
-
-    public __dbc_put_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbccl_id);
-        xdr.xdrEncodeInt(keydlen);
-        xdr.xdrEncodeInt(keydoff);
-        xdr.xdrEncodeInt(keyulen);
-        xdr.xdrEncodeInt(keyflags);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-        xdr.xdrEncodeInt(datadlen);
-        xdr.xdrEncodeInt(datadoff);
-        xdr.xdrEncodeInt(dataulen);
-        xdr.xdrEncodeInt(dataflags);
-        xdr.xdrEncodeDynamicOpaque(datadata);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbccl_id = xdr.xdrDecodeInt();
-        keydlen = xdr.xdrDecodeInt();
-        keydoff = xdr.xdrDecodeInt();
-        keyulen = xdr.xdrDecodeInt();
-        keyflags = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-        datadlen = xdr.xdrDecodeInt();
-        datadoff = xdr.xdrDecodeInt();
-        dataulen = xdr.xdrDecodeInt();
-        dataflags = xdr.xdrDecodeInt();
-        datadata = xdr.xdrDecodeDynamicOpaque();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __dbc_put_msg.java
diff --git a/db/rpc_server/java/gen/__dbc_put_reply.java b/db/rpc_server/java/gen/__dbc_put_reply.java
deleted file mode 100644
index 385f9f783..000000000
--- a/db/rpc_server/java/gen/__dbc_put_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __dbc_put_reply implements XdrAble {
-    public int status;
-    public byte [] keydata;
-
-    public __dbc_put_reply() {
-    }
-
-    public __dbc_put_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeDynamicOpaque(keydata);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        keydata = xdr.xdrDecodeDynamicOpaque();
-    }
-
-}
-// End of __dbc_put_reply.java
diff --git a/db/rpc_server/java/gen/__env_cachesize_msg.java b/db/rpc_server/java/gen/__env_cachesize_msg.java
deleted file mode 100644
index d1fce1ffa..000000000
--- a/db/rpc_server/java/gen/__env_cachesize_msg.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_cachesize_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int gbytes;
-    public int bytes;
-    public int ncache;
-
-    public __env_cachesize_msg() {
-    }
-
-    public __env_cachesize_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(gbytes);
-        xdr.xdrEncodeInt(bytes);
-        xdr.xdrEncodeInt(ncache);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        gbytes = xdr.xdrDecodeInt();
-        bytes = xdr.xdrDecodeInt();
-        ncache = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_cachesize_msg.java
diff --git a/db/rpc_server/java/gen/__env_cachesize_reply.java b/db/rpc_server/java/gen/__env_cachesize_reply.java
deleted file mode 100644
index 193f8355d..000000000
--- a/db/rpc_server/java/gen/__env_cachesize_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_cachesize_reply implements XdrAble {
-    public int status;
-
-    public __env_cachesize_reply() {
-    }
-
-    public __env_cachesize_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_cachesize_reply.java
diff --git a/db/rpc_server/java/gen/__env_close_msg.java b/db/rpc_server/java/gen/__env_close_msg.java
deleted file mode 100644
index 5e657bacf..000000000
--- a/db/rpc_server/java/gen/__env_close_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_close_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int flags;
-
-    public __env_close_msg() {
-    }
-
-    public __env_close_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_close_msg.java
diff --git a/db/rpc_server/java/gen/__env_close_reply.java b/db/rpc_server/java/gen/__env_close_reply.java
deleted file mode 100644
index 11e61f7c8..000000000
--- a/db/rpc_server/java/gen/__env_close_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_close_reply implements XdrAble {
-    public int status;
-
-    public __env_close_reply() {
-    }
-
-    public __env_close_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_close_reply.java
diff --git a/db/rpc_server/java/gen/__env_create_msg.java b/db/rpc_server/java/gen/__env_create_msg.java
deleted file mode 100644
index dbe546ae2..000000000
--- a/db/rpc_server/java/gen/__env_create_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_create_msg implements XdrAble {
-    public int timeout;
-
-    public __env_create_msg() {
-    }
-
-    public __env_create_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(timeout);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        timeout = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_create_msg.java
diff --git a/db/rpc_server/java/gen/__env_create_reply.java b/db/rpc_server/java/gen/__env_create_reply.java
deleted file mode 100644
index 5427fc4bc..000000000
--- a/db/rpc_server/java/gen/__env_create_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_create_reply implements XdrAble {
-    public int status;
-    public int envcl_id;
-
-    public __env_create_reply() {
-    }
-
-    public __env_create_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(envcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        envcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_create_reply.java
diff --git a/db/rpc_server/java/gen/__env_dbremove_msg.java b/db/rpc_server/java/gen/__env_dbremove_msg.java
deleted file mode 100644
index 9730a92c5..000000000
--- a/db/rpc_server/java/gen/__env_dbremove_msg.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/19/02 10:30 AM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_dbremove_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int txnpcl_id;
-    public String name;
-    public String subdb;
-    public int flags;
-
-    public __env_dbremove_msg() {
-    }
-
-    public __env_dbremove_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeString(name);
-        xdr.xdrEncodeString(subdb);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        name = xdr.xdrDecodeString();
-        subdb = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_dbremove_msg.java
diff --git a/db/rpc_server/java/gen/__env_dbremove_reply.java b/db/rpc_server/java/gen/__env_dbremove_reply.java
deleted file mode 100644
index 75cc5a940..000000000
--- a/db/rpc_server/java/gen/__env_dbremove_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/19/02 10:30 AM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_dbremove_reply implements XdrAble {
-    public int status;
-
-    public __env_dbremove_reply() {
-    }
-
-    public __env_dbremove_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_dbremove_reply.java
diff --git a/db/rpc_server/java/gen/__env_dbrename_msg.java b/db/rpc_server/java/gen/__env_dbrename_msg.java
deleted file mode 100644
index 0bbda262b..000000000
--- a/db/rpc_server/java/gen/__env_dbrename_msg.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/19/02 10:30 AM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_dbrename_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int txnpcl_id;
-    public String name;
-    public String subdb;
-    public String newname;
-    public int flags;
-
-    public __env_dbrename_msg() {
-    }
-
-    public __env_dbrename_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeString(name);
-        xdr.xdrEncodeString(subdb);
-        xdr.xdrEncodeString(newname);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        txnpcl_id = xdr.xdrDecodeInt();
-        name = xdr.xdrDecodeString();
-        subdb = xdr.xdrDecodeString();
-        newname = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_dbrename_msg.java
diff --git a/db/rpc_server/java/gen/__env_dbrename_reply.java b/db/rpc_server/java/gen/__env_dbrename_reply.java
deleted file mode 100644
index 0cc888230..000000000
--- a/db/rpc_server/java/gen/__env_dbrename_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/19/02 10:30 AM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_dbrename_reply implements XdrAble {
-    public int status;
-
-    public __env_dbrename_reply() {
-    }
-
-    public __env_dbrename_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_dbrename_reply.java
diff --git a/db/rpc_server/java/gen/__env_encrypt_msg.java b/db/rpc_server/java/gen/__env_encrypt_msg.java
deleted file mode 100644
index 84e9a36d3..000000000
--- a/db/rpc_server/java/gen/__env_encrypt_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 2/13/02 1:05 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_encrypt_msg implements XdrAble {
-    public int dbenvcl_id;
-    public String passwd;
-    public int flags;
-
-    public __env_encrypt_msg() {
-    }
-
-    public __env_encrypt_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeString(passwd);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        passwd = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_encrypt_msg.java
diff --git a/db/rpc_server/java/gen/__env_encrypt_reply.java b/db/rpc_server/java/gen/__env_encrypt_reply.java
deleted file mode 100644
index e202a3089..000000000
--- a/db/rpc_server/java/gen/__env_encrypt_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 2/13/02 1:05 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_encrypt_reply implements XdrAble {
-    public int status;
-
-    public __env_encrypt_reply() {
-    }
-
-    public __env_encrypt_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_encrypt_reply.java
diff --git a/db/rpc_server/java/gen/__env_flags_msg.java b/db/rpc_server/java/gen/__env_flags_msg.java
deleted file mode 100644
index 25cd5f85f..000000000
--- a/db/rpc_server/java/gen/__env_flags_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_flags_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int flags;
-    public int onoff;
-
-    public __env_flags_msg() {
-    }
-
-    public __env_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(flags);
-        xdr.xdrEncodeInt(onoff);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-        onoff = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_flags_msg.java
diff --git a/db/rpc_server/java/gen/__env_flags_reply.java b/db/rpc_server/java/gen/__env_flags_reply.java
deleted file mode 100644
index d348a9224..000000000
--- a/db/rpc_server/java/gen/__env_flags_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_flags_reply implements XdrAble {
-    public int status;
-
-    public __env_flags_reply() {
-    }
-
-    public __env_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_flags_reply.java
diff --git a/db/rpc_server/java/gen/__env_get_cachesize_msg.java b/db/rpc_server/java/gen/__env_get_cachesize_msg.java
deleted file mode 100644
index f7ae42fac..000000000
--- a/db/rpc_server/java/gen/__env_get_cachesize_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_cachesize_msg implements XdrAble {
-    public int dbenvcl_id;
-
-    public __env_get_cachesize_msg() {
-    }
-
-    public __env_get_cachesize_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_cachesize_msg.java
diff --git a/db/rpc_server/java/gen/__env_get_cachesize_reply.java b/db/rpc_server/java/gen/__env_get_cachesize_reply.java
deleted file mode 100644
index 9604f59ef..000000000
--- a/db/rpc_server/java/gen/__env_get_cachesize_reply.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_cachesize_reply implements XdrAble {
-    public int status;
-    public int gbytes;
-    public int bytes;
-    public int ncache;
-
-    public __env_get_cachesize_reply() {
-    }
-
-    public __env_get_cachesize_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(gbytes);
-        xdr.xdrEncodeInt(bytes);
-        xdr.xdrEncodeInt(ncache);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        gbytes = xdr.xdrDecodeInt();
-        bytes = xdr.xdrDecodeInt();
-        ncache = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_cachesize_reply.java
diff --git a/db/rpc_server/java/gen/__env_get_encrypt_flags_msg.java b/db/rpc_server/java/gen/__env_get_encrypt_flags_msg.java
deleted file mode 100644
index cb87819bc..000000000
--- a/db/rpc_server/java/gen/__env_get_encrypt_flags_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_encrypt_flags_msg implements XdrAble {
-    public int dbenvcl_id;
-
-    public __env_get_encrypt_flags_msg() {
-    }
-
-    public __env_get_encrypt_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_encrypt_flags_msg.java
diff --git a/db/rpc_server/java/gen/__env_get_encrypt_flags_reply.java b/db/rpc_server/java/gen/__env_get_encrypt_flags_reply.java
deleted file mode 100644
index a13740bff..000000000
--- a/db/rpc_server/java/gen/__env_get_encrypt_flags_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_encrypt_flags_reply implements XdrAble {
-    public int status;
-    public int flags;
-
-    public __env_get_encrypt_flags_reply() {
-    }
-
-    public __env_get_encrypt_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_encrypt_flags_reply.java
diff --git a/db/rpc_server/java/gen/__env_get_flags_msg.java b/db/rpc_server/java/gen/__env_get_flags_msg.java
deleted file mode 100644
index 6580e004f..000000000
--- a/db/rpc_server/java/gen/__env_get_flags_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_flags_msg implements XdrAble {
-    public int dbenvcl_id;
-
-    public __env_get_flags_msg() {
-    }
-
-    public __env_get_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_flags_msg.java
diff --git a/db/rpc_server/java/gen/__env_get_flags_reply.java b/db/rpc_server/java/gen/__env_get_flags_reply.java
deleted file mode 100644
index e8bded8b4..000000000
--- a/db/rpc_server/java/gen/__env_get_flags_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_flags_reply implements XdrAble {
-    public int status;
-    public int flags;
-
-    public __env_get_flags_reply() {
-    }
-
-    public __env_get_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_flags_reply.java
diff --git a/db/rpc_server/java/gen/__env_get_home_msg.java b/db/rpc_server/java/gen/__env_get_home_msg.java
deleted file mode 100644
index 5f51318b8..000000000
--- a/db/rpc_server/java/gen/__env_get_home_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_home_msg implements XdrAble {
-    public int dbenvcl_id;
-
-    public __env_get_home_msg() {
-    }
-
-    public __env_get_home_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_home_msg.java
diff --git a/db/rpc_server/java/gen/__env_get_home_reply.java b/db/rpc_server/java/gen/__env_get_home_reply.java
deleted file mode 100644
index e86bded2d..000000000
--- a/db/rpc_server/java/gen/__env_get_home_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_home_reply implements XdrAble {
-    public int status;
-    public String home;
-
-    public __env_get_home_reply() {
-    }
-
-    public __env_get_home_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeString(home);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        home = xdr.xdrDecodeString();
-    }
-
-}
-// End of __env_get_home_reply.java
diff --git a/db/rpc_server/java/gen/__env_get_open_flags_msg.java b/db/rpc_server/java/gen/__env_get_open_flags_msg.java
deleted file mode 100644
index dc9960b1f..000000000
--- a/db/rpc_server/java/gen/__env_get_open_flags_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_open_flags_msg implements XdrAble {
-    public int dbenvcl_id;
-
-    public __env_get_open_flags_msg() {
-    }
-
-    public __env_get_open_flags_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_open_flags_msg.java
diff --git a/db/rpc_server/java/gen/__env_get_open_flags_reply.java b/db/rpc_server/java/gen/__env_get_open_flags_reply.java
deleted file mode 100644
index bc581e6a5..000000000
--- a/db/rpc_server/java/gen/__env_get_open_flags_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 3/26/03 6:40 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_get_open_flags_reply implements XdrAble {
-    public int status;
-    public int flags;
-
-    public __env_get_open_flags_reply() {
-    }
-
-    public __env_get_open_flags_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_get_open_flags_reply.java
diff --git a/db/rpc_server/java/gen/__env_open_msg.java b/db/rpc_server/java/gen/__env_open_msg.java
deleted file mode 100644
index e4649b41f..000000000
--- a/db/rpc_server/java/gen/__env_open_msg.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_open_msg implements XdrAble {
-    public int dbenvcl_id;
-    public String home;
-    public int flags;
-    public int mode;
-
-    public __env_open_msg() {
-    }
-
-    public __env_open_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeString(home);
-        xdr.xdrEncodeInt(flags);
-        xdr.xdrEncodeInt(mode);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        home = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-        mode = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_open_msg.java
diff --git a/db/rpc_server/java/gen/__env_open_reply.java b/db/rpc_server/java/gen/__env_open_reply.java
deleted file mode 100644
index 1994afb4c..000000000
--- a/db/rpc_server/java/gen/__env_open_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_open_reply implements XdrAble {
-    public int status;
-    public int envcl_id;
-
-    public __env_open_reply() {
-    }
-
-    public __env_open_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(envcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        envcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_open_reply.java
diff --git a/db/rpc_server/java/gen/__env_remove_msg.java b/db/rpc_server/java/gen/__env_remove_msg.java
deleted file mode 100644
index b32d758f0..000000000
--- a/db/rpc_server/java/gen/__env_remove_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_remove_msg implements XdrAble {
-    public int dbenvcl_id;
-    public String home;
-    public int flags;
-
-    public __env_remove_msg() {
-    }
-
-    public __env_remove_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeString(home);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        home = xdr.xdrDecodeString();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_remove_msg.java
diff --git a/db/rpc_server/java/gen/__env_remove_reply.java b/db/rpc_server/java/gen/__env_remove_reply.java
deleted file mode 100644
index 19e4d52f6..000000000
--- a/db/rpc_server/java/gen/__env_remove_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __env_remove_reply implements XdrAble {
-    public int status;
-
-    public __env_remove_reply() {
-    }
-
-    public __env_remove_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __env_remove_reply.java
diff --git a/db/rpc_server/java/gen/__txn_abort_msg.java b/db/rpc_server/java/gen/__txn_abort_msg.java
deleted file mode 100644
index ff44c534e..000000000
--- a/db/rpc_server/java/gen/__txn_abort_msg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_abort_msg implements XdrAble {
-    public int txnpcl_id;
-
-    public __txn_abort_msg() {
-    }
-
-    public __txn_abort_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(txnpcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        txnpcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_abort_msg.java
diff --git a/db/rpc_server/java/gen/__txn_abort_reply.java b/db/rpc_server/java/gen/__txn_abort_reply.java
deleted file mode 100644
index 58f275c1a..000000000
--- a/db/rpc_server/java/gen/__txn_abort_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_abort_reply implements XdrAble {
-    public int status;
-
-    public __txn_abort_reply() {
-    }
-
-    public __txn_abort_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_abort_reply.java
diff --git a/db/rpc_server/java/gen/__txn_begin_msg.java b/db/rpc_server/java/gen/__txn_begin_msg.java
deleted file mode 100644
index 877031e8d..000000000
--- a/db/rpc_server/java/gen/__txn_begin_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_begin_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int parentcl_id;
-    public int flags;
-
-    public __txn_begin_msg() {
-    }
-
-    public __txn_begin_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(parentcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        parentcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_begin_msg.java
diff --git a/db/rpc_server/java/gen/__txn_begin_reply.java b/db/rpc_server/java/gen/__txn_begin_reply.java
deleted file mode 100644
index 65a0c4016..000000000
--- a/db/rpc_server/java/gen/__txn_begin_reply.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_begin_reply implements XdrAble {
-    public int status;
-    public int txnidcl_id;
-
-    public __txn_begin_reply() {
-    }
-
-    public __txn_begin_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeInt(txnidcl_id);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        txnidcl_id = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_begin_reply.java
diff --git a/db/rpc_server/java/gen/__txn_commit_msg.java b/db/rpc_server/java/gen/__txn_commit_msg.java
deleted file mode 100644
index 4b988d0c2..000000000
--- a/db/rpc_server/java/gen/__txn_commit_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_commit_msg implements XdrAble {
-    public int txnpcl_id;
-    public int flags;
-
-    public __txn_commit_msg() {
-    }
-
-    public __txn_commit_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        txnpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_commit_msg.java
diff --git a/db/rpc_server/java/gen/__txn_commit_reply.java b/db/rpc_server/java/gen/__txn_commit_reply.java
deleted file mode 100644
index b26937b82..000000000
--- a/db/rpc_server/java/gen/__txn_commit_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_commit_reply implements XdrAble {
-    public int status;
-
-    public __txn_commit_reply() {
-    }
-
-    public __txn_commit_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_commit_reply.java
diff --git a/db/rpc_server/java/gen/__txn_discard_msg.java b/db/rpc_server/java/gen/__txn_discard_msg.java
deleted file mode 100644
index 87f5d4f77..000000000
--- a/db/rpc_server/java/gen/__txn_discard_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_discard_msg implements XdrAble {
-    public int txnpcl_id;
-    public int flags;
-
-    public __txn_discard_msg() {
-    }
-
-    public __txn_discard_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        txnpcl_id = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_discard_msg.java
diff --git a/db/rpc_server/java/gen/__txn_discard_reply.java b/db/rpc_server/java/gen/__txn_discard_reply.java
deleted file mode 100644
index 9792211af..000000000
--- a/db/rpc_server/java/gen/__txn_discard_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_discard_reply implements XdrAble {
-    public int status;
-
-    public __txn_discard_reply() {
-    }
-
-    public __txn_discard_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_discard_reply.java
diff --git a/db/rpc_server/java/gen/__txn_prepare_msg.java b/db/rpc_server/java/gen/__txn_prepare_msg.java
deleted file mode 100644
index 6e09f2c77..000000000
--- a/db/rpc_server/java/gen/__txn_prepare_msg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_prepare_msg implements XdrAble {
-    public int txnpcl_id;
-    public byte [] gid;
-
-    public __txn_prepare_msg() {
-    }
-
-    public __txn_prepare_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(txnpcl_id);
-        xdr.xdrEncodeOpaque(gid, 128);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        txnpcl_id = xdr.xdrDecodeInt();
-        gid = xdr.xdrDecodeOpaque(128);
-    }
-
-}
-// End of __txn_prepare_msg.java
diff --git a/db/rpc_server/java/gen/__txn_prepare_reply.java b/db/rpc_server/java/gen/__txn_prepare_reply.java
deleted file mode 100644
index d75901179..000000000
--- a/db/rpc_server/java/gen/__txn_prepare_reply.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_prepare_reply implements XdrAble {
-    public int status;
-
-    public __txn_prepare_reply() {
-    }
-
-    public __txn_prepare_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_prepare_reply.java
diff --git a/db/rpc_server/java/gen/__txn_recover_msg.java b/db/rpc_server/java/gen/__txn_recover_msg.java
deleted file mode 100644
index 651533344..000000000
--- a/db/rpc_server/java/gen/__txn_recover_msg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_recover_msg implements XdrAble {
-    public int dbenvcl_id;
-    public int count;
-    public int flags;
-
-    public __txn_recover_msg() {
-    }
-
-    public __txn_recover_msg(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(dbenvcl_id);
-        xdr.xdrEncodeInt(count);
-        xdr.xdrEncodeInt(flags);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        dbenvcl_id = xdr.xdrDecodeInt();
-        count = xdr.xdrDecodeInt();
-        flags = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_recover_msg.java
diff --git a/db/rpc_server/java/gen/__txn_recover_reply.java b/db/rpc_server/java/gen/__txn_recover_reply.java
deleted file mode 100644
index 0161ec949..000000000
--- a/db/rpc_server/java/gen/__txn_recover_reply.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 12/18/01 7:23 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-public class __txn_recover_reply implements XdrAble {
-    public int status;
-    public int [] txn;
-    public byte [] gid;
-    public int retcount;
-
-    public __txn_recover_reply() {
-    }
-
-    public __txn_recover_reply(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        xdrDecode(xdr);
-    }
-
-    public void xdrEncode(XdrEncodingStream xdr)
-           throws OncRpcException, IOException {
-        xdr.xdrEncodeInt(status);
-        xdr.xdrEncodeIntVector(txn);
-        xdr.xdrEncodeDynamicOpaque(gid);
-        xdr.xdrEncodeInt(retcount);
-    }
-
-    public void xdrDecode(XdrDecodingStream xdr)
-           throws OncRpcException, IOException {
-        status = xdr.xdrDecodeInt();
-        txn = xdr.xdrDecodeIntVector();
-        gid = xdr.xdrDecodeDynamicOpaque();
-        retcount = xdr.xdrDecodeInt();
-    }
-
-}
-// End of __txn_recover_reply.java
diff --git a/db/rpc_server/java/gen/db_server.java b/db/rpc_server/java/gen/db_server.java
deleted file mode 100644
index dccc3d8ad..000000000
--- a/db/rpc_server/java/gen/db_server.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Automatically generated by jrpcgen 0.95.1 on 2/11/04 1:28 PM
- * jrpcgen is part of the "Remote Tea" ONC/RPC package for Java
- * See http://acplt.org/ks/remotetea.html for details
- */
-package com.sleepycat.db.rpcserver;
-import org.acplt.oncrpc.*;
-import java.io.IOException;
-
-/**
- * A collection of constants used by the "db_server" ONC/RPC program.
- */
-public interface db_server {
-    public static final int __DB_db_get_re_delim_4003 = 49;
-    public static final int __DB_db_close_4003 = 25;
-    public static final int __DB_db_flags_4003 = 33;
-    public static final int __DB_dbc_dup_4003 = 65;
-    public static final int __DB_db_get_open_flags_4003 = 36;
-    public static final int __DB_db_encrypt_4003 = 29;
-    public static final int __DB_env_remove_4003 = 14;
-    public static final int __DB_env_dbrename_4003 = 6;
-    public static final int __DB_dbc_pget_4003 = 67;
-    public static final int __DB_env_get_cachesize_4003 = 1;
-    public static final int __DB_env_cachesize_4003 = 2;
-    public static final int __DB_db_get_lorder_4003 = 42;
-    public static final int __DB_db_lorder_4003 = 43;
-    public static final int __DB_db_key_range_4003 = 41;
-    public static final int __DB_env_get_open_flags_4003 = 12;
-    public static final int __DB_db_bt_minkey_4003 = 24;
-    public static final int __DB_db_sync_4003 = 58;
-    public static final int __DB_dbc_close_4003 = 62;
-    public static final int __DB_db_join_4003 = 61;
-    public static final int __DB_db_pagesize_4003 = 46;
-    public static final int DB_RPC_SERVERVERS = 4003;
-    public static final int __DB_db_open_4003 = 44;
-    public static final int __DB_db_get_extentsize_4003 = 30;
-    public static final int __DB_dbc_get_4003 = 66;
-    public static final int __DB_db_cursor_4003 = 60;
-    public static final int __DB_txn_commit_4003 = 17;
-    public static final int __DB_dbc_del_4003 = 64;
-    public static final int __DB_env_create_4003 = 4;
-    public static final int __DB_env_open_4003 = 13;
-    public static final int __DB_txn_prepare_4003 = 19;
-    public static final int __DB_db_get_re_pad_4003 = 54;
-    public static final int __DB_db_pget_4003 = 47;
-    public static final int __DB_db_stat_4003 = 57;
-    public static final int __DB_db_h_nelem_4003 = 40;
-    public static final int __DB_db_remove_4003 = 55;
-    public static final int __DB_db_get_flags_4003 = 32;
-    public static final int __DB_db_re_delim_4003 = 50;
-    public static final int __DB_db_re_pad_4003 = 53;
-    public static final int __DB_env_get_flags_4003 = 9;
-    public static final int __DB_txn_abort_4003 = 15;
-    public static final int __DB_env_get_encrypt_flags_4003 = 7;
-    public static final int __DB_db_get_encrypt_flags_4003 = 28;
-    public static final int __DB_db_get_h_ffactor_4003 = 37;
-    public static final int __DB_txn_recover_4003 = 20;
-    public static final int __DB_db_get_4003 = 34;
-    public static final int __DB_db_extentsize_4003 = 31;
-    public static final int __DB_db_get_h_nelem_4003 = 39;
-    public static final int __DB_dbc_put_4003 = 68;
-    public static final int DB_RPC_SERVERPROG = 351457;
-    public static final int __DB_db_get_re_len_4003 = 51;
-    public static final int __DB_db_truncate_4003 = 59;
-    public static final int __DB_db_del_4003 = 27;
-    public static final int __DB_db_bt_maxkey_4003 = 22;
-    public static final int __DB_env_dbremove_4003 = 5;
-    public static final int __DB_db_get_pagesize_4003 = 45;
-    public static final int __DB_db_get_name_4003 = 35;
-    public static final int __DB_txn_discard_4003 = 18;
-    public static final int __DB_db_re_len_4003 = 52;
-    public static final int __DB_env_close_4003 = 3;
-    public static final int __DB_env_flags_4003 = 10;
-    public static final int __DB_db_rename_4003 = 56;
-    public static final int __DB_db_get_bt_minkey_4003 = 23;
-    public static final int __DB_db_associate_4003 = 21;
-    public static final int __DB_txn_begin_4003 = 16;
-    public static final int __DB_env_encrypt_4003 = 8;
-    public static final int __DB_db_h_ffactor_4003 = 38;
-    public static final int __DB_db_put_4003 = 48;
-    public static final int __DB_db_create_4003 = 26;
-    public static final int __DB_env_get_home_4003 = 11;
-    public static final int __DB_dbc_count_4003 = 63;
-}
-// End of db_server.java
diff --git a/db/rpc_server/java/jrpcgen.jar b/db/rpc_server/java/jrpcgen.jar
deleted file mode 100644
index 338825b84..000000000
--- a/db/rpc_server/java/jrpcgen.jar
+++ /dev/null
diff --git a/db/rpc_server/java/oncrpc.jar b/db/rpc_server/java/oncrpc.jar
deleted file mode 100644
index e0f5cfa69..000000000
--- a/db/rpc_server/java/oncrpc.jar
+++ /dev/null
diff --git a/db/rpc_server/java/s_jrpcgen b/db/rpc_server/java/s_jrpcgen
deleted file mode 100644
index b585f431f..000000000
--- a/db/rpc_server/java/s_jrpcgen
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -jar jrpcgen.jar -d gen -noclient -nobackup -p com.sleepycat.db.rpcserver -s ServerStubs ../db_server.x
diff --git a/db/rpc_server/rpc.src b/db/rpc_server/rpc.src
index ec834332a..26fe6ff0e 100644
--- a/db/rpc_server/rpc.src
+++ b/db/rpc_server/rpc.src
@@ -1,9 +1,8 @@
 # See the file LICENSE for redistribution information.
 #
-# Copyright (c) 1999-2006
-#	Oracle Corporation.  All rights reserved.
+# Copyright (c) 1999,2007 Oracle.  All rights reserved.
 #
-# $Id: rpc.src,v 12.20 2006/09/11 15:52:44 bostic Exp $
+# $Id: rpc.src,v 12.30 2007/06/22 17:50:28 bostic Exp $
 #
 # Syntax:
 # BEGIN	function_name  {CODE | LINKONLY | RETCODE}
@@ -97,6 +96,7 @@ ARET	INT	u_int32_t	gbytes
 ARET	INT	u_int32_t	bytes
 ARET	INT	int		ncache
 END
+NOFUNC	env_get_cache_max	DB_ENV *, u_int32_t *, u_int32_t *
 NOFUNC	env_get_data_dirs	DB_ENV *, const char ***
 BEGIN	env_get_encrypt_flags	CODE
 ARG	ID	DB_ENV *	dbenv
@@ -123,7 +123,7 @@ NOFUNC	env_get_lk_max_lockers	DB_ENV *, u_int32_t *
 NOFUNC	env_get_lk_max_locks	DB_ENV *, u_int32_t *
 NOFUNC	env_get_lk_max_objects	DB_ENV *, u_int32_t *
 NOFUNC	env_get_mp_max_openfd	DB_ENV *, int *
-NOFUNC	env_get_mp_max_write	DB_ENV *, int *, int *
+NOFUNC	env_get_mp_max_write	DB_ENV *, int *, db_timeout_t *
 NOFUNC	env_get_mp_mmapsize	DB_ENV *, size_t *
 LOCAL	env_get_msgfile
 BEGIN	env_get_open_flags	CODE
@@ -131,6 +131,7 @@ ARG	ID	DB_ENV *	dbenv
 ARET	INT	u_int32_t	flags
 END
 NOFUNC	env_get_shm_key		DB_ENV *, long *
+NOFUNC	env_get_thread_count	DB_ENV *, u_int32_t *
 NOFUNC	env_get_timeout		DB_ENV *, db_timeout_t *, u_int32_t
 NOFUNC	env_get_tmp_dir		DB_ENV *, const char **
 NOFUNC	env_get_tx_max		DB_ENV *, u_int32_t *
@@ -186,15 +187,16 @@ ARG	ID	DB_ENV *	dbenv
 ARG	STRING	const char *	home
 ARG	INT	u_int32_t	flags
 END
-NOFUNC	env_rep_elect		DB_ENV *, int, int, int *, u_int32_t
+NOFUNC	env_rep_elect		DB_ENV *, int, int, u_int32_t
 NOFUNC	env_rep_flush		DB_ENV *
 NOFUNC	env_rep_get_config	DB_ENV *, u_int32_t, int *
 NOFUNC	env_rep_get_limit	DB_ENV *, u_int32_t *, u_int32_t *
 NOFUNC	env_rep_get_nsites	DB_ENV *, int *
 NOFUNC	env_rep_get_priority	DB_ENV *, int *
 NOFUNC	env_rep_get_timeout	DB_ENV *, int, db_timeout_t *
-NOFUNC	env_rep_process_message	DB_ENV *, DBT *, DBT *, int *, DB_LSN *
+NOFUNC	env_rep_process_message	DB_ENV *, DBT *, DBT *, int, DB_LSN *
 NOFUNC	env_rep_set_config	DB_ENV *, u_int32_t, int
+NOFUNC	env_rep_set_lease	DB_ENV *, u_int32_t, u_int32_t
 NOFUNC	env_rep_set_limit	DB_ENV *, u_int32_t, u_int32_t
 NOFUNC	env_rep_set_nsites	DB_ENV *, int
 NOFUNC	env_rep_set_priority	DB_ENV *, int
@@ -210,6 +212,8 @@ NOFUNC	env_repmgr_set_ack_policy	DB_ENV *, int
 NOFUNC	env_repmgr_set_local_site	DB_ENV *, const char *, u_int, u_int32_t
 NOFUNC	env_repmgr_site_list	DB_ENV *, u_int *, DB_REPMGR_SITE **
 NOFUNC	env_repmgr_start	DB_ENV *, int, u_int32_t
+NOFUNC	env_repmgr_stat		DB_ENV *, DB_REPMGR_STAT **, u_int32_t
+NOFUNC	env_repmgr_stat_print	DB_ENV *, u_int32_t
 NOFUNC	env_set_alloc		DB_ENV *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)
 NOFUNC	env_set_app_dispatch	DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)
 BEGIN	env_set_cachesize	CODE
@@ -218,6 +222,7 @@ ARG	INT	u_int32_t	gbytes
 ARG	INT	u_int32_t	bytes
 ARG	INT	int		ncache
 END
+NOFUNC	env_set_cache_max	DB_ENV *, u_int32_t, u_int32_t
 NOFUNC	env_set_data_dir	DB_ENV *, const char *
 BEGIN	env_set_encrypt		CODE
 ARG	ID	DB_ENV *	dbenv
@@ -247,7 +252,7 @@ NOFUNC	env_set_lk_max_lockers	DB_ENV *, u_int32_t
 NOFUNC	env_set_lk_max_locks	DB_ENV *, u_int32_t
 NOFUNC	env_set_lk_max_objects	DB_ENV *, u_int32_t
 NOFUNC	env_set_mp_max_openfd	DB_ENV *, int
-NOFUNC	env_set_mp_max_write	DB_ENV *, int, int
+NOFUNC	env_set_mp_max_write	DB_ENV *, int, db_timeout_t
 NOFUNC	env_set_mp_mmapsize	DB_ENV *, size_t
 LOCAL	env_set_msgcall
 LOCAL	env_set_msgfile
@@ -327,6 +332,7 @@ ARG	INT	u_int32_t	flags
 END
 LOCAL	db_err
 LOCAL	db_errx
+LOCAL	db_exists
 NOFUNC	db_fd			DB *, int *
 BEGIN	db_get			RETCODE
 ARG	ID	DB *		dbp
@@ -373,6 +379,7 @@ ARET	INT	int		lorder
 END
 NOFUNC	db_get_mpf		DB *
 LOCAL	db_get_msgfile
+LOCAL	db_get_multiple
 BEGIN	db_get_open_flags	CODE
 ARG	ID	DB *		dbp
 ARET	INT	u_int32_t	flags
@@ -381,6 +388,10 @@ BEGIN	db_get_pagesize		CODE
 ARG	ID	DB *		dbp
 ARET	INT	u_int32_t	pagesize
 END
+BEGIN	db_get_priority		CODE
+ARG	ID	DB *		dbp
+ARET	INT	DB_CACHE_PRIORITY	priority
+END
 BEGIN	db_get_q_extentsize	CODE
 ARG	ID	DB *		dbp
 ARET	INT	u_int32_t	extentsize
@@ -484,6 +495,7 @@ BEGIN	db_set_flags		CODE
 ARG	ID	DB *		dbp
 ARG	INT	u_int32_t	flags
 END
+NOFUNC	db_set_h_compare	DB *, int (*)(DB *, const DBT *, const DBT *)
 BEGIN	db_set_h_ffactor	CODE
 ARG	ID	DB *		dbp
 ARG	INT	u_int32_t	ffactor
@@ -504,6 +516,10 @@ ARG	ID	DB *		dbp
 ARG	INT	u_int32_t	pagesize
 END
 NOFUNC	db_set_paniccall	DB *, void (*)(DB_ENV *, int)
+BEGIN	db_set_priority		CODE
+ARG	ID	DB *		dbp
+ARG	INT	DB_CACHE_PRIORITY	priority
+END
 BEGIN	db_set_q_extentsize	CODE
 ARG	ID	DB *		dbp
 ARG	INT	u_int32_t	extentsize
@@ -546,26 +562,26 @@ NOFUNC	db_verify		DB *, const char *, const char *, FILE *, u_int32_t
 ######################################################
 # DBC handle methods.
 ######################################################
-BEGIN	dbc_c_close		RETCODE
+BEGIN	dbc_close		RETCODE
 ARG	ID	DBC *		dbc
 END
-BEGIN	dbc_c_count		RETCODE
+BEGIN	dbc_count		RETCODE
 ARG	ID	DBC *		dbc
 ARG	IGNORE	db_recno_t *	countp
 ARG	INT	u_int32_t	flags
 RET	INT	db_recno_t	dupcount
 END
-BEGIN	dbc_c_del		CODE
+BEGIN	dbc_del			CODE
 ARG	ID	DBC *		dbc
 ARG	INT	u_int32_t	flags
 END
-BEGIN	dbc_c_dup		RETCODE
+BEGIN	dbc_dup			RETCODE
 ARG	ID	DBC *		dbc
 ARG	IGNORE	DBC **		dbcp
 ARG	INT	u_int32_t	flags
 RET	ID	long		dbcid
 END
-BEGIN	dbc_c_get		RETCODE
+BEGIN	dbc_get			RETCODE
 ARG	ID	DBC *		dbc
 ARG	DBT	DBT *		key
 ARG	DBT	DBT *		data
@@ -573,7 +589,11 @@ ARG	INT	u_int32_t	flags
 RET	DBT	DBT *		key
 RET	DBT	DBT *		data
 END
-BEGIN	dbc_c_pget		RETCODE
+BEGIN	dbc_get_priority	CODE
+ARG	ID	DBC *		dbc
+ARET	INT	DB_CACHE_PRIORITY	priority
+END
+BEGIN	dbc_pget		RETCODE
 ARG	ID	DBC *		dbc
 ARG	DBT	DBT *		skey
 ARG	DBT	DBT *		pkey
@@ -583,13 +603,17 @@ RET	DBT	DBT *		skey
 RET	DBT	DBT *		pkey
 RET	DBT	DBT *		data
 END
-BEGIN	dbc_c_put		RETCODE
+BEGIN	dbc_put			RETCODE
 ARG	ID	DBC *		dbc
 ARG	DBT	DBT *		key
 ARG	DBT	DBT *		data
 ARG	INT	u_int32_t	flags
 RET	DBT	DBT *		key
 END
+BEGIN	dbc_set_priority	CODE
+ARG	ID	DBC *		dbc
+ARG	INT	DB_CACHE_PRIORITY	priority
+END
 
 ######################################################
 # DB_TXN handle methods.