Merge lp:~pbeaman/akiban-persistit/release-3.3 into lp:akiban-persistit

[Peter Beaman]

Change version from 3.3 to 3.3.0 for consistency with other releases.

Fix documentation, including ReleaseNotes.rst

Fix issue in which Exchange#lock() creates a tree inside a transaction and consequently writes s transaction record with an unknown tree handle causing subsequent recovery failure.

[lp:~pbeaman/akiban-persistit/release-3.3]

439. By Peter Beaman on 2013-05-18

ReleaseNotes typos

440. By Peter Beaman on 2013-05-18

ReleaseNotes typos

[Peter Beaman (pbeaman)]

Because this branch contains only one minor functional change - a bug fix needed to run akiban-server - I am Approving this myself in preparation for release.

=== modified file '.bzrignore'
--- .bzrignore	2012-08-02 04:31:26 +0000
+++ .bzrignore	2013-05-18 01:41:28 +0000
@@ -9,3 +9,5 @@
 ./bench/akiban-persistit-bench.iml
 ./core/akiban-persistit-core.iml
 .DS_Store
+maven-eclipse.xml
+

=== modified file 'doc/BugList'
--- doc/BugList	2012-11-30 20:33:30 +0000
+++ doc/BugList	2013-05-18 01:41:28 +0000
@@ -1,3 +1,67 @@
+1055557 : 3.3.0
+
+`Trees removed inside transaction can automatically come back`
+
+Resolved by support for creating and removing trees within transactions.
+
+1174352 : 3.3.0
+
+`Transaction commit and abort cannot be performed from a different Thread`
+
+A ReentrantLock was replaced by a Semaphore to allow modification of locked 
+state by different threads.
+
+1167056 : 3.3.0
+
+`Value returned from Accumulator#update() is non-transactional`
+
+The issue was unintended use of a value returned from this method. The Accumulator 
+API was reworked to avoid confusion.
+
+1161062 : 3.3.0
+
+`Missing public constructor for com.persistit.SessionId`
+
+Added.
+
+1159313 : 3.3.0
+
+`Deadlock in Bug882219Test`
+
+We determined that a deadlock exists in the Java 7 implementation of
+AbstractInterruptibleChannel independent of Persistit. Bug number 9002674 was 
+assigned by the Oracle Java Bug Database. In the meantime, the test has been
+disabled to avoid hung builds.
+
+1157809 : 3.3.0
+
+`Appending value to a Key causes an ArrayIndexOutOfBoundsException`
+
+An attempt to append overflow the backing store of a ``com.persistit.Key`` now
+throws a ``com.persistit.exceptions.KeyTooLongException``.
+
+1133039 : 3.3.0
+
+`Pruning incomplete on simple DUPLICATE_KEY error`
+
+The actual cause of this bug was inadequate pruning velocity when cleaning up transactions 
+using the new ``com.persistit.Exchange#lock`` method. Locked elements are now
+pruned synchronously to avoid overloading the cleanup manager. 
+
+1126868 : 3.3.0
+
+`Lock table not pruned`
+
+See 1133039 above.
+
+1126297 : 3.3.0
+
+'Assertion failure in TransactionIndexBucket#allocateTransactionStatus'
+
+Corrected by allowing a different thread than the one that created it to
+abort a transaction.
+
+
 1076517 : 3.2.2
 
 `InUseExceptions in stress tests`

=== modified file 'doc/ReleaseNotes.rst'
--- doc/ReleaseNotes.rst	2013-04-30 16:03:38 +0000
+++ doc/ReleaseNotes.rst	2013-05-18 01:41:28 +0000
@@ -1,10 +1,17 @@
 ************************************
-Akiban Persistit Version 3.3
+Akiban Persistit Version 3.3.0
 ************************************
 
+May 17, 2013
+
 Overview
 ========
-See http://akiban.github.com/persistit for a summary of features and benefits, licensing information and how to get support.
+See http://akiban.github.com/persistit for a summary of features and benefits and how to get support.
+
+.. note:: 
+   This version of Persistit is released under the Apache License, Version 2.0. Previous 
+   releases were licensed under the Eclipse Public License.  We made this change for 
+   better compatibility with other open source projects.
 
 Documentation
 =============
@@ -47,7 +54,14 @@
 =========================
 For optimal performance, proper configuration of the Persistit buffer pool is required.  See section "Configuring the Buffer Pool" in the configuration document http://akiban.github.com/persistit/docs/Configuration.html
 
-.. note:: Especially when used with multi-gigabyte heaps, the default Hotspot JVM server heuristics are be suboptimal for Persistit applications. Persistit is usually configured to allocate a large fraction of the heap to Buffer instances that are allocated at startup and held for the duration of the Persistit instance. For efficient operation, all of the Buffer instances must fit in the tenured (old) generation of the heap to avoid very significant garbage collector overhead.  Use either -XX:NewSize or -Xmn to adjust the relative sizes of the new and old generations.
+.. note:: 
+   Especially when used with multi-gigabyte heaps, the default Hotspot JVM server heuristics are 
+   suboptimal for Persistit applications. Persistit is usually configured to allocate a large 
+   fraction of the heap to Buffer instances that are allocated at startup and held for the 
+   duration of the Persistit instance. For efficient operation, all of the Buffer instances 
+   must fit in the tenured (old) generation of the heap to avoid very significant garbage 
+   collector overhead. Use either -XX:NewSize or -Xmn to adjust the relative sizes of 
+   the new and old generations.
 
 |
 |
@@ -58,15 +72,15 @@
 +---------+--------------------+--------------------------------------------------------------------------+
 | Version | Release Date       |  Summary                                                                 |
 +=========+====================+==========================================================================+
-| 3.3.1   | May 3, 2013        | License changed from Eclipse Public License to Apache License, Version   |
-|         |                    | 2.0 for better compatibility with open source projects. Trees and        |
-|         |                    | volumes are now created and removed correctly within the scope of a      |
-|         |                    | transaction. Better support for session management of transactions.      |
+| 3.3.0   | May 17, 2013       | Change license from Eclipse Public License to Apache License, Version    |
+|         |                    | 2.0. Create and remove Trees correctly within the scope of a transaction.|
+|         |                    | Correct problems with transaction session management. Modify             |
+|         |                    | Accumulator API to better suggest correct usage.                         |
 +---------+--------------------+--------------------------------------------------------------------------+
-| 3.2.7   | March 22, 2013     | Several new API features, including TreeBuilder, Traverse Visitor,       |
+| 3.2.7   | March 22, 2013     | Add several new API features, including TreeBuilder, Traverse Visitor    |
 |         |                    | and Lock. Fix several non-critical bugs.                                 |
 +---------+--------------------+--------------------------------------------------------------------------+
-| 3.2.2   | November 30, 2012  | Better support for Spring Framework. Fix rare but serious bugs found in  |
+| 3.2.2   | November 30, 2012  | Improve support for Spring Framework. Fix rare but serious bugs found in |
 |         |                    | stress tests. Fix issue related to locale and make sure Persistit builds |
 |         |                    | everywhere.                                                              |
 +---------+--------------------+--------------------------------------------------------------------------+
@@ -91,15 +105,52 @@
 +---------+--------------------+--------------------------------------------------------------------------+
 
 
-Resolved Issues
-===============
-
-{{bug-list}}
-
 Changes and New Features
 ========================
 
-Persistit 3.2.7 - TreeBuilder
+3.3.0 - License
+-----------------------------------------------------
+Akiban Persistit is now licensed under the Apache License, Version 2.0.
+
+3.3.0 - Creating and Removing Trees in Transactions
+-------------------------------------------------------------
+Resolving a long-standing anomaly in the Persistit API, this release now handles
+creation and deletion of Tree instances correctly inside transactions. As a result,
+a transaction can create and populate a Tree which becomes visible within other
+transactions only when the transaction commits, and which is implicitly removed
+if the transaction aborts.  Similarly, the removal of a Tree within a
+transaction becomes visible to other transactions only upon commit.
+
+3.3.0 - Better Session Support
+-----------------------------------------------------
+This release corrects issues with session support. Each thread is assigned a
+``com.persistit.SessionId`` when it uses Persistit, and that SessionId is linked
+to a unique ``com.persistit.Transaction`` instance.  Usually a transaction is confined to a single
+thread that retains a single SessionId for its entire life.  However, for use cases in 
+which a server may support transactions that span multiple
+network requests, and where each request may be serviced by an arbitrary thread from a
+thread pool, there is support for changing the association of a SessionId with a thread. See
+notes in ``com.persistit.Transaction`` for details.
+
+This release corrects two issues related to sessions:
+
+* The constructor for SessionId is now public.
+* It is now possible for a thread other than the one that began the transaction
+  to commit it. Previous versions would throw an IllegalMonitorStateException in this
+  case.
+
+3.3.0 - Accumulator API
+-----------------------------------------------------
+The ``com.persistit.Accumulator`` class and its inner classes ``MinAccumulator``
+``MaxAccumulator``, ``SumAccumulator`` and ``SeqAccumulator`` provide an efficient
+way to update counts, sums and unique ID counters that would otherwise cause
+significant contention among concurrent transactions.  This release
+replaces a single method named ``update`` with a use-specific method for each
+type of Accumulator.  For example, the ``com.persistit.Accumulator.SeqAccumulator``
+class provides the method ``com.persistit.Accumulator.SeqAccumulator#allocate`` to
+allocate a sequence number.  See ``Accumulator`` class JavaDoc for details.
+
+3.2.7 - TreeBuilder
 -----------------------------------------------------
 Inserting a large set of records with non-sequential keys causes significant I/O overhead. Once the size
 of the Tree is larger than available main memory, each insertion can result in a disk write (to flush a page
@@ -113,7 +164,7 @@
 loaded a billion records with keys generated as UUID instances. See the API documentation for
 ``com.persistit.TreeBuilder`` for more information.
 
-Persistit 3.2.7 - Traverse Visitor
+3.2.7 - Traverse Visitor
 -----------------------------------------------------
 The ``com.persistit.Exchange#traverse`` methods provide Persistit's fundamental mechanism for iterating
 over a collection of keys within a Tree.  Each call to ``traverse`` (or ``com.persistit.Exchange#next`` or
@@ -123,7 +174,7 @@
 release adds a more efficient mechanism based on the visitor pattern. See ``com.persistit.Exchange.TraverseVisitor``
 for details.
 
-Persistit 3.2.7 - Lock to avoid Write Skew Anomalies
+3.2.7 - Lock to avoid Write Skew Anomalies
 -----------------------------------------------------
 Persistit transactions implement Snapshot Isolation to prevent concurrent transactions from interfering with
 each other.  See ``com.persistit.Transaction`` for details.
@@ -145,10 +196,10 @@
 result is a database state that could not have occurred if the transactions had run sequentially in any order.
 
 A well-known solution is to modify the transaction logic to perform an additional write operation to a common
-key. The ``com.persistit.Exchange#lock`` method provides a convenient and efficient mechanism for doing so. The``lock``
+key. The ``com.persistit.Exchange#lock`` method provides a convenient and efficient mechanism for doing so. The ``lock``
 method does not actually lock anything, but is so-named because it serves a similar function.
 
-Persistit 3.2.7 - Miscellaneous Issues
+3.2.7 - Miscellaneous Issues
 -----------------------------------------------------
 Changes needed to build and run Persistit on Mac OSX under Java 7 were made.
 
@@ -158,20 +209,20 @@
 
 displays all of the meta data contained in the volume file.  
 
-Persistit 3.2.2 - Spring Framework
+3.2.2 - Spring Framework
 -----------------------------------------------------
 Prior to this release Persistit was needlessly difficult to configure and initialize within Spring Framework.
-This version provides new setter methods and constructors on the com.persistit.Persistit object to allow easy
+This version provides new setter methods and constructors on the ``com.persistit.Persistit`` object to allow easy
 injection of configuration properties and make it possible to inject a fully instantiated
 Persistit instance within a Spring project. In addition, new methods were added to the 
-com.persistit.Configuration class to simplify supplying buffer pool and initial volume specifications.
+``com.persistit.Configuration`` class to simplify supplying buffer pool and initial volume specifications.
 Three of the ``com.persistit.Persistit#initialize`` methods were deprecated.
 
 This release also adds a new sample application that shows how a configured Persistit instance can be created. For
 Maven users, note that the pom.xml file now includes a dependency on Spring Framework in test scope only; Persistit 
 can still be deployed without any external dependencies.
 
-Persistit 3.2.2 - Bug Fixes
+3.2.2 - Bug Fixes
 -----------------------------------------------------
 Version 3.2.2 corrects two issues that were identified through stress tests. For this release
 we added hundreds of hours of stress-testing experience and will continue to invest in ongoing testing.
@@ -179,16 +230,16 @@
 This version also fixes a unit test with string literals containing numbers formatted according to en_US
 conventions. The test has been corrected and the Persistit build has been tested in several locales.
 
-Persistit 3.2.1 - Bug Fixes
+3.2.1 - Bug Fixes
 -----------------------------------------------------
 
 Version 3.2.1 is a maintenance release that fixes a number of non-critical bugs, primarily in less frequently
 used sections of the API. See the associated bug list for full descriptions of each resolved.
 
-Persistit 3.2.0 - Default Journal File Format Changed
+3.2.0 - Default Journal File Format Changed
 -----------------------------------------------------
 
-Version 3.2.0 fixes problems related to Volumes created and opened by the com.persistit.Persistit#loadVolume 
+Version 3.2.0 fixes problems related to Volumes created and opened by the ``com.persistit.Persistit#loadVolume`` 
 method rather than being specified by the initial system configuration. In previous versions, journal files 
 contained insufficient information to properly recover such volumes, even during normal startup.
 
@@ -203,12 +254,12 @@
 (see com.persistit.Configuration#setUseOldVSpec). When this property is +true+, Persistit writes 
 journal files that are backward-compatible, but incapable of supporting dynamically created volumes.
 
-Persistit 3.2.0 - Performance Improvements
+3.2.0 - Performance Improvements
 ------------------------------------------
 
 Version 3.2.0 significantly improves I/O performance for concurrent transactions and
 better controls the number of journal files created during by very aggressive loads. A new attribute
-in the com.persistit.mxbeans.JournalManagerMXBean class called urgentFileCountThreshold controls the
+in the ``com.persistit.mxbeans.JournalManagerMXBean`` class called ``urgentFileCountThreshold`` controls the
 maximum number of journal files Persistit will create before ramping the up the urgency of copying pages to
 allow purging old files. Several other issues related to I/O scheduling and management of 
 dirty pages were resolved.
@@ -218,7 +269,7 @@
 significant reduction in the amount of space consumed by obsolete version and also results in better
 transaction throughput.
 
-Persistit 3.1.7 - Code Base Reformatted
+3.1.7 - Code Base Reformatted
 ---------------------------------------
 
 To simplify diffs and improve legibility, the entire code base was reformatted and "cleaned up" 
@@ -226,7 +277,7 @@
 source to ensure coherent diffs in the future.  The settings for formatting and code style 
 cleanup by Eclipse are found in the ``src/etc`` directory.
 
-Persistit 3.1.7 - Buffer Pool Preload
+3.1.7 - Buffer Pool Preload
 -------------------------------------
 
 On a server with a large buffer pool (many gigabytes), a Persistit instance can run for a long 
@@ -241,11 +292,11 @@
 800,000 16Kbyte buffers in about a minute, which is orders of magnitude faster than the 
 same process would take with reads performed incrementally at random.
 
-Two new configuration properties com.persistit.Configuration#setBufferInventoryEnabled and 
-com.persistit.Configuration#setBufferPreloadEnabled control this behavior. These settings 
+Two new configuration properties ``com.persistit.Configuration#setBufferInventoryEnabled`` and 
+``com.persistit.Configuration#setBufferPreloadEnabled`` control this behavior. These settings 
 are turned off by default in version 3.1.7.
 
-Persistit 3.1.4 - Detecting and Ignoring Missing Volumes
+3.1.4 - Detecting and Ignoring Missing Volumes
 --------------------------------------------------------
 
 Every time Persistit writes a modified page to disk, it does so first to the journal. 
@@ -258,10 +309,10 @@
 volume from an existing Database, this change provides a configurable switch to optionally 
 allow pages from missing volumes to be skipped (with logged warning messages) during recovery 
 processing.  The switch can be enabled by setting the configuration parameter 
-com.persistit.Configuration#setIgnoreMissingVolumes to true.
-
-
-Persistit 3.1.4 - Reduce KeyCoder Serialized Object Size
+``com.persistit.Configuration#setIgnoreMissingVolumes`` to true.
+
+
+3.1.4 - Reduce KeyCoder Serialized Object Size
 --------------------------------------------------------
 
 .. note::
@@ -276,7 +327,7 @@
 appended to a Key right next to any other type. This is tagged internally with per-class 
 handles. This change lowers the initial offset to reduce and in many cases halve the serialized size. 
 
-Persistit 3.1.4 - Maven POM Changes For Eclipse Juno 
+3.1.4 - Maven POM Changes For Eclipse Juno 
 ----------------------------------------------------
 
 The latest version of Eclipse, code named Juno, features a wide array of changes, including a 
@@ -285,7 +336,7 @@
 
 Please contact Akiban if you have encounter any issues getting up and running with Persistit.   
 
-Persistit 3.1.2 - Asserts Added to Check for Correct Exchange Thread Behavior
+3.1.2 - Asserts Added to Check for Correct Exchange Thread Behavior
 -----------------------------------------------------------------------------
 
 A bug in the Akiban Server code caused an Exchange to be used concurrently by two Threads, 
@@ -294,22 +345,14 @@
 asserts were added to catch such concurrent use by multiple threads.  Applications should 
 be tested with asserts enabled to verify correct thread usage.
 
-
-
-Known Issues
-============
-
-Transactional Tree Management
------------------------------
-
-All operations within Trees such as store, fetch, remove and traverse are correctly supported 
-within transactions. However, the operations to create and delete Tree instances currently do 
-not respect transaction boundaries. For example, if a transaction creates a new Tree, it is 
-immediately visible within other Transactions and will continue to exist even if the original 
-transaction aborts.  (However, records inserted or modified by the original transaction will 
-not be visible until the transaction commits.) Prior to creating/removing trees, transaction 
-processing should be quiesced and allowed to complete.
-
+Resolved Issues
+===============
+
+{{bug-list}}
+
+
+Unresolved Issues
+=================
 
 Out of Memory Error, Direct Memory Buffer
 ------------------------------------------------------
@@ -327,7 +370,7 @@
 
 https://bugs.launchpad.net/akiban-persistit/+bug/986465
 
-The getChangeCount method may return inaccurate results as its not currently transactional.  
+The getChangeCount method may return inaccurate results as it is not currently transactional.  
 The primary consumer is the PersistitMap. As a result of this bug Persistit may not generate 
 java.util.ConcurrentModificationException when it is supposed to.
 

=== modified file 'doc/build/build-doc.sh' (properties changed: -x to +x)
=== modified file 'doc/conf.py'
--- doc/conf.py	2013-03-24 17:25:45 +0000
+++ doc/conf.py	2013-05-18 01:41:28 +0000
@@ -50,7 +50,7 @@
 #
 # version = short X.Y version.
 # release = full version, including alpha/beta/rc tags.
-version = '3.2.8'
+version = '3.3.0'
 release = version
 
 # Included while processing every rst file. Used only for working around inability
@@ -259,7 +259,7 @@
 epub_title = u'Persistit'
 epub_author = u'Akiban Technologies'
 epub_publisher = u'Akiban Technologies'
-epub_copyright = u'2012, Akiban Technologies'
+epub_copyright = u'2013, Akiban Technologies'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

=== modified file 'examples/FindFile/README.txt'
--- examples/FindFile/README.txt	2013-04-30 15:26:32 +0000
+++ examples/FindFile/README.txt	2013-05-18 01:41:28 +0000
@@ -42,7 +42,7 @@
 	
 	- or -
 	
-	javac -classpath ../../core/target/akiban-persistit-xx.yy.zz-SNAPSHOT-jar-with-dependencies-and-tests.jar FindFile.java
+	javac -classpath ../../core/target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar FindFile.java
 
 To run FindFile:
 
@@ -50,7 +50,7 @@
 	
 	- or -
 	
-	java -classpath ../../core/target/akiban-persistit-xx.yy.zz-SNAPSHOT-jar-with-dependencies-and-tests.jar;. FindFile
+	java -classpath ../../core/target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;. FindFile
 
 Persistit will place a volume file in paths specified by persistit.properties.
 You can change the location of these files by modifying the datapath property 

=== modified file 'examples/HelloWorld/README.txt'
--- examples/HelloWorld/README.txt	2013-04-30 15:26:32 +0000
+++ examples/HelloWorld/README.txt	2013-05-18 01:41:28 +0000
@@ -30,7 +30,7 @@
 	
 	- or -
 	
-	javac -classpath ../../core.target/akiban-persistit-xx.yy.zz-SNAPSHOT-jar-with-dependencies-and-tests.jar HelloWorld.java
+	javac -classpath ../../core.target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar HelloWorld.java
 
 To run HelloWorld:
 
@@ -38,7 +38,7 @@
 	
 	- or -
 	
-	java -classpath ../../core/target/akiban-persistit-xx.yy.zz-SNAPSHOT-jar-with-dependencies-and-tests.jar;. HelloWorld
+	java -classpath ../../core/target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;. HelloWorld
 
 Persistit will place a volume file in paths specified by persistit.properties.
 You can change the location of these files by modifying the datapath property

=== modified file 'examples/PersistitMapDemo/README.txt'
--- examples/PersistitMapDemo/README.txt	2013-04-30 15:26:32 +0000
+++ examples/PersistitMapDemo/README.txt	2013-05-18 01:41:28 +0000
@@ -27,7 +27,7 @@
 	
 	- or -
 	
-	javac -classpath ../../core/target/akiban-persistit-xx.yy.zz-SNAPSHOT-jar-with-dependencies-and-tests.jar PersistitMapDemo.java
+	javac -classpath ../../core/target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar PersistitMapDemo.java
 
 To run PersistitMapDemo:
 
@@ -35,7 +35,7 @@
 	
 	- or -
 	
-	java -classpath ../../core/target/akiban-persistit-xx.yy.zz-SNAPSHOT-jar-with-dependencies-and-tests.jar;. PersistitMapDemo
+	java -classpath ../../core/target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;. PersistitMapDemo
 
 Persistit will place a volume file in paths specified by persistit.properties.
 You can change the location of these files by modifying the datapath property

=== modified file 'examples/SimpleBench/README.txt'
--- examples/SimpleBench/README.txt	2013-04-30 15:26:32 +0000
+++ examples/SimpleBench/README.txt	2013-05-18 01:41:28 +0000
@@ -36,7 +36,7 @@
 	
 	- or -
 	
-	javac -classpath ../../target/akiban-persistit-2.1-SNAPSHOT-jar-with-dependencies-and-tests.jar SimpleBench.java
+	javac -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar SimpleBench.java
 
 To run SimpleBench:
 
@@ -44,13 +44,13 @@
 	
 	- or -
 	
-	java -classpath ../../target/akiban-persistit-2.1-SNAPSHOT-jar-with-dependencies-and-tests.jar;. SimpleBench
+	java -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;. SimpleBench
 
 By default, SimpleBench will create its volume, prewrite journal and log files
 in your current working directory. You can change the location of these files
 by specifying system properties, for example:
 
-	java -classpath ../../target/akiban-persistit-2.1-SNAPSHOT-jar-with-dependencies-and-tests.jar;.
+	java -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;.
 		-Dcom.persistit.datapath=/myDataPath
 		-Dcom.persistit.logpath=/myLogPath
 		 SimpleBench

=== modified file 'examples/SimpleDemo/README.txt'
--- examples/SimpleDemo/README.txt	2013-04-30 15:26:32 +0000
+++ examples/SimpleDemo/README.txt	2013-05-18 01:41:28 +0000
@@ -34,7 +34,7 @@
 	
 	- or -
 	
-	javac -classpath ../../lib/persistit_jsa110.jar SimpleDemo.java
+    javac -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar SimpleDemo.java
 
 To run SimpleDemo:
 
@@ -42,11 +42,7 @@
 	
 	- or -
 	
-	java -classpath ../../lib/persistit_jsa110.jar;. SimpleDemo
-
-To run SimpleDemo without building it first:
-
-	java -classpath ../../lib/persistit_jsa110.jar;../../lib/examples.jar SimpleDemo
+	java -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;. SimpleDemo
 
 Persistit will place a volume file in paths specified by persistit.properties.
 You can change the location of these files by modifying the datapath property

=== modified file 'examples/SimpleTransaction/README.txt'
--- examples/SimpleTransaction/README.txt	2013-04-30 15:26:32 +0000
+++ examples/SimpleTransaction/README.txt	2013-05-18 01:41:28 +0000
@@ -29,7 +29,7 @@
 	
 	- or -
 	
-	javac -classpath ../../target/akiban-persistit-2.1-SNAPSHOT-jar-with-dependencies-and-tests.jar SimpleTransaction.java
+	javac -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar SimpleTransaction.java
 
 To run SimpleTransaction:
 
@@ -37,7 +37,7 @@
 	
 	- or -
 	
-	java -classpath ../../target/akiban-persistit-2.1-SNAPSHOT-jar-with-dependencies-and-tests.jar;. SimpleTransaction
+	java -classpath ../../target/akiban-persistit-x.y.z-SNAPSHOT-jar-with-dependencies-and-tests.jar;. SimpleTransaction
 
 Persistit will place a volume file in paths specified by persistit.properties.
 You can change the location of these files by modifying the datapath property

=== modified file 'examples/SpringFrameworkExample/README.txt'
--- examples/SpringFrameworkExample/README.txt	2013-04-30 15:26:32 +0000
+++ examples/SpringFrameworkExample/README.txt	2013-05-18 01:41:28 +0000
@@ -27,7 +27,7 @@
 	
 	- or -
 	
-	javac -classpath ../../target/akiban-persistit-3.2.2-jar-with-dependencies-and-tests.jar SpringFrameworkExample.java
+	javac -classpath ../../target/akiban-persistit-x.y.z-jar-with-dependencies-and-tests.jar SpringFrameworkExample.java
 
 To run SimpleTransaction:
 
@@ -35,7 +35,7 @@
 	
 	- or -
 	
-	java -classpath ../../target/akiban-persistit-3.2.2-jar-with-dependencies-and-tests.jar;. SpringFrameworkExample
+	java -classpath ../../target/akiban-persistit-x.y.z-jar-with-dependencies-and-tests.jar;. SpringFrameworkExample
 
 Persistit will place a volume file in paths specified by persistit.properties.
 You can change the location of these files by modifying the datapath property

=== modified file 'pom.xml'
--- pom.xml	2013-04-30 15:51:52 +0000
+++ pom.xml	2013-05-18 01:41:28 +0000
@@ -4,7 +4,7 @@
 
     <groupId>com.akiban</groupId>
     <artifactId>akiban-persistit</artifactId>
-    <version>3.3-SNAPSHOT</version>
+    <version>3.3.0</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -23,8 +23,8 @@
 
     <licenses>
         <license>
-            <name>Eclipse Public License - v 1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+            <name>Apache License, Version 2.0</name>
+            <url>http://http://www.apache.org/licenses/LICENSE-2.0.html</url>
             <distribution>repo</distribution>
         </license>
     </licenses>

=== modified file 'src/main/java/com/persistit/VolumeStructure.java'
--- src/main/java/com/persistit/VolumeStructure.java	2013-04-30 15:26:32 +0000
+++ src/main/java/com/persistit/VolumeStructure.java	2013-05-18 01:41:28 +0000
@@ -257,7 +257,7 @@
             }
         } else {
             final Exchange ex = directoryExchange();
-            if (!tree.isTransactionPrivate(false)) {
+            if (!tree.isTransactionPrivate(false) || _volume.isLockVolume()) {
                 ex.ignoreTransactions();
             }
             ex.getValue().put(tree);

=== modified file 'src/test/java/com/persistit/Bug882219Test.java'
--- src/test/java/com/persistit/Bug882219Test.java	2013-04-30 15:26:32 +0000
+++ src/test/java/com/persistit/Bug882219Test.java	2013-05-18 01:41:28 +0000
@@ -22,6 +22,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.persistit.Transaction.CommitPolicy;
@@ -53,7 +54,17 @@
     // Flush caches:
     // sudo sh -c "echo 3 > /proc/sys/vm/drop_caches"
     //
+    /*
+     * Note: under Java 7 this test sometimes fails due to a bug in the JDK. The
+     * result is a deadlock that sometimes prevents this test from finishing.
+     * For this reason the test is currently Ignored, but we enable it for
+     * special occasions.
+     * 
+     * Reported under http://bugs.sun.com/ bug #9002674
+     */
+
     @Test
+    @Ignore
     public void testInterrupts() throws Exception {
         final Exchange ex = _persistit.getExchange("persistit", "bug882219", true);
         final Thread foregroundThread = Thread.currentThread();

=== modified file 'src/test/java/com/persistit/TransactionSessionSwitchTest.java'
--- src/test/java/com/persistit/TransactionSessionSwitchTest.java	2013-04-30 18:29:45 +0000
+++ src/test/java/com/persistit/TransactionSessionSwitchTest.java	2013-05-18 01:41:28 +0000
@@ -16,7 +16,7 @@
 
 package com.persistit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,8 +55,8 @@
     private final static int THREADS = 17;
     private final static long TIMEOUT = 10000;
 
-    private Queue<SessionId> sessionQueue = new ArrayBlockingQueue<SessionId>(SESSIONS);
-    private Map<SessionId, AtomicInteger> sessionState = new HashMap<SessionId, AtomicInteger>();
+    private final Queue<SessionId> sessionQueue = new ArrayBlockingQueue<SessionId>(SESSIONS);
+    private final Map<SessionId, AtomicInteger> sessionState = new HashMap<SessionId, AtomicInteger>();
 
     @Test
     public void sessionManagement() throws Exception {
@@ -66,15 +66,16 @@
             sessionState.put(sessionId, new AtomicInteger(0));
         }
 
-        Thread[] threads = new Thread[THREADS];
+        final Thread[] threads = new Thread[THREADS];
 
         final Tree tree = _persistit.getVolume("persistit").getTree("tt", true);
         for (int i = 0; i < THREADS; i++) {
             threads[i] = new Thread(new Runnable() {
+                @Override
                 public void run() {
                     SessionId session;
                     while ((session = sessionQueue.poll()) != null) {
-                        int state = sessionState.get(session).get();
+                        final int state = sessionState.get(session).get();
                         try {
                             _persistit.setSessionId(session);
                             final Transaction txn = _persistit.getTransaction();
@@ -88,12 +89,12 @@
                                 }
                                 txn.end();
                             } else {
-                                Exchange ex = _persistit.getExchange(tree.getVolume(), tree.getName(), false);
+                                final Exchange ex = _persistit.getExchange(tree.getVolume(), tree.getName(), false);
                                 ex.getValue().put(Thread.currentThread().getName());
                                 ex.clear().append(session.hashCode()).append(state).store();
                                 _persistit.releaseExchange(ex);
                             }
-                        } catch (PersistitException e) {
+                        } catch (final PersistitException e) {
                             throw new RuntimeException(e);
                         } finally {
                             if (state <= STEPS) {
@@ -109,7 +110,7 @@
         ConcurrentUtil.startAndJoinAssertSuccess(TIMEOUT, threads);
 
         final Exchange ex = _persistit.getExchange(tree.getVolume(), tree.getName(), false);
-        for (SessionId session : sessionState.keySet()) {
+        for (final SessionId session : sessionState.keySet()) {
             int count = 0;
             ex.clear().append(session.hashCode()).append(Key.BEFORE);
             while (ex.next()) {