rdbxml 2.3.10 → 2.4.13.2

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Steve Sloan
+Copyright (c) 2006-2009 Steve Sloan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -0,0 +1,33 @@
+= RDBXML -- XML Databases for Ruby
+
+This package provides wrapper functions to the C++ API for Oracle Berkeley
+DB XML (Dbxml) and as well as pure-Ruby convenience functions (RDBXML).
+
+== Requirements
+* Rake[http://rake.rubyforge.org] >= 7.0
+* Oracle {Berkeley DB XML}[http://www.oracle.com/technology/products/berkeley-db/xml/index.html] = 2.4.13
+
+== Example Usage
+  require 'rubygems'
+  require 'rdbxml'
+
+  # create database directory
+  env_dir = './db-env'
+  Dir.mkdir env_dir  unless File.exists? env_dir
+
+  # create environment, database, and container
+  env = RDBXML::env env_dir
+  db = RDBXML::XmlManager.new env, 0
+  docs = db['documents']
+
+  # Create document
+  docs['Document Name'] = '<doc>Document XML</doc>'
+
+  # Read document
+  puts docs['Document Name'].to_s
+
+Author::    Steve Sloan (mailto:steve@finagle.org)
+Website::   http://rdbxml.rubyforge.org
+Rubyforge:: http://rubyforge.org/projects/rdbxml
+Copyright:: Copyright (c) 2006-2009 Steve Sloan
+License::   MIT

data/Rakefile

@@ -5,95 +5,51 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require 'fileutils'
 
-GEM_VERSION = '2.3.10'
-
-dbxml_dist = ENV['DBXML_DIST']
-if dbxml_dist
-  puts "*** Using DBXML distribution in #{dbxml_dist}"
-  Rake::ExtensionTask.env.update(
-    :swig_includedirs => [File.join( dbxml_dist, 'dbxml/dist/swig' ), '.'],
-    :includedirs => File.join( dbxml_dist, 'install/include' ),
-    :libdirs => File.join( dbxml_dist, 'install/lib' )
-  )
-else
-  Rake::ExtensionTask.env.update(
-    :includedirs => '/usr/local/include',
-    :libdirs => '/usr/local/lib'
-  )
-end
+GEM_VERSION = '2.4.13.2'
+ifacedir = File.join( File.dirname(__FILE__), 'ext' )
+Rake::ExtensionTask.env[:swig_includedirs] << ifacedir
 
 desc "Build the interface extension"
-task :extensions => [:db, :dbxml]
-
-desc "Build the BDB interface extension"
-Rake::SWIGExtensionTask.new :db do |t|
-  t.dir = 'ext'
-  t.link_libs += ['db', 'db_cxx']
-end
+task :extensions => :dbxml
 
 desc "Build the BDBXML interface extension"
 Rake::SWIGExtensionTask.new :dbxml do |t|
   t.dir = 'ext'
-  t.deps[:dbxml] << :dbxml_ruby
-  t.link_libs += ['db', 'db_cxx', 'dbxml', 'xqilla', 'xerces-c']
+  t.deps[:dbxml] += [ :'db-minimal', :dbxml_ruby ]
+  t.link_libs += ['db', 'db_cxx', 'dbxml-2.4', 'xqilla', 'xerces-c']
 end
-CLEAN.exclude 'ext/dbxml_wrap.cc'  # Hack for swig bug
 
 task :test => :extensions
 Rake::TestTask.new do |t|
-  t.libs << "ext"
+  t.libs << 'ext'
   t.test_files = FileList['test/test_*.rb']
   t.verbose = true
   CLEAN.include 'test/test_*.db'
 end
 
-task :install => [:test, :clean] do end
-
-docs = Rake::RDocTask.new :rdoc do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.title    = "RDBXML -- XML Databases for Ruby"
-  rdoc.options += ['--line-numbers', '--inline-source', '--main', 'README', '--exclude', 'ext/*.c*']
-  rdoc.rdoc_files.include 'README', 'MIT-LICENSE'
-  rdoc.rdoc_files.include 'lib/**/*.rb'
-  rdoc.rdoc_files.include 'docs/**/*.rb', 'docs/**/*.rdoc'
-  rdoc.rdoc_files.include 'rake/**/*task.rb'
-end
-
-GEM_FILES = docs.rdoc_files + FileList[
-  'Rakefile',
-  'ext/**/*.i',
-  'ext/dbxml_wrap.cc',  # Hack for SWIG bug
-  'rake/**/*.rb',
-  'test/**/test_*.rb',
-]
-
-spec = Gem::Specification.new do |s|
-  s.platform = Gem::Platform::RUBY
-  s.name = 'rdbxml'
-  s.version = GEM_VERSION
-  s.date = Date.today.to_s
-  s.authors = ["Steve Sloan"]
-  s.summary = 'Provides wrappers for the BDB XML C++ APIs, plus pure Ruby extensions'
-#  s.description =
-  s.files = GEM_FILES.to_a.delete_if {|f| f.include?('.svn')}
-  s.autorequire = 'rdbxml'
-  s.test_files = Dir["test/test_*.rb"]
-  s.add_dependency 'rake', '> 0.7.0'
-
-  s.extensions << './extconf.rb'
-  s.require_paths << 'ext'
-
-  s.has_rdoc = true
-  s.extra_rdoc_files = docs.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-  s.rdoc_options = docs.options
-end
-Rake::GemPackageTask.new spec  do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
+if File.exist? 'rdbxml.gemspec'
+  spec = Gem::Specification.load 'rdbxml.gemspec'
+  Rake::GemPackageTask.new spec  do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+  end
 end
 
-task :default => :extensions
-task :all => :extensions
+# docs = Rake::RDocTask.new :rdoc do |rdoc|
+#   rdoc.rdoc_dir = 'html'
+#   rdoc.title    = "RDBXML -- XML Database for Ruby"
+#   rdoc.options += ['--line-numbers', '--inline-source', '--main', 'README.rdoc', '--exclude', 'ext/*.c*']
+#   rdoc.rdoc_files.include 'README.rdoc', 'MIT-LICENSE'
+#   rdoc.rdoc_files.include 'lib/**/*.rb'
+#   rdoc.rdoc_files.include 'docs/**/*.rb', 'docs/**/*.rdoc'
+#   rdoc.rdoc_files.include 'rake/**/*task.rb'
+# end
+# if File.exist? 'publish.rake'
+#   load 'publish.rake'
+#   task :cruise => :publish
+# end
+
+task :default =>  [ :extensions, :test, :clean ]
 
-load 'publish.rf' if File.exist? 'publish.rf'

data/docs/dbxml.rb

@@ -1,6 +1,10 @@
 # = Dbxml -- Berkly DB XML API Interface
 #
-# This module provides a wrapper around the BDB XML C++ API: http://www.sleepycat.com/xmldocs/api_cxx/api_xml.html
+# This module provides a wrapper around the {Berkeley DB XML C++ API}[http://www.oracle.com/technology/documentation/berkeley-db/xml/api_cxx/frame.html]
 
 module Dbxml
 end
+
+# Wraps and extends the DbEnv[http://www.oracle.com/technology/documentation/berkeley-db/xml/api_cxx/env_class.html] class.
+class Dbxml::DbEnv
+end

data/ext/db-minimal.i

@@ -0,0 +1,78 @@
+class DbTxn
+{
+public:
+	int abort();
+	int commit(u_int32_t flags);
+	int discard(u_int32_t flags);
+	u_int32_t id();
+	int set_timeout(db_timeout_t timeout, u_int32_t flags);
+
+private:
+	// Note: use DbEnv::txn_begin() to get pointers to a DbTxn,
+	// and call DbTxn::abort() or DbTxn::commit rather than
+	// delete to release them.
+	//
+	DbTxn();
+	virtual ~DbTxn();
+};
+
+class DbEnv
+{
+public:
+	// After using this constructor, you can set any needed
+	// parameters for the environment using the set_* methods.
+	// Then call open() to finish initializing the environment
+	// and attaching it to underlying files.
+	//
+	DbEnv(u_int32_t flags);
+	virtual ~DbEnv();
+
+	// These methods match those in the C interface.
+	//
+	virtual int close(u_int32_t);
+	virtual int dbremove(DbTxn *txn, const char *name, const char *subdb,
+	    u_int32_t flags);
+	virtual int dbrename(DbTxn *txn, const char *name, const char *subdb,
+	    const char *newname, u_int32_t flags);
+	virtual int open(const char *, u_int32_t, int);
+	virtual int remove(const char *, u_int32_t);
+	virtual int set_cachesize(u_int32_t, u_int32_t, int);
+	virtual int set_data_dir(const char *);
+	virtual int set_encrypt(const char *, u_int32_t);
+	virtual void set_errpfx(const char *);
+	virtual int set_flags(u_int32_t, int);
+	virtual int set_lg_bsize(u_int32_t);
+	virtual int set_lg_dir(const char *);
+	virtual int set_lg_max(u_int32_t);
+	virtual int set_lg_regionmax(u_int32_t);
+	virtual int set_lk_detect(u_int32_t);
+	virtual int set_lk_max_lockers(u_int32_t);
+	virtual int set_lk_max_locks(u_int32_t);
+	virtual int set_lk_max_objects(u_int32_t);
+	virtual int set_mp_mmapsize(size_t);
+	virtual int set_shm_key(long);
+	virtual int set_timeout(db_timeout_t, u_int32_t);
+	virtual int set_tmp_dir(const char *);
+	virtual int mutex_set_tas_spins(u_int32_t);
+	virtual int set_tx_max(u_int32_t);
+	virtual int set_verbose(u_int32_t which, int);
+
+	// Version information.  A static method so it can be obtained anytime.
+	//
+	static char *version(int *major, int *minor, int *patch);
+
+	// Convert DB errors to strings
+	static char *strerror(int);
+
+	// Transaction functions
+	//
+%extend {
+	DbTxn *txn_begin(DbTxn *pid, u_int32_t flags) {
+		DbTxn *txn;
+		self->txn_begin(pid, &txn, flags);
+		return txn;
+	}
+}
+	virtual int txn_checkpoint(u_int32_t kbyte, u_int32_t min,
+			u_int32_t flags);
+};

data/ext/dbxml.i

@@ -7,7 +7,48 @@
 #include <errno.h>
 #include <fstream>
 
+/* compat w/pre-4.4 */
+#ifndef DB_READ_COMMITTED
+#define DB_READ_COMMITTED DB_DEGREE_2
+#define DB_READ_UNCOMMITTED DB_DIRTY_READ
+#endif
+
+/* If these are not defined, there are no equivalents; just make things compile */
+#ifndef DB_TXN_SNAPSHOT
+#define DB_TXN_SNAPSHOT -1
+#define DB_MULTIVERSION -1
+#endif
+%}
+
+#if !defined(SWIGJAVA)
+%{
 using namespace DbXml;
+%}
+#endif
+
+#if defined(SWIGJAVA)
+%include "std_string.i"
+%include "dbxml_java.i"
+#elif defined(SWIGPYTHON)
+%include "std_string.i"
+%include "dbxml_python.i"
+#elif defined(SWIGTCL8)
+%include "std_string.i"
+%include "dbxml_tcl.i"
+#elif defined(SWIGCSHARP)
+%include "dbxml_csharp.i"
+#elif defined(SWIGPHP4)
+%include "std_string.i"
+%include "dbxml_php4.i"
+#elif defined(SWIGRUBY)
+%include "std_string.i"
+%include "std_except.i"
+%include "dbxml_ruby.i"
+#else
+#error "Unknown SWIG target language"
+#endif
+
+%{
 
 class XmlIndexDeclaration {
 public:
@@ -36,33 +77,13 @@ public:
 
 %}
 
-#if defined(SWIGJAVA)
-%include "std_string.i"
-%include "dbxml_java.i"
-#elif defined(SWIGPYTHON)
-%include "std_string.i"
-%include "dbxml_python.i"
-#elif defined(SWIGTCL8)
-%include "std_string.i"
-%include "dbxml_tcl.i"
-#elif defined(SWIGCSHARP)
-%include "dbxml_csharp.i"
-#elif defined(SWIGPHP4)
-%include "std_string.i"
-%include "dbxml_php4.i"
-#elif defined(SWIGRUBY)
-%include "dbxml_ruby.i"
-#else
-#error "Unknown SWIG target language"
-#endif
-
 // DBXML_USEOVERLOADS -- defined when a language supports overloaded
 // functions.  If defined, the "OVERLOAD_NAME" macro is a no-op
 #if defined(SWIGJAVA) || defined(SWIGPYTHON) || defined(SWIGCSHARP) || defined(SWIGTCL8) || defined(SWIGRUBY)
 #define DBXML_USEOVERLOADS
 #endif
 
-#if defined(SWIGJAVA) || defined(SWIGPYTHON)
+#if defined(SWIGJAVA) || defined(SWIGPYTHON) || defined(SWIGRUBY)
 #define DBXML_USE_RESOLVER
 #endif
 
@@ -70,19 +91,25 @@ public:
 typedef int int32_t;
 
 class XmlManager;
+#ifndef SWIGJAVA
 class XmlDocument;
+#endif
 class XmlContainer;
 class XmlIndexSpecification;
 class XmlIndexLookup;
 class XmlInputStream;
-class XmlQueryContext;
 class XmlResults;
 class XmlUpdateContext;
+#ifndef SWIGJAVA
+class XmlQueryContext;
 class XmlValue;
+#endif
 class XmlQueryExpression;
 class XmlModify;
 class XmlTransaction;
+#ifndef SWIGJAVA
 class XmlMetaDataIterator;
+#endif
 class XmlStatistics;
 class XmlEventReader;
 class XmlEventWriter;
@@ -103,11 +130,23 @@ class XmlResolver;
 #ifndef SWIGJAVA
 // For Java, this is done differently
 enum {
-	DB_CREATE, DB_READ_UNCOMMITTED, DB_DIRTY_READ,
-	DB_EXCL, DB_NOMMAP, DB_RDONLY, DB_THREAD,
-	DB_READ_COMMITTED, DB_DEGREE_2,
-	DB_INIT_LOCK, DB_INIT_LOG, DB_INIT_MPOOL, DB_INIT_TXN,
-	DB_SALVAGE, DB_AGGRESSIVE
+	DB_CREATE,
+	DB_READ_UNCOMMITTED,
+	DB_DIRTY_READ,
+	DB_EXCL,
+	DB_NOMMAP,
+	DB_RDONLY,
+	DB_THREAD,
+	DB_READ_COMMITTED,
+	DB_DEGREE_2,
+	DB_INIT_LOCK,
+	DB_INIT_LOG,
+	DB_INIT_MPOOL,
+	DB_INIT_TXN,
+	DB_SALVAGE,
+	DB_AGGRESSIVE,
+    	DB_TXN_SNAPSHOT,
+	DB_MULTIVERSION
 };
 
 #endif
@@ -128,19 +167,23 @@ enum {
 //
 // Global flags
 enum {
-	DBXML_ADOPT_DBENV =        0x00000001,
+	DBXML_ADOPT_DBENV           = 0x00000001,
 	DBXML_ALLOW_EXTERNAL_ACCESS = 0x00000002,
-	DBXML_ALLOW_AUTO_OPEN    = 0x00000004,
+	DBXML_ALLOW_AUTO_OPEN       = 0x00000004,
 	DBXML_ALLOW_VALIDATION      = 0x00100000,
 	DBXML_TRANSACTIONAL         = 0x00200000,
 	DBXML_CHKSUM                = 0x00400000,
 	DBXML_ENCRYPT               = 0x00800000,
 	DBXML_INDEX_NODES           = 0x01000000,
-	DBXML_NO_INDEX_NODES        = 0x02000000,
+	DBXML_NO_INDEX_NODES        = 0x00010000,
+	DBXML_STATISTICS            = 0x02000000,
+	DBXML_NO_STATISTICS         = 0x04000000,
 	DBXML_REVERSE_ORDER         = 0x00100000,
 	DBXML_INDEX_VALUES          = 0x00200000,
 	DBXML_CACHE_DOCUMENTS       = 0x00400000,
 	DBXML_LAZY_DOCS             = 0x00800000,
+	DBXML_DOCUMENT_PROJECTION   = 0x80000000,
+	DBXML_NO_AUTO_COMMIT        = 0x00010000,
 	DBXML_WELL_FORMED_ONLY      = 0x01000000,
 	DBXML_GEN_NAME              = 0x02000000
 };
@@ -254,7 +297,11 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 %newobject XmlContainer::getIndexSpecification(XmlTransaction&) const;
 %newobject XmlContainer::getIndexSpecification(XmlTransaction&,
 					       u_int32_t flags) const;
+#ifdef SWIGJAVA
+%newobject XmlManager::createIndexLookupInternal(
+#else
 %newobject XmlManager::createIndexLookup(
+#endif
 	XmlContainer &cont,
 	const std::string &uri,
 	const std::string &name,
@@ -270,15 +317,17 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 #ifndef SWIGJAVA
 %newobject XmlContainer::getDocument(const std::string&);
 %newobject XmlContainer::getDocument(XmlTransaction&, const std::string&);
-%newobject XmlContainer::getNode(const std::string&);
-%newobject XmlContainer::getNode(XmlTransaction&, const std::string&);
 #endif
 %newobject XmlContainer::getDocument(const std::string&, u_int32_t);
 %newobject XmlContainer::getDocument(XmlTransaction&, const std::string&,
 				     u_int32_t);
+#ifndef SWIGJAVA
 %newobject XmlContainer::getNode(const std::string&, u_int32_t);
+%newobject XmlContainer::getNode(XmlTransaction&, const std::string&);
+%newobject XmlContainer::getNode(const std::string&);
 %newobject XmlContainer::getNode(XmlTransaction&, const std::string&,
 				 u_int32_t);
+#endif
 %newobject XmlContainer::getAllDocuments(u_int32_t);
 %newobject XmlContainer::getAllDocuments(XmlTransaction&, u_int32_t);
 %newobject XmlContainer::lookupIndex(XmlQueryContext &, const std::string &,
@@ -349,11 +398,11 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 				     const std::string &, const std::string &,
 				     const std::string &, const std::string &,
 				     const std::string &, const XmlValue &);
-
+#ifndef SWIGJAVA
 %newobject XmlDocument::getContent() const;
 %newobject XmlDocument::getMetaDataIterator() const;
 %newobject XmlDocument::getContentAsXmlInputStream() const;
-
+#endif
 %newobject XmlQueryContext::getVariableValue(const std::string&) const;
 
 %newobject XmlQueryExpression::execute(XmlQueryContext &, u_int32_t) const;
@@ -370,7 +419,7 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 				       XmlQueryContext &) const;
 
 
-#if defined(SWIGJAVA) || defined(SWIGPYTHON) || defined(SWIGPHP4) || defined(SWIGRUBY)
+#if defined(SWIGPYTHON) || defined(SWIGPHP4) || defined(SWIGRUBY)
 %newobject XmlResults::next();
 %newobject XmlResults::previous();
 %newobject XmlResults::peek();
@@ -380,6 +429,7 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 %newobject XmlValue::asDocument(const XmlQueryContext*) const;
 #endif
 
+#ifndef SWIGJAVA
 %newobject XmlValue::getParentNode() const;
 %newobject XmlValue::getFirstChild() const;
 %newobject XmlValue::getLastChild() const;
@@ -389,12 +439,12 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 %newobject XmlValue::getOwnerElement() const;
 %newobject XmlValue::asBinary() const;
 %newobject XmlValue::loadNodeHandle() const;
-
+#endif
 %newobject XmlIndexSpecification::find(const std::string&, const std::string&);
 %newobject XmlIndexSpecification::next();
-
+#ifndef SWIGJAVA
 %newobject XmlMetaDataIterator::next();
-
+#endif
 #if defined(DBXML_USE_RESOLVER)
 %newobject XmlResolver::resolveSchema(XmlTransaction*, XmlManager&, const std::string&, const std::string&) const;
 %newobject XmlResolver::resolveEntity(XmlTransaction*, XmlManager&, const std::string&, const std::string&) const;
@@ -431,9 +481,10 @@ OVERLOAD_NAME(XmlManagerFromEnv)
 	u_int32_t getDefaultSequenceIncrement();
 	void setDefaultContainerType(enum XmlContainer::ContainerType type);
 	enum XmlContainer::ContainerType getDefaultContainerType();
-#ifndef SWIGJAVA
-	DbEnv *getDbEnv();
-#endif
+// getDbEnv() does not readily translate to scripting interfaces.  If users
+// need it, they should create and save it themselves.
+//	DbEnv *getDbEnv();
+
 	const std::string &getHome() const;
 #if defined(DBXML_USE_RESOLVER)
 	void registerResolver(const XmlResolver &resolver);
@@ -452,6 +503,14 @@ OVERLOAD_NAME(renameContainerWithTxn)
 	void renameContainer(XmlTransaction &txn, const std::string &oldName,
 			     const std::string &newName);
 	void upgradeContainer(const std::string &name, XmlUpdateContext &uc);
+#ifdef SWIGJAVA
+	void compactContainer(const std::string &name, XmlUpdateContext &uc);
+	void compactContainer(XmlTransaction &txn, const std::string &name,
+			      XmlUpdateContext &uc);
+	void truncateContainer(const std::string &name, XmlUpdateContext &uc);
+	void truncateContainer(XmlTransaction &txn, const std::string &name,
+			       XmlUpdateContext &uc);
+#else
 	void compactContainer(const std::string &name, XmlUpdateContext &uc,
 			      u_int32_t flags = 0);
 	void compactContainer(XmlTransaction &txn, const std::string &name,
@@ -460,6 +519,7 @@ OVERLOAD_NAME(renameContainerWithTxn)
 			       u_int32_t flags = 0);
 	void truncateContainer(XmlTransaction &txn, const std::string &name,
 			       XmlUpdateContext &uc, u_int32_t flags = 0);
+#endif
 	void reindexContainer(const std::string &name, XmlUpdateContext &uc,
 			      u_int32_t flags = 0);
 	void reindexContainer(XmlTransaction &txn, const std::string &name,
@@ -601,17 +661,15 @@ OVERLOAD_NAME(openContainerWithTxnAndType)
 		if (flags & DB_SALVAGE)
 			out.close();
 	}
+#ifndef SWIGJAVA
 	XmlDocument *createDocument() {
 		return new XmlDocument(self->createDocument());
 	}
-
 	XmlQueryContext *createQueryContext(
 		enum XmlQueryContext::ReturnType rt,
 		enum XmlQueryContext::EvaluationType et) {
 		return new XmlQueryContext(self->createQueryContext(rt, et));
 	}
-
-
 OVERLOAD_NAME(createQueryContextDefaultAll)
 	XmlQueryContext *createQueryContext() {
 		return new XmlQueryContext(self->createQueryContext(
@@ -623,11 +681,10 @@ OVERLOAD_NAME(createQueryContextDefaultEvalType)
 		enum XmlQueryContext::ReturnType rt) {
 		return new XmlQueryContext(self->createQueryContext(rt, XmlQueryContext::Eager));
 	}
-
 	XmlUpdateContext *createUpdateContext() {
 		return new XmlUpdateContext(self->createUpdateContext());
 	}
-
+#endif
 	XmlQueryExpression *prepare(const std::string &query,
 				    XmlQueryContext &context) {
 		return new XmlQueryExpression(self->prepare(query, context));
@@ -639,8 +696,8 @@ OVERLOAD_NAME(prepareWithTxn)
 		return new XmlQueryExpression(self->prepare(
 						      txn,query, context));
 	}
-        XmlResults *query(const std::string &query, XmlQueryContext &context,
-			  u_int32_t flags) {
+    	  XmlResults *query(const std::string &query, XmlQueryContext &context,
+		  	  u_int32_t flags) {
 		return new XmlResults(self->query(query, context, flags));
 	}
 OVERLOAD_NAME(queryWithTxn)
@@ -682,8 +739,11 @@ OVERLOAD_NAME(createTransactionDefaultFlags)
 		return new XmlTransaction(self->createTransaction((u_int32_t)0));
         }
 #endif
-
+#ifdef SWIGJAVA
+          XmlIndexLookup *createIndexLookupInternal(
+#else
         XmlIndexLookup *createIndexLookup(
+#endif
 		XmlContainer &cont,
 		const std::string &uri, const std::string &name,
 		const std::string &index,
@@ -743,8 +803,8 @@ public:
 	};
 #ifndef SWIGJAVA
 	XmlIndexLookup();
-#endif
 	XmlIndexLookup(const XmlIndexLookup &o);
+#endif
 	~XmlIndexLookup();
 	bool isNull() const;
 	const std::string &getIndex() const;
@@ -757,19 +817,37 @@ public:
 	const std::string &getParentURI() const;
 	const std::string &getParentName() const;
 	void setParent(const std::string &uri, const std::string &name);
-
+#ifndef SWIGJAVA
 	const XmlValue &getLowBoundValue() const;
+#endif
 	enum XmlIndexLookup::Operation getLowBoundOperation() const;
+#ifdef SWIGJAVA
+%rename(setLowBoundInternal) setLowBound;
 	void setLowBound(const XmlValue &value,
 			 enum XmlIndexLookup::Operation op);
-
+#else
+	void setLowBound(const XmlValue &value,
+			 enum XmlIndexLookup::Operation op);
+#endif
+#ifndef SWIGJAVA
 	const XmlValue &getHighBoundValue() const;
+#endif
 	enum XmlIndexLookup::Operation getHighBoundOperation() const;
+#ifdef SWIGJAVA
+%rename(setHighBoundInternal) setHighBound;
 	void setHighBound(const XmlValue &value,
 			  enum XmlIndexLookup::Operation op);
-
+#else
+	void setHighBound(const XmlValue &value,
+			  enum XmlIndexLookup::Operation op);
+#endif
+#ifndef SWIGJAVA
 	const XmlContainer &getContainer() const;
 	void setContainer(XmlContainer &container);
+#else
+	%rename(setContainerInternal) setContainer;
+	void setContainer(XmlContainer &container);
+#endif
 %extend {
 	XmlResults *execute(XmlQueryContext &context,
 			    u_int32_t flags = 0) const {
@@ -870,25 +948,28 @@ OVERLOAD_NAME(replaceDefaultIndexWithTxn)
 	void replaceDefaultIndex(XmlTransaction &txn, const std::string &index,
 				 XmlUpdateContext &uc);
 
-
-
+#ifndef SWIGJAVA
 	void putDocument(XmlDocument &document, XmlUpdateContext &context,
 			 u_int32_t flags = 0);
+#endif
 OVERLOAD_NAME(putDocumentAsString)
 	std::string putDocument(const std::string &name, const std::string &contents,
 				XmlUpdateContext &context, u_int32_t flags = 0);
 OVERLOAD_NAME(putDocumentAsEventReader)
         std::string putDocument(const std::string &name, XmlEventReader &reader,
 				XmlUpdateContext &context, u_int32_t flags = 0);
+#ifndef SWIGJAVA
 OVERLOAD_NAME(putDocumentAsEventWriter)
         XmlEventWriter &putDocumentAsEventWriter(XmlDocument &document,
 						 XmlUpdateContext &context,
 						 u_int32_t flags = 0);
 	void deleteDocument(XmlDocument &document,
 			    XmlUpdateContext &context);
+#endif
 OVERLOAD_NAME(deleteDocumentByName)
 	void deleteDocument(const std::string &name,
 			    XmlUpdateContext &context);
+#ifndef SWIGJAVA
 	void updateDocument(XmlDocument &document,
 			    XmlUpdateContext &context);
 
@@ -904,9 +985,11 @@ OVERLOAD_NAME(putDocumentAsInputSourceWithTxn)
 				XmlInputStream *input,
 				XmlUpdateContext &context,
 				u_int32_t flags = 0);
+
 OVERLOAD_NAME(putDocumentWithTxn)
 	void putDocument(XmlTransaction &txn, XmlDocument &document,
 			 XmlUpdateContext &context, u_int32_t flags = 0);
+#endif
 OVERLOAD_NAME(putDocumentAsStringWithTxn)
 	std::string putDocument(XmlTransaction &txn,
 				const std::string &name,
@@ -919,6 +1002,7 @@ OVERLOAD_NAME(putDocumentAsEventReaderWithTxn)
 				XmlEventReader &reader,
 				XmlUpdateContext &context,
 				u_int32_t flags = 0);
+#ifndef SWIGJAVA
 OVERLOAD_NAME(putDocumentAsEventWriterWithTxn)
         XmlEventWriter &putDocumentAsEventWriter(XmlTransaction &txn,
 						 XmlDocument &document,
@@ -927,13 +1011,15 @@ OVERLOAD_NAME(putDocumentAsEventWriterWithTxn)
 OVERLOAD_NAME(deleteDocumentWithTxn)
 	void deleteDocument(XmlTransaction &txn, XmlDocument &document,
 			    XmlUpdateContext &context);
+#endif
 OVERLOAD_NAME(deleteDocumentByNameWithTxn)
 	void deleteDocument(XmlTransaction &txn, const std::string &name,
 			    XmlUpdateContext &context);
+#ifndef SWIGJAVA
 OVERLOAD_NAME(updateDocumentWithTxn)
 	void updateDocument(XmlTransaction &txn, XmlDocument &document,
 			    XmlUpdateContext &context);
-
+#endif
 	size_t getNumDocuments();
 OVERLOAD_NAME(getNumDocumentWithTxn)
 	size_t getNumDocuments(XmlTransaction &txn);
@@ -971,16 +1057,6 @@ OVERLOAD_NAME(getNodeWithTxn)
 	{
 		return new XmlValue(self->getNode(txn, name, 0));
 	}
-#endif
-OVERLOAD_NAME(getDocumentWithFlags)
-	XmlDocument *getDocument(const std::string &name, u_int32_t flags) {
-		return new XmlDocument(self->getDocument(name, flags));
-	}
-OVERLOAD_NAME(getDocumentWithFlagsAndTxn)
-	XmlDocument *getDocument(XmlTransaction &txn, const std::string &name,
-				 u_int32_t flags) {
-		return new XmlDocument(self->getDocument(txn, name, flags));
-	}
 OVERLOAD_NAME(getNodeWithFlags)
 	XmlValue *getNode(const std::string &name, u_int32_t flags) {
 		return new XmlValue(self->getNode(name, flags));
@@ -991,6 +1067,18 @@ OVERLOAD_NAME(getNodeWithFlagsAndTxn)
 		return new XmlValue(self->getNode(txn, name, flags));
 	}
 
+OVERLOAD_NAME(getDocumentWithFlags)
+	XmlDocument *getDocument(const std::string &name, u_int32_t flags) {
+		return new XmlDocument(self->getDocument(name, flags));
+	}
+OVERLOAD_NAME(getDocumentWithFlagsAndTxn)
+	XmlDocument *getDocument(XmlTransaction &txn, const std::string &name,
+				 u_int32_t flags) {
+		return new XmlDocument(self->getDocument(txn, name, flags));
+	}
+
+#endif
+
 	XmlResults *getAllDocuments(u_int32_t flags) {
 		   return new XmlResults(self->getAllDocuments(flags));
 	}
@@ -1085,18 +1173,13 @@ OVERLOAD_NAME(lookupEdgeStatisticsWithTxn)
 	}
 } /* %extend */
 };
-
-#ifdef SWIGJAVA
-%rename(setContentAsXmlInputStream_java) XmlDocument::setContentAsXmlInputStream;
-%rename(setContentAsEventReader_java) XmlDocument::setContentAsEventReader;
-#endif
-
+#ifndef SWIGJAVA
 class XmlDocument
 {
 public:
-#ifndef SWIGJAVA
+
 	XmlDocument();
-#endif
+
 	XmlDocument(const XmlDocument &o);
 	~XmlDocument();
 
@@ -1122,7 +1205,6 @@ OVERLOAD_NAME(setContentWithXmlData)
 
 	XmlEventReader &getContentAsEventReader() const;
 	void setContentAsEventReader(XmlEventReader &reader);
-
 	void getContentAsEventWriter(XmlEventWriter &writer);
 
 	void fetchAllData();
@@ -1134,11 +1216,9 @@ OVERLOAD_NAME(setContentWithXmlData)
 OVERLOAD_NAME(setMetaDataWithXmlData)
 	void setMetaData(const std::string &uri,
 			 const std::string &name, const XmlData &value);
-#ifndef SWIGJAVA
 OVERLOAD_NAME(getMetaDataAsXmlData)
 	bool getMetaData(const std::string &uri, const std::string &name,
 			 XmlData &value);
-#endif
 %extend {
 	std::string getContentAsString() const {
 		std::string s;
@@ -1205,7 +1285,6 @@ class XmlQueryContext
 public:
 	enum // ReturnType
 	{
-		DeadValues,
 		LiveValues
 	};
 
@@ -1216,9 +1295,7 @@ public:
 	};
 
 	/// Constructor.
-#ifndef SWIGJAVA
 	XmlQueryContext();
-#endif
 	XmlQueryContext(const XmlQueryContext &o);
 	~XmlQueryContext();
 
@@ -1226,10 +1303,8 @@ public:
 	std::string getNamespace(const std::string &prefix);
 	void removeNamespace(const std::string &prefix);
 	void clearNamespaces(void);
-
 	void setVariableValue(const std::string &name, const XmlValue &value);
 	void setVariableValue(const std::string &name, XmlResults &value);
-
 	void setBaseURI(const std::string &baseURI);
 	std::string getBaseURI() const;
 	void setReturnType(enum XmlQueryContext::ReturnType type);
@@ -1275,7 +1350,6 @@ public:
 			throw;
 		}
 	}
-
 #ifdef SWIGTCL8
 	const std::string get(const char *name) const {
 		XmlValue value;
@@ -1293,7 +1367,7 @@ public:
 #endif /* SWIGTCL8 */
 } /* %extend */
 };
-
+#endif //SWIGJAVA
 class XmlResults
 {
 public:
@@ -1301,11 +1375,13 @@ public:
 	XmlResults();
 #endif
 	~XmlResults();
+#ifndef SWIGJAVA
 	XmlResults(const XmlResults &results);
-
+#endif
 	bool hasNext();
 	bool hasPrevious();
-#if defined(SWIGJAVA) || defined(SWIGPYTHON) || defined(SWIGPHP4) || defined(SWIGRUBY)
+	bool isNull() const;
+#if defined(SWIGPYTHON) || defined(SWIGPHP4) || defined(SWIGRUBY)
 %extend {
 	XmlValue *next() {
 		XmlValue *value = new XmlValue;
@@ -1335,41 +1411,43 @@ public:
 		}
 	}
 } /* %extend */
+#elif defined(SWIGJAVA)
 #else
 	bool next(XmlValue &value);
 	bool previous(XmlValue &value);
 	bool peek(XmlValue &value);
 #endif
 	enum XmlQueryContext::EvaluationType getEvaluationType() const;
+#ifndef SWIGJAVA
 OVERLOAD_NAME(nextDocument)
 	bool next(XmlDocument &document);
 OVERLOAD_NAME(previousDocument)
 	bool previous(XmlDocument &document);
 OVERLOAD_NAME(peekDocument)
 	bool peek(XmlDocument &document);
-
+#endif
 #if defined(SWIGPYTHON)
 %pythoncode %{
 	def __iter__(self): return self
 %}
 #endif
+#ifndef SWIGJAVA
 	void reset();
 	size_t size() const;
 	void add(const XmlValue &value);
-
+#else
+	size_t size() const;
+%rename(resetInternal) reset;
+	void reset();
+#endif
 };
-
+#ifndef SWIGJAVA
 class XmlUpdateContext
 {
 public:
-#ifndef SWIGJAVA
 	XmlUpdateContext();
-#endif
 	XmlUpdateContext(const XmlUpdateContext &o);
 	virtual ~XmlUpdateContext();
-
-	void setApplyChangesToContainers(bool applyChanges);
-	bool getApplyChangesToContainers() const;
 };
 
 
@@ -1377,6 +1455,7 @@ class XmlValue
 {
 public:
 	//NOTE: these enumerations MUST match those in XmlValue.hpp
+	//The values should be copied to xml/src/java/com/sleepycat/dbxml/XmlValue.java
 	enum  //NodeType
 	{
 		ELEMENT_NODE = 1,
@@ -1464,8 +1543,6 @@ OVERLOAD_NAME(XmlValueTypedFromXmlData)
 
 	double asNumber() const;
 	std::string asString() const;
-OVERLOAD_NAME(asStringEncoded)
-	std::string asString(const std::string &encoding) const;
 	bool asBoolean() const;
 %extend {
 	XmlData * asBinary() const {
@@ -1522,6 +1599,7 @@ OVERLOAD_NAME(asStringEncoded)
 	}
 }
 };
+#endif /* SWIGJAVA */
 
 class XmlIndexSpecification {
 public:
@@ -1639,6 +1717,7 @@ public:
 
 	const std::string & getQuery() const;
 	std::string getQueryPlan() const;
+	bool isUpdateExpression() const;
 
 %extend {
 	XmlResults *execute(XmlQueryContext &context,
@@ -1772,8 +1851,6 @@ OVERLOAD_NAME(addAppendStepWithResults)
 	void addRenameStep(const XmlQueryExpression &selectionExpr,
 			   const std::string &newName);
 
-	void setNewEncoding(const std::string &newEncoding);
-
 	unsigned int execute(XmlValue &toModify, XmlQueryContext &context,
 			     XmlUpdateContext &uc) const;
 OVERLOAD_NAME(executeOnResults)
@@ -1831,6 +1908,8 @@ public:
 
 class XmlEventReader
 {
+protected:
+	XmlEventReader();
 public:
 	enum { // XmlEventType
 		StartElement,
@@ -1867,7 +1946,7 @@ public:
 // add an explicit call
 %extend {
 	const unsigned char *getValue() const {
-		int len;
+		size_t len;
 		return self->getValue(len);
 	}
 }
@@ -1875,8 +1954,8 @@ public:
 // byte length is not useful for Java.  It may not
 // be for other languages -- need to check
 %extend {
-	int getValueLength() const {
-		int len;
+	size_t getValueLength() const {
+		size_t len;
 		(void)self->getValue(len);
 		return len;
 	}
@@ -1910,6 +1989,8 @@ public:
 
 class XmlEventWriter
 {
+protected:
+	XmlEventWriter();
 public:
 	~XmlEventWriter();
 	void close();
@@ -1919,11 +2000,27 @@ public:
 			    const unsigned char *uri,
 			    const unsigned char *value,
 			    bool isSpecified);
-
+	// If length parameter is 0, the library will perform
+	// the counting.  This should be done if string length
+	// is != to the UTF-8 byte count (e.g. multi-byte chars)
 	void writeText(enum XmlEventReader::XmlEventType type,
 		       const unsigned char *text,
-		       int length);
+		       size_t length);
+	void writeDTD(const unsigned char *dtd, size_t length);
 
+// There is a problem with the Tcl overload here...
+#if defined(DBXML_USEOVERLOADS) && !defined(SWIGTCL8)
+	// Add no-length overloads
+%extend {
+	void writeText(enum XmlEventReader::XmlEventType type,
+		       const unsigned char *text) {
+		self->writeText(type, text, 0);
+	}
+	void writeDTD(const unsigned char *dtd) {
+		self->writeDTD(dtd, 0);
+	}
+}
+#endif
 	void writeProcessingInstruction(const unsigned char *target,
 					const unsigned char *data);
 
@@ -1936,7 +2033,6 @@ public:
 			     const unsigned char *prefix,
 			     const unsigned char *uri);
 
-	void writeDTD(const unsigned char *dtd, int length);
 	void writeStartDocument(const unsigned char *version,
 				const unsigned char *encoding,
 				const unsigned char *standalone);
@@ -1950,9 +2046,14 @@ public:
 class XmlEventReaderToWriter
 {
 public:
+#ifndef SWIGJAVA
 	XmlEventReaderToWriter(XmlEventReader &reader,
 			       XmlEventWriter &writer,
 			       bool ownsReader);
+#endif
+	XmlEventReaderToWriter(XmlEventReader &reader,
+			       XmlEventWriter &writer,
+			       bool ownsReader, bool ownsWriter);
 	~XmlEventReaderToWriter();
 
 	void start();