Merge lp:~pbeaman/akiban-persistit/support-spring-framework into lp:akiban-persistit

[Peter Beaman]

Adds infrastructure needed to support Spring Framework. With these changes it is possible without extraordinary effort to configure and initialize a Persistit instance within a Spring application.

Changes:

- new setters in Persistit
- new constructors in Persistit
- refactoring of the configuration and initialization code in Persistit
- changed behavior of initialize() - specifically the argument-less version
- new code in the Configuration class to allow a buffer pool configuration for multiple pools to be set by a simple string valued property.
- a new test that demonstrates the ability to inject an initialized Persistit instance
- a new example
- all uses of deprecated methods (initialize(Properties), initialize(Configuration)) replaced.

Normal applications using the original API are unaffected. However, a few tests in which the Configuration of a Persistit instance was read after the instance was closed were required to change since close() now removed the configuration from the instances.

Documentation changes will be done in a separate branch.

[Peter Beaman (pbeaman)]

I refactored away the Persistit#substituteProperties method too soon. Server trunk still uses it.

review: Needs Fixing

[lp:~pbeaman/akiban-persistit/support-spring-framework]

398. By Peter Beaman on 2012-11-21

Restore Persistit#substituteProperties

[Peter Beaman (pbeaman)]

There, it's back. TreeServiceImpl compiles once again.

review: Needs Resubmitting

[Nathan Williams (nwilliams)]

A lot of shuffling but it all looks pretty straight forward.

review: Approve

=== added directory 'examples/SpringFrameworkExample'
=== added file 'examples/SpringFrameworkExample/Beans.xml'
--- examples/SpringFrameworkExample/Beans.xml	1970-01-01 00:00:00 +0000
+++ examples/SpringFrameworkExample/Beans.xml	2012-11-21 16:34:24 +0000
@@ -0,0 +1,48 @@
+<!--
+
+    Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+    
+    This program and the accompanying materials are made available
+    under the terms of the Eclipse Public License v1.0 which
+    accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    
+    This program may also be available under different license terms.
+    For more information, see www.akiban.com or contact [e-mail].
+    
+    Contributors:
+    Akiban Technologies, Inc.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK" />
+        <property name="location" value="classpath:persistit.properties" />
+    </bean>
+
+    <bean id="persistit" class="com.persistit.Persistit" init-method="initialize">
+        <property name="configuration">
+            <bean class="com.persistit.Configuration">
+                <property name="bufferPoolConfiguration" value="8192,count=${buffer.count.8192}" />
+                <property name="volumeList">
+                    <list>
+                        <bean class="com.persistit.VolumeSpecification">
+                            <constructor-arg value="${volume.1}" />
+                        </bean>
+                    </list>
+                </property>
+                <property name="journalPath" value="${journalpath}" />
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="testClient" class="SpringFrameworkDemo.TestClient">
+        <constructor-arg>
+            <ref local="persistit" />
+        </constructor-arg>
+    </bean>
+
+</beans>
\ No newline at end of file

=== added file 'examples/SpringFrameworkExample/README.txt'
--- examples/SpringFrameworkExample/README.txt	1970-01-01 00:00:00 +0000
+++ examples/SpringFrameworkExample/README.txt	2012-11-21 16:34:24 +0000
@@ -0,0 +1,43 @@
+====
+    Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+    
+    This program and the accompanying materials are made available
+    under the terms of the Eclipse Public License v1.0 which
+    accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    
+    This program may also be available under different license terms.
+    For more information, see www.akiban.com or contact [e-mail].
+    
+    Contributors:
+    Akiban Technologies, Inc.
+====
+
+
+SpringFrameworkExample performs the following steps:
+
+-  Initializes com.persistit.Persistit using Spring Framework.
+-  Prints status message to indicate success.
+
+
+To build SpringFrameworkExample:
+
+	Run Ant on build.xml in this directory (target "compile")
+	
+	- or -
+	
+	javac -classpath ../../target/akiban-persistit-3.2.2-jar-with-dependencies-and-tests.jar SpringFrameworkExample.java
+
+To run SimpleTransaction:
+
+	Run Ant on build.xml in this directory (target "run")
+	
+	- or -
+	
+	java -classpath ../../target/akiban-persistit-3.2.2-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
+of this configuration file.
+
+	

=== added file 'examples/SpringFrameworkExample/SpringFrameworkDemo.java'
--- examples/SpringFrameworkExample/SpringFrameworkDemo.java	1970-01-01 00:00:00 +0000
+++ examples/SpringFrameworkExample/SpringFrameworkDemo.java	2012-11-21 16:34:24 +0000
@@ -0,0 +1,80 @@
+/**
+ * Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+ * 
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact [e-mail].
+ * 
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+import com.persistit.Persistit;
+import com.persistit.Volume;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+
+/**
+ * Simple example using Spring Framework to configure and initialize a Persistit
+ * instance.
+ * 
+ */
+public class SpringFrameworkDemo {
+
+    /**
+     * A "client" class that will receive a configured Persistit instance by
+     * constructor injection.
+     * 
+     * @author peter
+     * 
+     */
+    public static class TestClient {
+        final Persistit db;
+
+        public TestClient(final Persistit db) {
+            this.db = db;
+        }
+
+        private void test() {
+            if (db == null) {
+                System.out.println("Problem: no persistit bean was supplied");
+                return;
+            }
+            if (!db.isInitialized()) {
+                System.out.println("Problem: persistit was not initialized");
+                return;
+            }
+
+            final Volume volume = db.getVolume("springdemo");
+            if (volume == null) {
+                System.out.println("Problem: no volume named \"springdemo\" was created");
+                return;
+            }
+            
+            System.out.println("Success: Persistit was initialized and injected into the TestClient class");
+
+        }
+    }
+
+    public static void main(final String[] args) throws Exception {
+        ApplicationContext context = new ClassPathXmlApplicationContext("Beans.xml");
+        final Persistit db = (Persistit) context.getBean("persistit");
+        try {
+
+            final TestClient testClient = (TestClient) context.getBean("testClient");
+            testClient.test();
+
+        } finally {
+            if (db != null) {
+                db.close();
+            }
+        }
+    }
+
+}

=== added file 'examples/SpringFrameworkExample/build.xml'
--- examples/SpringFrameworkExample/build.xml	1970-01-01 00:00:00 +0000
+++ examples/SpringFrameworkExample/build.xml	2012-11-21 16:34:24 +0000
@@ -0,0 +1,56 @@
+<!--
+
+    Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+    
+    This program and the accompanying materials are made available
+    under the terms of the Eclipse Public License v1.0 which
+    accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    
+    This program may also be available under different license terms.
+    For more information, see www.akiban.com or contact [e-mail].
+    
+    Contributors:
+    Akiban Technologies, Inc.
+
+-->
+<project name="SpringFrameworkDemo" default="run" basedir=".">
+	<description>
+        Build SpringFrameworkDemo.java
+    </description>
+
+	<target name="compile" description="compile the source ">
+		<javac debug="true" srcdir="." destdir=".">
+			<classpath>
+				<fileset dir="../..">
+					<!-- Source location -->
+					<filename name="target/akiban-persistit-*dependencies-and-tests.jar" />
+				</fileset>
+				<pathelement location="." />
+			</classpath>
+		</javac>
+	</target>
+
+	<target name="run" depends="compile">
+		<java classname="SpringFrameworkDemo" fork="true">
+			<classpath>
+				<fileset dir="../..">
+					<!-- Source location -->
+					<filename name="target/akiban-persistit-*dependencies-and-tests.jar" />
+				</fileset>
+				<pathelement location="." />
+			</classpath>
+		</java>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir=".">
+				<include name="*.class" />
+				<include name="txndemo*" />
+			</fileset>
+		</delete>
+	</target>
+
+</project>
+

=== added file 'examples/SpringFrameworkExample/persistit.properties'
--- examples/SpringFrameworkExample/persistit.properties	1970-01-01 00:00:00 +0000
+++ examples/SpringFrameworkExample/persistit.properties	2012-11-21 16:34:24 +0000
@@ -0,0 +1,30 @@
+#
+# Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+# 
+# This program and the accompanying materials are made available
+# under the terms of the Eclipse Public License v1.0 which
+# accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# This program may also be available under different license terms.
+# For more information, see www.akiban.com or contact [e-mail].
+# 
+# Contributors:
+# Akiban Technologies, Inc.
+#
+
+#
+# Change this property to locate the volume files 
+# in a different directory:
+#
+datapath=.
+
+buffer.count.8192=512
+
+logfile=${datapath}/springdemo.log
+
+volume.1=${datapath}/springdemo,create,pageSize:8192,\
+    initialPages:5,extensionPages:5,maximumPages:100000
+	
+journalpath=${datapath}/springdemo_journal
+

=== modified file 'pom.xml'
--- pom.xml	2012-11-09 20:03:01 +0000
+++ pom.xml	2012-11-21 16:34:24 +0000
@@ -80,6 +80,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.1.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <pluginRepositories>

=== modified file 'src/main/java/com/persistit/CLI.java'
--- src/main/java/com/persistit/CLI.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/CLI.java	2012-11-21 16:34:24 +0000
@@ -15,6 +15,13 @@
 
 package com.persistit;
 
+import static com.persistit.Configuration.APPEND_ONLY_PROPERTY_NAME;
+import static com.persistit.Configuration.BUFFERS_PROPERTY_NAME;
+import static com.persistit.Configuration.ENABLE_JMX_PROPERTY_NAME;
+import static com.persistit.Configuration.JOURNAL_PATH_PROPERTY_NAME;
+import static com.persistit.Configuration.RMI_REGISTRY_PORT_PROPERTY_NAME;
+import static com.persistit.Configuration.VOLUME_PROPERTY_PREFIX;
+
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -703,7 +710,7 @@
         for (final Integer size : bufferSizes) {
             final int alloc = (int) (size * 1.25);
             final int count = (int) ((bpoolMemory / bufferSizes.size()) / alloc);
-            properties.put(Persistit.BUFFERS_PROPERTY_NAME + size, Integer.toString(count));
+            properties.put(BUFFERS_PROPERTY_NAME + size, Integer.toString(count));
         }
         int index = 0;
         for (final VolumeSpecification vs : volumeSpecifications) {
@@ -711,23 +718,24 @@
             if (!y) {
                 value += ",readOnly";
             }
-            properties.put(Persistit.VOLUME_PROPERTY_PREFIX + (++index), value);
+            properties.put(VOLUME_PROPERTY_PREFIX + (++index), value);
         }
         if (jpath != null) {
-            properties.put(Persistit.JOURNAL_PATH_PROPERTY_NAME, jpath);
+            properties.put(JOURNAL_PATH_PROPERTY_NAME, jpath);
         }
-        properties.put(Persistit.APPEND_ONLY_PROPERTY, "true");
+        properties.put(APPEND_ONLY_PROPERTY_NAME, "true");
 
         if (rmiport > 0) {
-            properties.put(Persistit.RMI_REGISTRY_PORT, Integer.toString(rmiport));
+            properties.put(RMI_REGISTRY_PORT_PROPERTY_NAME, Integer.toString(rmiport));
         }
-        properties.put(Persistit.JMX_PARAMS, "true");
+        properties.put(ENABLE_JMX_PROPERTY_NAME, "true");
 
         final Persistit persistit = new Persistit();
         if (!y) {
             persistit.getRecoveryManager().setRecoveryDisabledForTestMode(true);
         }
-        persistit.initialize(properties);
+        persistit.setProperties(properties);
+        persistit.initialize();
 
         /**
          * Following is a hack to figure ought whether there is a classIndex in

=== modified file 'src/main/java/com/persistit/Configuration.java'
--- src/main/java/com/persistit/Configuration.java	2012-10-23 19:08:32 +0000
+++ src/main/java/com/persistit/Configuration.java	2012-11-21 16:34:24 +0000
@@ -35,6 +35,8 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import com.persistit.Transaction.CommitPolicy;
 import com.persistit.exception.CorruptJournalException;
@@ -411,6 +413,7 @@
          *            the minimumCount to set
          */
         public void setMinimumCount(final int minimumCount) {
+            Util.rangeCheck(minimumCount, 0, BufferPool.MAXIMUM_POOL_COUNT);
             this.minimumCount = minimumCount;
         }
 
@@ -426,6 +429,7 @@
          *            the maximumCount to set
          */
         public void setMaximumCount(final int maximumCount) {
+            Util.rangeCheck(maximumCount, BufferPool.MINIMUM_POOL_COUNT, Integer.MAX_VALUE);
             this.maximumCount = maximumCount;
         }
 
@@ -496,9 +500,21 @@
          *            the fraction to set
          */
         public void setFraction(final float fraction) {
+            Util.rangeCheck(fraction, 0.0f, 1.0f);
             this.fraction = fraction;
         }
 
+        private final static String SIMPLE_COUNT_FORMAT = "count=%d";
+        private final static String MIN_MAX_COUNT_FORMAT = "minCount=%d,maxCount=%d";
+        private final static String MIN_MAX_MEMORY_FORMAT = "minMem=%s,maxMem=%s,reserved=%s,fraction=%s";
+        private final static Pattern SIMPLE_COUNT_PATTERN = Pattern.compile("count=([0-9]+[KMGT]?)",
+                Pattern.CASE_INSENSITIVE);
+        private final static Pattern MIN_MAX_COUNT_PATTERN = Pattern.compile(
+                "minCount=([0-9KMGT]+),maxCount=([0-9KMGT]+)", Pattern.CASE_INSENSITIVE);
+        private final static Pattern MIN_MAX_MEMORY_PATTERN = Pattern.compile(
+                "minMem=([0-9]+[KMGT]?),maxMem=([0-9]+[KMGT]?),reserved=([0-9]+[KMGT]?),fraction=([0-9\\.]+)",
+                Pattern.CASE_INSENSITIVE);
+
         /**
          * Compute the buffer count determined by the constraints of this
          * <code>BufferPoolConfiguration</code> given the supplied
@@ -531,23 +547,60 @@
 
         @Override
         public String toString() {
-            final StringBuilder sb = new StringBuilder("BufferPoolConfiguration(");
-            sb.append(String.format("size=%d", bufferSize));
+            final StringBuilder sb = new StringBuilder();
+            sb.append(bufferSize).append(",");
             if (minimumCount == maximumCount) {
-                sb.append(String.format(",count=%d", minimumCount));
+                sb.append(String.format(SIMPLE_COUNT_FORMAT, minimumCount));
             } else if (minimumCount != 0 || maximumCount != Integer.MAX_VALUE) {
-                sb.append(String.format(",minCount=%d,maxCount=%d", minimumCount, maximumCount));
+                sb.append(String.format(MIN_MAX_COUNT_FORMAT, minimumCount, maximumCount));
             }
             if (minimumMemory != 0 || maximumMemory != Long.MAX_VALUE || reservedMemory != 0 || fraction != 1.0f) {
-                sb.append(String.format(",minMem=%s,maxMem=%s,reserved=%s,fraction=%f",
-                        displayableLongValue(minimumMemory), displayableLongValue(maximumMemory),
-                        displayableLongValue(reservedMemory), fraction));
+                sb.append(String.format(MIN_MAX_MEMORY_FORMAT, displayableLongValue(minimumMemory),
+                        displayableLongValue(maximumMemory), displayableLongValue(reservedMemory), fraction));
             }
-            sb.append(')');
             return sb.toString();
         }
 
         /**
+         * Parse the String description generated by {@link #toString()}. The
+         * string format is
+         * 
+         * <code><pre>
+         * bufferSize,propertyName=value,...
+         * </pre><code>
+         * 
+         * where propertyNames are <code>count</code>, <code>minCount</code>,
+         * <code>maxCount</code>, <code>minMemory</code>, <code>maxMemory</code>
+         * , <code>reserved</code> or <code>fraction</code>
+         */
+        public void parse(final String string) {
+            final String[] terms = string.split(",", 2);
+            if (terms.length > 1) {
+                checkBufferSize((int) parseLongProperty(string, terms[0]), string);
+                Matcher matcher;
+                matcher = SIMPLE_COUNT_PATTERN.matcher(terms[1]);
+                if (matcher.matches()) {
+                    setCount((int) parseLongProperty(string, matcher.group(1)));
+                    return;
+                }
+                matcher = MIN_MAX_COUNT_PATTERN.matcher(terms[1]);
+                if (matcher.matches()) {
+                    setMinimumCount((int) parseLongProperty(string, matcher.group(1)));
+                    setMaximumCount((int) parseLongProperty(string, matcher.group(2)));
+                    return;
+                }
+                matcher = MIN_MAX_MEMORY_PATTERN.matcher(terms[1]);
+                if (matcher.matches()) {
+                    setMemoryConstraints(string, parseLongProperty(string, matcher.group(1)),
+                            parseLongProperty(string, matcher.group(2)), parseLongProperty(string, matcher.group(3)),
+                            parseFloatProperty(string, matcher.group(4)));
+                    return;
+                }
+            }
+            throw new IllegalArgumentException("Invalid BufferPool memory specification: " + string);
+        }
+
+        /**
          * Parse the supplied property value as an integer-valued buffer count.
          * Both <code>minimumCount</code> and <code>maximumCount</code> are set
          * to this value. The supplied property value must be a valid integer or
@@ -564,11 +617,9 @@
          *             Integer
          */
         public void parseBufferCount(final int bufferSize, final String propertyName, final String propertyValue) {
+            checkBufferSize(bufferSize, propertyName);
             reset();
-            final int count = (int) parseLongProperty(propertyName, propertyValue);
-            Util.rangeCheck(count, BufferPool.MINIMUM_POOL_COUNT, BufferPool.MAXIMUM_POOL_COUNT);
-            setMaximumCount(count);
-            setMinimumCount(count);
+            setCount((int) parseLongProperty(propertyName, propertyValue));
         }
 
         /**
@@ -594,6 +645,7 @@
          * @param propertyValue
          */
         public void parseBufferMemory(final int bufferSize, final String propertyName, final String propertyValue) {
+            checkBufferSize(bufferSize, propertyName);
             reset();
             long minimum = 0;
             long maximum = Long.MAX_VALUE;
@@ -614,10 +666,14 @@
             }
             if (terms.length > 3 && !terms[3].isEmpty()) {
                 fraction = parseFloatProperty(propertyName, terms[3]);
+            }
+            setMemoryConstraints(propertyValue, minimum, maximum, reserved, fraction);
+        }
+
+        private void setMemoryConstraints(final String propertyValue, final long minimum, final long maximum,
+                final long reserved, final float fraction) {
+            if (minimum >= 0 && minimum <= maximum && maximum - minimum >= reserved && reserved >= 0) {
                 Util.rangeCheck(fraction, 0.0f, 1.0f);
-            }
-
-            if (minimum >= 0 && minimum <= maximum && maximum - minimum >= reserved && reserved >= 0) {
                 setMinimumMemory(minimum);
                 setMaximumMemory(maximum);
                 setReservedMemory(reserved);
@@ -627,7 +683,12 @@
             } else {
                 throw new IllegalArgumentException("Invalid BufferPool memory specification: " + propertyValue);
             }
+        }
 
+        private void checkBufferSize(final int size, final String s) {
+            if (size != this.bufferSize) {
+                throw new IllegalArgumentException("Buffer size " + size + " does not match " + s);
+            }
         }
 
     }
@@ -1226,6 +1287,53 @@
     }
 
     /**
+     * Return a summary of the buffer configuration of all buffer pool sizes as
+     * a string. For example, a value such as
+     * 
+     * <code><pre>
+     * 4096,count=1000;16384,minMemory=0,maxMemory=512G,reserved=1G,fraction=0.6
+     * </pre></code>
+     * 
+     * @return describes two buffer pools, on with 4K buffers and the other with
+     *         16K buffers. There the configuration specifies the smaller pool
+     *         by count, and the larger buffers by memory.
+     */
+    public String getBufferPoolConfiguration() {
+        final StringBuilder sb = new StringBuilder();
+        for (final BufferPoolConfiguration bpc : bufferPoolMap.values()) {
+            if (bpc.getMaximumCount() > 0) {
+                if (sb.length() > 0) {
+                    sb.append(";");
+                }
+                sb.append(bpc);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Parses and sets up the configuration of all buffer pools from the
+     * supplied string.
+     * 
+     * @param string
+     */
+    public void setBufferPoolConfiguration(final String string) {
+        for (final BufferPoolConfiguration bpc : bufferPoolMap.values()) {
+            bpc.reset();
+        }
+        for (final String s : string.split(";")) {
+            try {
+                final int bufferSize = Integer.parseInt(s.split(",")[0]);
+                bufferPoolMap.get(bufferSize).parse(s);
+            } catch (final NumberFormatException e) {
+                throw new IllegalArgumentException("Invalid BufferPool memory specification: " + string);
+            } catch (final ArrayIndexOutOfBoundsException e) {
+                throw new IllegalArgumentException("Invalid BufferPool memory specification: " + string);
+            }
+        }
+    }
+
+    /**
      * Return a List of <code>VolumeSpecification</code> instances for
      * {@link Volume}s that Persistit should load or create during
      * initialization. An application can add <code>VolumeSpecification</code>
@@ -1239,6 +1347,20 @@
     }
 
     /**
+     * Copies the supplied {@link VolumeSpecification} elements to the volume
+     * list after first clearing it. This method allows a list of
+     * VolumeSpecifications to be injected as a property.
+     * 
+     * @param list
+     *            List of VolumeSpecifications for volumes to be opened when the
+     *            {@link Persistit#initialize()} method is called
+     */
+    public void setVolumeList(final List<VolumeSpecification> list) {
+        volumeSpecifications.clear();
+        volumeSpecifications.addAll(list);
+    }
+
+    /**
      * Return the value defined by {@link #setJournalPath}
      * 
      * @return the journalPath

=== modified file 'src/main/java/com/persistit/Persistit.java'
--- src/main/java/com/persistit/Persistit.java	2012-10-26 19:44:17 +0000
+++ src/main/java/com/persistit/Persistit.java	2012-11-21 16:34:24 +0000
@@ -15,6 +15,9 @@
 
 package com.persistit;
 
+import static com.persistit.Configuration.DEFAULT_SYSTEM_VOLUME_NAME;
+import static com.persistit.Configuration.SYSTEM_PROPERTY_PREFIX;
+import static com.persistit.Configuration.SYSTEM_VOLUME_PROPERTY_NAME;
 import static com.persistit.util.Util.NS_PER_S;
 
 import java.io.BufferedReader;
@@ -122,197 +125,8 @@
      * builds.
      */
     public final static boolean BIG_ENDIAN = true;
-    /**
-     * Prefix used to form the a system property name. For example, the property
-     * named <code>journalpath=xyz</code> can also be specified as a system
-     * property on the command line with the option
-     * -Dcom.persistit.journalpath=xyz.
-     */
-    public final static String SYSTEM_PROPERTY_PREFIX = "com.persistit.";
-    /**
-     * Name of utility GUI class.
-     */
+
     private final static String PERSISTIT_GUI_CLASS_NAME = SYSTEM_PROPERTY_PREFIX + "ui.AdminUI";
-
-    /**
-     * Default suffix for properties file name
-     */
-    public final static String DEFAULT_PROPERTIES_FILE_SUFFIX = ".properties";
-    /**
-     * Default properties file name
-     */
-    public final static String DEFAULT_CONFIG_FILE = "persistit.properties";
-    /**
-     * Default maximum time (in milliseconds) to allow for successful completion
-     * of an operation.
-     */
-    static final long DEFAULT_TIMEOUT_VALUE = 30000; // Thirty seconds
-    /**
-     * Upper bound maximum time (in milliseconds) to allow for successful
-     * completion of an operation. This is the maximum timeout value you can
-     * specify for individual <code>Exchange</code>.
-     */
-    static final long MAXIMUM_TIMEOUT_VALUE = 86400000; // One day
-    /**
-     * Property name by which name of properties file can be supplied.
-     */
-    public final static String CONFIG_FILE_PROPERTY_NAME = "properties";
-    /**
-     * Property name prefix for specifying buffer size and count. The full
-     * property name should be one of "1024", "2048", "4096", "8192" or "16384"
-     * appended to this string, e.g., "buffer.count.8192".
-     */
-    public final static String BUFFERS_PROPERTY_NAME = "buffer.count.";
-    /**
-     * Property name prefix for specifying buffer memory allocation. The full
-     * property name should be one of "1024", "2048", "4096", "8192" or "16384"
-     * appended to this string, e.g., "buffer.memory.8192". This property is an
-     * alternative to "buffer.count.nnnn", and only one of these may be used in
-     * a configuration per buffer size. With the buffer.memory property
-     * Persistit computes a buffer count that will consume approximately the
-     * specified memory allocation, including overhead for FastIndex elements.
-     */
-    public final static String BUFFER_MEM_PROPERTY_NAME = "buffer.memory.";
-    /**
-     * Property name prefix for specifying Volumes. The full property name
-     * should be a unique ordinal number appended to this string, e.g.,
-     * "volume.1", "volume.2", etc.
-     */
-    public final static String VOLUME_PROPERTY_PREFIX = "volume.";
-    /**
-     * Property name for specifying the file specification for the journal.
-     */
-    public final static String JOURNAL_PATH_PROPERTY_NAME = "journalpath";
-
-    /**
-     * Property name for specifying the size of each journal file, e.g.,
-     * "journalsize=400000000".
-     */
-    public final static String JOURNAL_BLOCKSIZE_PROPERTY_NAME = "journalsize";
-
-    /**
-     * Default path name for the journal. Note, sequence suffix in the form
-     * .nnnnnnnnnnnnnnnn (16 digits, zero-filled) will be appended.
-     */
-    public final static String DEFAULT_JOURNAL_PATH = "persistit_journal";
-
-    /**
-     * Default System Volume Name
-     */
-    public final static String DEFAULT_SYSTEM_VOLUME_NAME = "_system";
-
-    /**
-     * Property name for specifying the system volume name
-     */
-    public final static String SYSTEM_VOLUME_PROPERTY = "sysvolume";
-
-    /**
-     * Property name for specifying default temporary volume page size
-     */
-    public final static String TEMPORARY_VOLUME_PAGE_SIZE_NAME = "tvpagesize";
-
-    /**
-     * Property name for specifying default temporary volume directory
-     */
-    public final static String TEMPORARY_VOLUME_DIR_NAME = "tmpvoldir";
-
-    /**
-     * Property name for specifying upper bound on temporary volume size
-     */
-    public final static String TEMPORARY_VOLUME_MAX_SIZE = "tmpvolmaxsize";
-
-    /**
-     * Property name for specifying the default {@link Transaction.CommitPolicy}
-     * ("soft", "hard" or "group")
-     */
-    public final static String TRANSACTION_COMMIT_POLICY_NAME = "txnpolicy";
-
-    /**
-     * Property name for specifying whether Persistit should display diagnostic
-     * messages. Property value must be "true" or "false".
-     */
-    public final static String VERBOSE_PROPERTY = "verbose";
-    /**
-     * Property name for specifying whether Persistit should retry read
-     * operations that fail due to IOExceptions.
-     */
-    public final static String READ_RETRY_PROPERTY = "readretry";
-    /**
-     * Property name for maximum length of time a Persistit operation will wait
-     * for I/O completion before throwing a TimeoutException.
-     */
-    public final static String TIMEOUT_PROPERTY = "timeout";
-
-    /**
-     * Property name to specify package and/or class names of classes that must
-     * be serialized using standard Java serialization.
-     */
-    public final static String SERIAL_OVERRIDE_PROPERTY = "serialOverride";
-
-    /**
-     * Property name to specify whether DefaultValueCoder should use a declared
-     * no-arg contructor within each class being deserialized. Unless specified
-     * as <code>true</code>, Serializable classes will be instantiated through
-     * platform-specific API calls.
-     */
-    public final static String CONSTRUCTOR_OVERRIDE_PROPERTY = "constructorOverride";
-
-    /**
-     * Property name for specifying whether Persistit should attempt to launch a
-     * diagnostic utility for viewing internal state.
-     */
-    public final static String SHOW_GUI_PROPERTY = "showgui";
-
-    /**
-     * Property name for log switches
-     */
-    public final static String LOGGING_PROPERTIES = "logging";
-
-    /**
-     * Property name for log file name
-     */
-    public final static String LOGFILE_PROPERTY = "logfile";
-    /**
-     * Property name for the optional RMI registry host name
-     */
-    public final static String RMI_REGISTRY_HOST_PROPERTY = "rmihost";
-    /**
-     * Property name for the optional RMI registry port
-     */
-    public final static String RMI_REGISTRY_PORT = "rmiport";
-
-    /**
-     * Name of port on which RMI server accepts connects. If zero or unassigned,
-     * RMI picks a random port. Specifying a port can be helpful when using SSH
-     * to tunnel RMI to a server.
-     */
-    public final static String RMI_SERVER_PORT = "rmiserverport";
-
-    /**
-     * Property name for enabling Persistit Open MBean for JMX
-     */
-    public final static String JMX_PARAMS = "jmx";
-
-    /**
-     * Property name for pseudo-property "timestamp";
-     */
-    public final static String TIMESTAMP_PROPERTY = "timestamp";
-
-    /**
-     * Property name for the "append only" property.
-     */
-    public final static String APPEND_ONLY_PROPERTY = "appendonly";
-
-    /**
-     * Property name to specify the default {@link SplitPolicy}.
-     */
-    public final static String SPLIT_POLICY_PROPERTY = "splitpolicy";
-
-    /**
-     * Property name to specify the default {@link JoinPolicy}.
-     */
-    public final static String JOIN_POLICY_PROPERTY = "joinpolicy";
-
     /**
      * Maximum number of Exchanges that will be held in an internal pool.
      */
@@ -471,13 +285,119 @@
     private final ThreadLocal<SoftReference<Value>> _valueThreadLocal = new ThreadLocal<SoftReference<Value>>();
 
     /**
-     * <p>
-     * Initialize Persistit using properties supplied by the default properties
-     * file. The name of this file is supplied by the system property
+     * Construct a hollow Persistit instance. To be useful, the instance must
+     * receive a <code>Configuration</code> through one of the methods
+     * {@link #setConfiguration(Configuration)},
+     * {@link #setProperties(Properties)} or
+     * {@link #setPropertiesFromFile(String)}. The instance must then be started
+     * by the {@link #initialize()} method.
+     */
+    public Persistit() {
+
+    }
+
+    /**
+     * Construct a Persistit instance with the supplied
+     * <code>Configuration</code> and then initialize it. The code <code><pre>
+     * Persistit db = new Persistit(configuration);
+     * </pre></code> is equivalent to <code><pre>
+     * Persistit db = new Persistit();
+     * db.setConfiguration(configuration);
+     * db.intialize();
+     * </pre></code>
+     * 
+     * @see #setConfiguration(Configuration)
+     * @param configuration
+     *            the Configuration
+     */
+    public Persistit(final Configuration configuration) throws PersistitException {
+        setConfiguration(configuration);
+        initialize();
+    }
+
+    /**
+     * Construct a Persistit instance with a <code>Configuration</code> derived
+     * from the supplied <code>Properties</code> instance. The code <code><pre>
+     * Persistit db = new Persistit(properties);
+     * </pre></code> is equivalent to <code><pre>
+     * Persistit db = new Persistit();
+     * db.setProperties(properties);
+     * db.intialize();
+     * </pre></code>
+     * 
+     * @see #setProperties(Properties)
+     * @param properties
+     *            the Properties
+     */
+    public Persistit(final Properties properties) throws PersistitException {
+        setProperties(properties);
+        initialize();
+    }
+
+    /**
+     * Receive the supplied <code>Configuration</code> which will be used to
+     * control the creation of a functional <code>Persistit</code> within the
+     * {@link #initialize()} method. The configuration may only be set once.
+     * 
+     * @param configuration
+     * @throws IllegalStateException
+     *             if the <code>Configuration</code> has already been set
+     */
+    public synchronized void setConfiguration(final Configuration configuration) {
+        if (_configuration != null) {
+            throw new IllegalStateException("Configuration has already been set");
+        }
+        _configuration = configuration;
+    }
+
+    /**
+     * Sets a <code>Configuration</code> derived from <code>Properties</code>
+     * read from the supplied file name.
+     * 
+     * @see #setConfiguration(Configuration)
+     * @param propertiesFileName
+     *            path to properties file
+     * @throws PersistitException
+     *             if the properties file is invalid
+     * @throws IllegalStateException
+     *             if the <code>Configuration</code> has already been set
+     */
+    public void setPropertiesFromFile(final String propertiesFileName) throws PersistitException {
+        final Configuration configuration = new Configuration();
+        configuration.readPropertiesFile(propertiesFileName);
+        setConfiguration(configuration);
+    }
+
+    /**
+     * Sets a <code>Configuration</code> derived from the supplied
+     * <code>Properties</code>.
+     * 
+     * @see #setConfiguration(Configuration)
+     * @param properties
+     *            the Properties from which to build a
+     *            <code>Configuration</code>
+     * @throws IllegalStateException
+     *             if the <code>Configuration</code> has already been set
+     */
+    public void setProperties(final Properties properties) {
+        setConfiguration(new Configuration(properties));
+    }
+
+    /**
+     * <p>
+     * Initialize Persistit using the <code>Configuration</code> supplied by the
+     * {@link #setConfiguration(Configuration)} method or derived from
+     * properties supplied by {@link #setProperties(Properties)} or
+     * {@link #setPropertiesFromFile(String)}.
+     * </p>
+     * <p>
+     * If no configuration has been set, this method reverts to its legacy
+     * behavior which is to load a configuration from a default properties file.
+     * The name of this file is supplied by the system property
      * <code>com.persistit.properties</code>. If that property is not specified,
      * the default file path is <code>./persistit.properties</code> in the
      * current working directory. If Persistit has already been initialized,
-     * this method does nothing. This method is threadsafe; if multiple threads
+     * this method does nothing. This method is thread-safe; if multiple threads
      * concurrently attempt to invoke this method, one of the threads will
      * actually perform the initialization and the other threads will do
      * nothing.
@@ -492,11 +412,42 @@
      * @throws IOException
      * @throws Exception
      */
-    public void initialize() throws PersistitException {
-        if (!isInitialized()) {
-            final Configuration configuration = new Configuration();
-            configuration.readPropertiesFile();
-            initialize(configuration);
+    public synchronized void initialize() throws PersistitException {
+        if (isInitialized()) {
+            return;
+        }
+        if (_configuration == null) {
+            final Configuration config = new Configuration();
+            config.readPropertiesFile();
+            _configuration = config;
+        }
+        try {
+            _closed.set(false);
+
+            initializeLogging();
+            initializeManagement();
+            initializeOther();
+            initializeRecovery();
+            initializeJournal();
+            initializeBufferPools();
+            initializeVolumes();
+            startJournal();
+            startBufferPools();
+            preloadBufferPools();
+            finishRecovery();
+            startCheckpointManager();
+            startTransactionIndexPollTask();
+            flush();
+            _checkpointManager.checkpoint();
+            _journalManager.pruneObsoleteTransactions();
+
+            startCleanupManager();
+            _initialized.set(true);
+        } finally {
+            if (!isInitialized()) {
+                releaseAllResources();
+                _configuration = null;
+            }
         }
     }
 
@@ -504,7 +455,7 @@
      * <p>
      * Initialize Persistit using the supplied properties file path. If
      * Persistit has already been initialized, this method does nothing. This
-     * method is threadsafe; if multiple threads concurrently attempt to invoke
+     * method is thread-safe; if multiple threads concurrently attempt to invoke
      * this method, one of the threads will actually perform the initialization
      * and the other threads will do nothing.
      * </p>
@@ -513,17 +464,28 @@
      * exiting until {@link #close} is invoked. This is to ensure that all
      * pending updates are written before the JVM exit.
      * </p>
+     * <p>
+     * This method is deprecated. Applications should instead call
+     * 
+     * <pre>
+     * <code>
+     * setPropertiesFromFile(propertiesFileName);
+     * initialize();
+     * </code>
+     * </pre>
+     * 
+     * </p>
      * 
      * @param propertiesFileName
      *            The path to the properties file.
      * @throws PersistitException
      * @throws IOException
      */
+    @Deprecated
     public void initialize(final String propertiesFileName) throws PersistitException {
         if (!isInitialized()) {
-            final Configuration configuration = new Configuration();
-            configuration.readPropertiesFile(propertiesFileName);
-            initialize(configuration);
+            setPropertiesFromFile(propertiesFileName);
+            initialize();
         }
     }
 
@@ -532,7 +494,7 @@
      * Initialize Persistit using the supplied <code>java.util.Properties</code>
      * instance. Applications can use this method to supply computed Properties
      * rather than reading them from a file. If Persistit has already been
-     * initialized, this method does nothing. This method is threadsafe; if
+     * initialized, this method does nothing. This method is thread-safe; if
      * multiple threads concurrently attempt to invoke this method, one of the
      * threads will actually perform the initialization and the other threads
      * will do nothing.
@@ -542,6 +504,17 @@
      * exiting until {@link #close} is invoked. This is to ensure that all
      * pending updates are written before the JVM exit.
      * </p>
+     * <p>
+     * This method is deprecated. Applications should instead call
+     * 
+     * <pre>
+     * <code>
+     * setProperties(properties);
+     * initialize();
+     * </code>
+     * </pre>
+     * 
+     * </p>
      * 
      * @param properties
      *            The <code>Properties</code> instance from which to build the
@@ -549,10 +522,11 @@
      * @throws PersistitException
      * @throws IOException
      */
+    @Deprecated
     public void initialize(final Properties properties) throws PersistitException {
         if (!isInitialized()) {
-            final Configuration configuration = new Configuration(properties);
-            initialize(configuration);
+            setProperties(properties);
+            initialize();
         }
     }
 
@@ -560,7 +534,7 @@
      * <p>
      * Initialize Persistit using the supplied {@link Configuration}. If
      * Persistit has already been initialized, this method does nothing. This
-     * method is threadsafe; if multiple threads concurrently attempt to invoke
+     * method is thread-safe; if multiple threads concurrently attempt to invoke
      * this method, one of the threads will actually perform the initialization
      * and the other threads will do nothing.
      * </p>
@@ -569,6 +543,17 @@
      * exiting until {@link #close} is invoked. This is to ensure that all
      * pending updates are written before the JVM exit.
      * </p>
+     * <p>
+     * This method is deprecated. Applications should instead call
+     * 
+     * <pre>
+     * <code>
+     * setConfiguration(configuration);
+     * initialize();
+     * </code>
+     * </pre>
+     * 
+     * </p>
      * 
      * @param configuration
      *            The <code>Configuration</code> from which to initialize
@@ -576,41 +561,15 @@
      * @throws PersistitException
      * @throws IOException
      */
-    public synchronized void initialize(final Configuration configuration) throws PersistitException {
+    @Deprecated
+    public void initialize(final Configuration configuration) throws PersistitException {
         if (!isInitialized()) {
-            _configuration = configuration;
-            try {
-                _closed.set(false);
-
-                initializeLogging();
-                initializeManagement();
-                initializeOther();
-                initializeRecovery();
-                initializeJournal();
-                initializeBufferPools();
-                initializeVolumes();
-                startJournal();
-                startBufferPools();
-                preloadBufferPools();
-                finishRecovery();
-                startCheckpointManager();
-                startTransactionIndexPollTask();
-                flush();
-                _checkpointManager.checkpoint();
-                _journalManager.pruneObsoleteTransactions();
-
-                startCleanupManager();
-                _initialized.set(true);
-            } finally {
-                if (!isInitialized()) {
-                    releaseAllResources();
-                    _configuration = null;
-                }
-            }
+            setConfiguration(configuration);
+            initialize();
         }
     }
 
-    void initializeLogging() throws PersistitException {
+    private void initializeLogging() throws PersistitException {
         try {
             _logFlusher = new LogFlusher();
             _logFlusher.start();
@@ -633,7 +592,7 @@
 
     }
 
-    void initializeRecovery() throws PersistitException {
+    private void initializeRecovery() throws PersistitException {
         final String journalPath = _configuration.getJournalPath();
         _recoveryManager.init(journalPath);
         _recoveryManager.buildRecoveryPlan();
@@ -648,7 +607,7 @@
         _journalManager.setIgnoreMissingVolumes(_configuration.isIgnoreMissingVolumes());
     }
 
-    void initializeBufferPools() {
+    private void initializeBufferPools() {
         for (final BufferPoolConfiguration config : _configuration.getBufferPoolMap().values()) {
             final int poolSize = config.computeBufferCount(getAvailableHeap());
             if (poolSize > 0) {
@@ -663,7 +622,7 @@
         }
     }
 
-    void initializeVolumes() throws PersistitException {
+    private void initializeVolumes() throws PersistitException {
         for (final VolumeSpecification volumeSpecification : _configuration.getVolumeList()) {
             Volume volume = _journalManager.getVolumeByName(volumeSpecification.getName());
             if (volume == null) {
@@ -676,7 +635,7 @@
         }
     }
 
-    void initializeManagement() {
+    private void initializeManagement() {
         final String rmiHost = _configuration.getRmiHost();
         final int rmiPort = _configuration.getRmiPort();
         final int serverPort = _configuration.getRmiServerPort();
@@ -691,7 +650,7 @@
         }
     }
 
-    void initializeOther() {
+    private void initializeOther() {
         // Set up the parent CoderManager for this instance.
         final DefaultCoderManager cm = new DefaultCoderManager(this, _configuration.getSerialOverride());
         _coderManager.set(cm);
@@ -1223,23 +1182,23 @@
         return System.currentTimeMillis() - _startTime;
     }
 
-    public Configuration getConfiguration() {
+    public synchronized Configuration getConfiguration() {
         return _configuration;
     }
 
     @Deprecated
     public Properties getProperties() {
-        return _configuration.getProperties();
+        return getConfiguration().getProperties();
     }
 
     @Deprecated
     public String getProperty(final String key) {
-        return _configuration.getProperty(key);
+        return getConfiguration().getProperty(key);
     }
-
+    
     @Deprecated
     public String substituteProperties(final String text, final Properties properties) {
-        return _configuration.substituteProperties(text, properties, 0);
+         return getConfiguration().substituteProperties(text, properties);
     }
 
     /**
@@ -1319,7 +1278,7 @@
      *             if the volume was not found
      */
     public Volume getSystemVolume() throws VolumeNotFoundException {
-        return getSpecialVolume(SYSTEM_VOLUME_PROPERTY, DEFAULT_SYSTEM_VOLUME_NAME);
+        return getSpecialVolume(SYSTEM_VOLUME_PROPERTY_NAME, DEFAULT_SYSTEM_VOLUME_NAME);
     }
 
     /**
@@ -1853,6 +1812,7 @@
             _initialized.set(false);
             _sessionIdThreadLocal.remove();
             _cleanupManager.clear();
+            _configuration = null;
         }
         synchronized (_exchangePoolMap) {
             _exchangePoolMap.clear();
@@ -2558,7 +2518,8 @@
         final String propertiesFileName = ap.getStringValue("properties");
         if (!propertiesFileName.isEmpty()) {
             persistit = new Persistit();
-            persistit.initialize(propertiesFileName);
+            persistit.setPropertiesFromFile(propertiesFileName);
+            persistit.initialize();
         }
         final String scriptName = ap.getStringValue("script");
 

=== modified file 'src/test/java/com/persistit/AccumulatorRecoveryTest.java'
--- src/test/java/com/persistit/AccumulatorRecoveryTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/AccumulatorRecoveryTest.java	2012-11-21 16:34:24 +0000
@@ -92,13 +92,14 @@
         }
 
         _persistit.getJournalManager().flush();
+        final Configuration config = _persistit.getConfiguration();
         _persistit.crash();
-        final Properties saveProperties = _persistit.getProperties();
         _persistit = new Persistit();
         _persistit.getJournalManager().setAppendOnly(true);
         final RecoveryManager plan = _persistit.getRecoveryManager();
         plan.setRecoveryDisabledForTestMode(true);
-        _persistit.initialize(saveProperties);
+        _persistit.setConfiguration(config);
+        _persistit.initialize();
         assertEquals(15, plan.getCommittedCount());
         plan.setRecoveryDisabledForTestMode(false);
         final Set<Long> recoveryTimestamps = new HashSet<Long>();
@@ -251,12 +252,9 @@
         for (int i = 0; i < threads.length; i++) {
             threads[i].join();
         }
-
+        final Configuration config = _persistit.getConfiguration();
         _persistit.crash();
-
-        final Properties props = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(props);
+        _persistit = new Persistit(config);
 
         verifyRowCount();
     }

=== modified file 'src/test/java/com/persistit/BackupTaskTest.java'
--- src/test/java/com/persistit/BackupTaskTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/BackupTaskTest.java	2012-11-21 16:34:24 +0000
@@ -15,6 +15,7 @@
 
 package com.persistit;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -60,16 +61,15 @@
         backup1.setup(1, "backup file=" + file.getAbsolutePath(), "cli", 0, 5);
         backup1.run();
 
-        final Properties properties = _persistit.getProperties();
+        final Configuration config = _persistit.getConfiguration();
         _persistit.close();
 
-        _persistit = new Persistit();
         final BackupTask backup2 = new BackupTask();
         backup2.setMessageWriter(writer);
         backup2.setPersistit(_persistit);
         backup2.doRestore(file.getAbsolutePath());
 
-        _persistit.initialize(properties);
+        _persistit = new Persistit(config);
         _persistit.checkAllVolumes();
 
         final PersistitMap<Integer, String> pmap2 = new PersistitMap<Integer, String>(_persistit.getExchange(
@@ -103,18 +103,17 @@
         tw.stop.set(true);
         twThread.join();
 
-        final Properties properties = _persistit.getProperties();
+        final Configuration config = _persistit.getConfiguration();
         _persistit.crash();
         UnitTestProperties.cleanUpDirectory(new File(UnitTestProperties.DATA_PATH));
 
-        _persistit = new Persistit();
         final BackupTask backup2 = new BackupTask();
         backup2.setMessageWriter(writer);
         backup2.setPersistit(_persistit);
         backup2.doRestore(file.getAbsolutePath());
-        properties.setProperty("appendonly", "true");
 
-        _persistit.initialize(properties);
+        config.setAppendOnly(true);
+        _persistit = new Persistit(config);
         _persistit.checkAllVolumes();
         final Exchange exchange = _persistit.getExchange("persistit", "BackupTest", false);
         exchange.to(Key.BEFORE);

=== modified file 'src/test/java/com/persistit/Bug1018526Test.java'
--- src/test/java/com/persistit/Bug1018526Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug1018526Test.java	2012-11-21 16:34:24 +0000
@@ -86,8 +86,7 @@
         }
         final Configuration cfg = _persistit.getConfiguration();
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(cfg);
+        _persistit = new Persistit(cfg);
         final Map<Integer, TreeDescriptor> map = _persistit.getJournalManager().queryTreeMap();
         for (final Integer handle : permTreeHandleSet) {
             final TreeDescriptor td = map.remove(handle);

=== modified file 'src/test/java/com/persistit/Bug1064565Test.java'
--- src/test/java/com/persistit/Bug1064565Test.java	2012-10-10 16:24:44 +0000
+++ src/test/java/com/persistit/Bug1064565Test.java	2012-11-21 16:34:24 +0000
@@ -91,11 +91,9 @@
         txn.end();
         sequence(ACCUMULATOR_CHECKPOINT_C);
 
+        final Configuration config = _persistit.getConfiguration();
         _persistit.close();
-
-        final Configuration config = _persistit.getConfiguration();
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(config);
 
         exchange = getExchange();
         txn = exchange.getTransaction();
@@ -128,8 +126,7 @@
         _persistit.copyBackPages();
         final Configuration config = _persistit.getConfiguration();
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(config);
 
         exchange = getExchange();
         txn = exchange.getTransaction();

=== modified file 'src/test/java/com/persistit/Bug1065677Test.java'
--- src/test/java/com/persistit/Bug1065677Test.java	2012-10-12 21:25:01 +0000
+++ src/test/java/com/persistit/Bug1065677Test.java	2012-11-21 16:34:24 +0000
@@ -97,13 +97,13 @@
 
         _persistit = new Persistit();
         _persistit.getTimestampAllocator().updateTimestamp(lastTimestamp + 1000);
-        _persistit.initialize(config);
+        _persistit.setConfiguration(config);
+        _persistit.initialize();
         _persistit.crash();
         truncate();
 
-        _persistit = new Persistit();
         config.setAppendOnly(true);
-        _persistit.initialize(config);
+        _persistit = new Persistit(config);
 
         doTransaction();
 
@@ -111,8 +111,7 @@
         jman.rollover();
         _persistit.close();
 
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(config);
         _persistit.close();
 
     }

=== modified file 'src/test/java/com/persistit/Bug706132Test.java'
--- src/test/java/com/persistit/Bug706132Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug706132Test.java	2012-11-21 16:34:24 +0000
@@ -46,7 +46,8 @@
         p.remove("buffer.count.8192");
         p.setProperty("volume.1", "${datapath}/persistit,create,"
                 + "pageSize:1024,initialPages:100,extensionPages:100," + "maximumPages:25000");
-        _persistit.initialize(p);
+        _persistit.setProperties(p);
+        _persistit.initialize();
     }
 
     @Test

=== modified file 'src/test/java/com/persistit/Bug777918Test.java'
--- src/test/java/com/persistit/Bug777918Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug777918Test.java	2012-11-21 16:34:24 +0000
@@ -80,11 +80,9 @@
             ex.to(i).store();
         }
         _persistit.getJournalManager().rollover();
-        final Properties properties = _persistit.getProperties();
         _persistit.close();
 
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
         ex = _persistit.getExchange("persistit", "Bug777918Test", false);
         // ensure updates after the checkpoint did make it, i.e.,
@@ -93,8 +91,7 @@
             assertEquals(true, ex.to(i).isValueDefined());
         }
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
         ex = _persistit.getExchange("persistit", "Bug777918Test", false);
         // ensure updates after the checkpoint did make it, i.e.,
@@ -116,15 +113,12 @@
             ex.to(i).store();
         }
         _persistit.flush();
-        final Properties properties = _persistit.getProperties();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
         _persistit.close();
 
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
         ex = _persistit.getExchange("persistit", "Bug777918Test", false);
         // ensure updates after the checkpoint didn't make it
@@ -152,14 +146,11 @@
             ex.getTransaction().end();
         }
         _persistit.flush();
-        final Properties properties = _persistit.getProperties();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
         ex = _persistit.getExchange("persistit", "Bug777918Test", false);
         // ensure updates after the checkpoint didn't make it
@@ -171,7 +162,6 @@
     @Test
     public void testMakeBranchTxnLongRecord() throws Exception {
         final StringBuilder sb = new StringBuilder();
-        final Properties properties = _persistit.getProperties();
 
         while (sb.length() < 20000) {
             sb.append(RED_FOX);
@@ -198,13 +188,13 @@
         _persistit.crash();
         _persistit = new Persistit();
         _persistit.getRecoveryManager().setDefaultCommitListener(new TestCrashingRecoveryListener());
-
+        _persistit.setConfiguration(_config);
         //
         // The recovery process deliberately crashes after applying some
         // transactions.
         //
         try {
-            _persistit.initialize(properties);
+            _persistit.initialize();
         } catch (final MissingThreadException e) {
             // expected
         } catch (final TestException e) {
@@ -214,8 +204,7 @@
         // This startup should divide the pages into page- and branch-map
         // and apply committed transactions using branch-map pages.
         //
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkAllVolumes();
 
         ex = _persistit.getExchange("persistit", "Bug777918Test", false);

=== modified file 'src/test/java/com/persistit/Bug911849Test.java'
--- src/test/java/com/persistit/Bug911849Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug911849Test.java	2012-11-21 16:34:24 +0000
@@ -67,13 +67,11 @@
 
     @Test
     public void testOverlappingCheckpointTransactions() throws Exception {
-        final Properties props = _persistit.getProperties();
         for (int i = 0; i < 10; i++) {
             accumulateRows(10000);
             _persistit.getJournalManager().force();
             _persistit.crash();
-            _persistit = new Persistit();
-            _persistit.initialize(props);
+            _persistit = new Persistit(_config);
             final Exchange exchange = _persistit.getExchange("persistit", "AccumulatorRecoveryTest", false);
             final Accumulator rowCount = exchange.getTree().getAccumulator(Accumulator.Type.SUM,
                     ROW_COUNT_ACCUMULATOR_INDEX);

=== modified file 'src/test/java/com/persistit/Bug915594Test.java'
--- src/test/java/com/persistit/Bug915594Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug915594Test.java	2012-11-21 16:34:24 +0000
@@ -84,13 +84,11 @@
         txn.rollback();
         txn.end();
         _persistit.checkpoint();
-        final Properties properties = _persistit.getProperties();
         ex = null;
         txn = null;
         _persistit.close();
 
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         final Exchange ex2 = _persistit.getExchange("persistit", "Bug915594Test", true);
         assertTrue(!ex2.clear().next(true));
     }

=== modified file 'src/test/java/com/persistit/Bug918909Test.java'
--- src/test/java/com/persistit/Bug918909Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug918909Test.java	2012-11-21 16:34:24 +0000
@@ -115,12 +115,10 @@
                 txn.end();
             }
         }
-        final Properties properties = _persistit.getProperties();
         _persistit.crash();
 
         for (int i = 0; i < RESTART_ITERATIONS; i++) {
-            _persistit = new Persistit();
-            _persistit.initialize(properties);
+            _persistit = new Persistit(_config);
             final Exchange ex = _persistit.getExchange("persistit", "Bug918909Test", true);
             final Transaction txn = ex.getTransaction();
             txn.begin();
@@ -136,8 +134,7 @@
             _persistit.close();
         }
 
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         _persistit.checkpoint();
         _persistit.copyBackPages();
         assertTrue(_persistit.getJournalManager().getBaseAddress() > RESTART_ITERATIONS

=== modified file 'src/test/java/com/persistit/Bug932097Test.java'
--- src/test/java/com/persistit/Bug932097Test.java	2012-08-15 16:12:34 +0000
+++ src/test/java/com/persistit/Bug932097Test.java	2012-11-21 16:34:24 +0000
@@ -41,10 +41,8 @@
              */
         }
         _persistit.checkpoint();
-        final Properties properties = _persistit.getProperties();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         /*
          * To exploit the bug, register a bunch of new transactions which will
          * draw the TransactionStatus instances freed after recovery finishes

=== modified file 'src/test/java/com/persistit/Bug942669Test.java'
--- src/test/java/com/persistit/Bug942669Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug942669Test.java	2012-11-21 16:34:24 +0000
@@ -21,8 +21,6 @@
 import static com.persistit.util.ThreadSequencer.enableSequencer;
 import static org.junit.Assert.assertNull;
 
-import java.util.Properties;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -93,14 +91,14 @@
         _persistit.checkpoint();
         txn.commit();
         txn.end();
+        final Configuration config = _persistit.getConfiguration();
         _persistit.crash();
-        final Properties properties = _persistit.getProperties();
         _persistit = new Persistit();
-
+        _persistit.setConfiguration(config);
         enableSequencer(true);
         addSchedules(RECOVERY_PRUNING_SCHEDULE);
 
-        _persistit.initialize(properties);
+        _persistit.initialize();
         _persistit.copyBackPages();
         disableSequencer();
     }
@@ -144,12 +142,11 @@
          */
         _persistit.copyBackPages();
         _persistit.copyBackPages();
+        final Configuration config = _persistit.getConfiguration();
 
         _persistit.close();
 
-        final Properties properties = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(config);
         _persistit.copyBackPages();
         assertNull(_persistit.getJournalManager().getLastCopierException());
     }

=== modified file 'src/test/java/com/persistit/Bug974589Test.java'
--- src/test/java/com/persistit/Bug974589Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug974589Test.java	2012-11-21 16:34:24 +0000
@@ -17,8 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Properties;
-
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
@@ -57,11 +55,10 @@
             txn1 = null;
             acc1 = null;
             _persistit.checkpoint();
+
+            final Configuration config = _persistit.getConfiguration();
             _persistit.close();
-
-            final Properties properties = _persistit.getProperties();
-            _persistit = new Persistit();
-            _persistit.initialize(properties);
+            _persistit = new Persistit(config);
 
             Exchange ex2 = getExchange(_persistit);
             Transaction txn2 = ex2.getTransaction();

=== modified file 'src/test/java/com/persistit/Bug980292Test.java'
--- src/test/java/com/persistit/Bug980292Test.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/Bug980292Test.java	2012-11-21 16:34:24 +0000
@@ -62,11 +62,9 @@
         _persistit.checkpoint();
         txn.rollback();
         txn.end();
-        final Properties properties = _persistit.getProperties();
         _persistit.getJournalManager().force();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         assertEquals(0, _persistit.getRecoveryManager().getErrorCount());
     }
 }

=== modified file 'src/test/java/com/persistit/ClassIndexTest.java'
--- src/test/java/com/persistit/ClassIndexTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/ClassIndexTest.java	2012-11-21 16:34:24 +0000
@@ -195,10 +195,8 @@
             txn.end();
         }
 
-        final Configuration config = _persistit.getConfiguration();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(_config);
         ex = _persistit.getExchange("persistit", "ClassIndexTest", false);
         final Object b = ex.to("B").fetch().getValue().get();
         final Object a = ex.to("A").fetch().getValue().get();

=== modified file 'src/test/java/com/persistit/CommandLineTest.java'
--- src/test/java/com/persistit/CommandLineTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/CommandLineTest.java	2012-11-21 16:34:24 +0000
@@ -96,10 +96,12 @@
         for (int index = 0; index < 500; index++) {
             pmap.put(new Integer(index), "This is the record for index=" + index);
         }
-        _persistit.close();
 
         final String datapath = _persistit.getConfiguration().getProperty("datapath");
         final String rmiport = _persistit.getConfiguration().getProperty("rmiport");
+
+        _persistit.close();
+
         final StringReader stringReader = new StringReader(String.format(
                 "help\nopen datapath=%s rmiport=%s\nicheck -v\n", datapath, rmiport));
         final BufferedReader reader = new BufferedReader(stringReader);

=== modified file 'src/test/java/com/persistit/ConfigurationTest.java'
--- src/test/java/com/persistit/ConfigurationTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/ConfigurationTest.java	2012-11-21 16:34:24 +0000
@@ -38,6 +38,8 @@
 
     private final static String RESOURCE_NAME = "com.persistit.ConfigurationTest";
 
+    private final static String PARSE_MEMORY_EXAMPLE = "1024,count=1000;16384,minMem=0,maxMem=1G,reserved=128M,fraction=0.5";
+
     @Test
     public void testStaticMethods() throws Exception {
         assertEquals(1024, bufferSizeFromPropertyName("buffer.memory.1024"));
@@ -219,12 +221,23 @@
 
     @Test
     public void canReinitialize() throws Exception {
+        final Configuration config = _persistit.getConfiguration();
         _persistit.close();
         assertTrue("Should have closed all volumes", _persistit.getVolumes().isEmpty());
-        _persistit.initialize(_persistit.getConfiguration());
+        _persistit.setConfiguration(config);
+        _persistit.initialize();
         assertTrue("Should have reopened volumes", !_persistit.getVolumes().isEmpty());
     }
 
+    @Test
+    public void setBufferConfiguration() throws Exception {
+        final Configuration configuration = new Configuration();
+        configuration.setBufferPoolConfiguration(PARSE_MEMORY_EXAMPLE);
+        assertEquals("toString() of parsed version should be equal", PARSE_MEMORY_EXAMPLE,
+                configuration.getBufferPoolConfiguration());
+
+    }
+
     private Configuration testLoadPropertiesBufferSpecificationsHelper(final Properties properties) throws Exception {
         final Configuration configuration = new Configuration();
         configuration.merge(properties);

=== modified file 'src/test/java/com/persistit/CreateAndDeleteVolumeTest.java'
--- src/test/java/com/persistit/CreateAndDeleteVolumeTest.java	2012-10-05 23:08:51 +0000
+++ src/test/java/com/persistit/CreateAndDeleteVolumeTest.java	2012-11-21 16:34:24 +0000
@@ -42,14 +42,12 @@
     @Test
     public void recoverDynamicVolumes() throws Exception {
         VolumeSpecification volumeSpec;
-        final Configuration configuration = _persistit.getConfiguration();
         _persistit.close();
         int remainingJournalFiles = 0;
 
         for (int i = 5; --i >= 0;) {
-            final Persistit db = new Persistit();
+            final Persistit db = new Persistit(_config);
             try {
-                db.initialize(configuration);
                 volumeSpec = new VolumeSpecification(DATA_PATH + "/hwdemo" + i, null, 16384, 1, 1000, 1, true, false,
                         false);
                 db.loadVolume(volumeSpec);
@@ -79,9 +77,8 @@
         configuration.setUseOldVSpec(true);
 
         for (int i = 5; --i >= 0;) {
-            final Persistit db = new Persistit();
+            final Persistit db = new Persistit(_config);
             try {
-                db.initialize(configuration);
                 volumeSpec = new VolumeSpecification(DATA_PATH + "/hwdemo" + i, null, 16384, 1, 1000, 1, true, false,
                         false);
                 db.loadVolume(volumeSpec);
@@ -138,14 +135,12 @@
     public void truncateDynamicVolumes() throws Exception {
 
         VolumeSpecification volumeSpec;
-        final Configuration configuration = _persistit.getConfiguration();
         _persistit.close();
 
-        final Persistit db = new Persistit();
+        final Persistit db = new Persistit(_config);
 
         for (int i = 0; i < 2; i++) {
             try {
-                db.initialize(configuration);
                 volumeSpec = new VolumeSpecification(DATA_PATH + "/truncated", null, 16384, 1, 1000, 1, true, false,
                         false);
                 final Volume volume = db.loadVolume(volumeSpec);

=== modified file 'src/test/java/com/persistit/IOFailureTest.java'
--- src/test/java/com/persistit/IOFailureTest.java	2012-10-08 19:48:22 +0000
+++ src/test/java/com/persistit/IOFailureTest.java	2012-11-21 16:34:24 +0000
@@ -318,8 +318,9 @@
         channel1.close();
 
         _persistit = new Persistit();
+        _persistit.setConfiguration(_config);
         try {
-            _persistit.initialize(properties);
+            _persistit.initialize();
             fail("Expected CorruptJournalException");
         } catch (final CorruptJournalException cje) {
             // expected
@@ -327,12 +328,15 @@
         file1.delete();
 
         _persistit = new Persistit();
+        _persistit.setConfiguration(_config);
         try {
-            _persistit.initialize(properties);
+            _persistit.initialize();
             fail("Expected CorruptVolumeException");
         } catch (final CorruptVolumeException cve) {
             // expected
         }
+        channel0.close();
+        channel1.close();
     }
 
     @Test

=== modified file 'src/test/java/com/persistit/IntegrityCheckTest.java'
--- src/test/java/com/persistit/IntegrityCheckTest.java	2012-08-31 20:20:13 +0000
+++ src/test/java/com/persistit/IntegrityCheckTest.java	2012-11-21 16:34:24 +0000
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.PrintWriter;
-import java.util.Properties;
 
 import org.junit.Test;
 
@@ -174,12 +173,13 @@
                 txn.end();
             }
         }
+        final Configuration config = _persistit.getConfiguration();
         _persistit.crash();
-        final Properties properties = _persistit.getProperties();
         _persistit = new Persistit();
+        _persistit.setConfiguration(config);
         _persistit.getRecoveryManager().setRecoveryDisabledForTestMode(true);
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
-        _persistit.initialize(properties);
+        _persistit.initialize();
         disableBackgroundCleanup();
 
         for (int i = 0; i < 10; i++) {

=== modified file 'src/test/java/com/persistit/JournalManagerTest.java'
--- src/test/java/com/persistit/JournalManagerTest.java	2012-09-08 19:48:39 +0000
+++ src/test/java/com/persistit/JournalManagerTest.java	2012-11-21 16:34:24 +0000
@@ -243,10 +243,8 @@
         final Checkpoint checkpoint1 = _persistit.getCheckpointManager().createCheckpoint();
         jman.writeCheckpointToJournal(checkpoint1);
         _persistit.checkpoint();
-        final Properties saveProperties = _persistit.getProperties();
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
         _persistit.getJournalManager().setAppendOnly(true);
         final RecoveryManager rman = new RecoveryManager(_persistit);
         rman.init(path);
@@ -390,10 +388,8 @@
             txn.end();
         }
         _persistit.getJournalManager().rollover();
-        final Properties saveProperties = _persistit.getProperties();
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
 
         acc = _persistit.getVolume("persistit").getTree("JournalManagerTest", true)
                 .getAccumulator(Accumulator.Type.SUM, 0);
@@ -458,11 +454,10 @@
 
     @Test
     public void missingVolumePageHandling() throws Exception {
-        final Configuration config = _persistit.getConfiguration();
-        Volume volume1 = new Volume(config.volumeSpecification("${datapath}/missing1,create,"
+        Volume volume1 = new Volume(_config.volumeSpecification("${datapath}/missing1,create,"
                 + "pageSize:16384,initialPages:1,extensionPages:1,maximumPages:25000"));
         volume1.open(_persistit);
-        Volume volume2 = new Volume(config.volumeSpecification("${datapath}/missing2,create,"
+        Volume volume2 = new Volume(_config.volumeSpecification("${datapath}/missing2,create,"
                 + "pageSize:16384,initialPages:1,extensionPages:1,maximumPages:25000"));
         volume2.open(_persistit);
         _persistit.getExchange(volume1, "test1", true);
@@ -472,8 +467,7 @@
         new File(volume2.getPath()).delete();
         volume1 = null;
         volume2 = null;
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(_config);
         final AlertMonitor am = _persistit.getAlertMonitor();
         assertTrue("Startup with missing volumes should have generated alerts",
                 am.getHistory(AlertMonitor.MISSING_VOLUME_CATEGORY) != null);
@@ -489,8 +483,7 @@
 
     @Test
     public void missingVolumeTransactionHandlingNotIgnored() throws Exception {
-        final Configuration config = _persistit.getConfiguration();
-        Volume volume = new Volume(config.volumeSpecification("${datapath}/missing1,create,"
+        Volume volume = new Volume(_config.volumeSpecification("${datapath}/missing1,create,"
                 + "pageSize:16384,initialPages:1,extensionPages:1,maximumPages:25000"));
         volume.open(_persistit);
         final Exchange ex = _persistit.getExchange(volume, "test1", true);
@@ -504,16 +497,14 @@
         _persistit.crash();
         new File(volume.getPath()).delete();
         volume = null;
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(_config);
         assertTrue("Should have failed updates during recovery", _persistit.getRecoveryManager().getPlayer()
                 .getFailedUpdates() > 0);
     }
 
     @Test
     public void missingVolumeTransactionHandlingIgnored() throws Exception {
-        final Configuration config = _persistit.getConfiguration();
-        Volume volume = new Volume(config.volumeSpecification("${datapath}/missing1,create,"
+        Volume volume = new Volume(_config.volumeSpecification("${datapath}/missing1,create,"
                 + "pageSize:16384,initialPages:1,extensionPages:1,maximumPages:25000"));
         volume.open(_persistit);
         final Exchange ex = _persistit.getExchange(volume, "test1", true);
@@ -527,10 +518,11 @@
         _persistit.crash();
         new File(volume.getPath()).delete();
         volume = null;
-        config.setIgnoreMissingVolumes(true);
+        _config.setIgnoreMissingVolumes(true);
         _persistit = new Persistit();
         _persistit.getJournalManager().setIgnoreMissingVolumes(true);
-        _persistit.initialize(config);
+        _persistit.setConfiguration(_config);
+        _persistit.initialize();
         final AlertMonitor am = _persistit.getAlertMonitor();
         assertTrue("Startup with missing volumes should have generated alerts",
                 am.getHistory(AlertMonitor.MISSING_VOLUME_CATEGORY) != null);

=== modified file 'src/test/java/com/persistit/PersistitUnitTestCase.java'
--- src/test/java/com/persistit/PersistitUnitTestCase.java	2012-08-30 16:19:35 +0000
+++ src/test/java/com/persistit/PersistitUnitTestCase.java	2012-11-21 16:34:24 +0000
@@ -47,6 +47,8 @@
 
     protected Persistit _persistit = new Persistit();
 
+    protected Configuration _config;
+
     protected Properties getProperties(final boolean cleanup) {
         return UnitTestProperties.getProperties(cleanup);
     }
@@ -54,7 +56,9 @@
     @Before
     public void setUp() throws Exception {
         checkNoPersistitThreads();
-        _persistit.initialize(getProperties(true));
+        _persistit.setProperties(getProperties(true));
+        _persistit.initialize();
+        _config = _persistit.getConfiguration();
     }
 
     @After
@@ -109,18 +113,14 @@
     }
 
     protected void safeCrashAndRestoreProperties() throws PersistitException {
-        final Properties properties = _persistit.getProperties();
         _persistit.flush();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
     }
 
     protected void crashWithoutFlushAndRestoreProperties() throws PersistitException {
-        final Properties properties = _persistit.getProperties();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
     }
 
     public static boolean doesRefBecomeNull(final WeakReference<?> ref) throws InterruptedException {

=== modified file 'src/test/java/com/persistit/RecoveryTest.java'
--- src/test/java/com/persistit/RecoveryTest.java	2012-10-05 23:08:51 +0000
+++ src/test/java/com/persistit/RecoveryTest.java	2012-11-21 16:34:24 +0000
@@ -48,12 +48,14 @@
 
     private String journalSize = "10000000";
     private final String _volumeName = "persistit";
+    private Configuration _config;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
         _persistit.getJournalManager().setWritePagePruningEnabled(false);
+        _config = _persistit.getConfiguration();
 
     }
 
@@ -69,9 +71,7 @@
         _persistit.getJournalManager().setAppendOnly(true);
         store1();
         _persistit.close();
-        final Properties saveProperties = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
         final JournalManager logMan = _persistit.getJournalManager();
         assertTrue(logMan.getPageMapSize() + logMan.getCopiedPageCount() > 0);
         fetch1a();
@@ -88,9 +88,7 @@
         jman.copyBack();
         assertEquals(0, jman.getPageMapSize());
         _persistit.close();
-        final Properties saveProperties = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
         jman = _persistit.getJournalManager();
         // opening a volume modifies its head page
         assertTrue(jman.getPageMapSize() <= 1);
@@ -105,12 +103,12 @@
         store2();
         _persistit.getJournalManager().flush();
         _persistit.crash();
-        final Properties saveProperties = _persistit.getProperties();
         _persistit = new Persistit();
         _persistit.getJournalManager().setAppendOnly(true);
         final RecoveryManager plan = _persistit.getRecoveryManager();
         plan.setRecoveryDisabledForTestMode(true);
-        _persistit.initialize(saveProperties);
+        _persistit.setConfiguration(_config);
+        _persistit.initialize();
         assertEquals(15, plan.getCommittedCount());
         plan.setRecoveryDisabledForTestMode(false);
         final Set<Long> recoveryTimestamps = new HashSet<Long>();
@@ -174,12 +172,12 @@
         fetch3();
         _persistit.getJournalManager().flush();
         _persistit.crash();
-        final Properties saveProperties = _persistit.getProperties();
         _persistit = new Persistit();
         _persistit.getJournalManager().setAppendOnly(true);
         final RecoveryManager rman = _persistit.getRecoveryManager();
         rman.setRecoveryDisabledForTestMode(true);
-        _persistit.initialize(saveProperties);
+        _persistit.setConfiguration(_config);
+        _persistit.initialize();
         assertTrue(rman.getCommittedCount() > 0);
         rman.setRecoveryDisabledForTestMode(false);
         rman.applyAllRecoveredTransactions(rman.getDefaultCommitListener(), rman.getDefaultRollbackListener());
@@ -295,9 +293,7 @@
         exchanges = null;
         _persistit.getJournalManager().flush();
         _persistit.crash();
-        final Properties saveProperties = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
         final Volume volume = _persistit.getVolume("persistit");
 
         for (int index = 0; index < 5; index++) {
@@ -368,9 +364,7 @@
         // retrieve the value of the handle counter before crashing
         final int initialHandleValue = _persistit.getJournalManager().getHandleCount();
         _persistit.close();
-        Properties saveProperties = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
         // verify the value of the handle counter after recovery is
         // still valid.
         assertTrue(_persistit.getJournalManager().getHandleCount() > initialHandleValue);
@@ -381,9 +375,7 @@
         _persistit.getJournalManager().handleForTree(td, true);
         final int updatedHandleValue = _persistit.getJournalManager().getHandleCount();
         _persistit.close();
-        saveProperties = _persistit.getProperties();
-        _persistit = new Persistit();
-        _persistit.initialize(saveProperties);
+        _persistit = new Persistit(_config);
         // verify the value of the handle counter after recovery is
         // still valid.
         assertTrue(_persistit.getJournalManager().getHandleCount() > updatedHandleValue);
@@ -440,10 +432,10 @@
         }
         _persistit.crash();
 
-        final Properties saveProperties = _persistit.getProperties();
         _persistit = new Persistit();
         _persistit.getJournalManager().setAppendOnly(true);
-        _persistit.initialize(saveProperties);
+        _persistit.setConfiguration(_config);
+        _persistit.initialize();
         _persistit.checkAllVolumes();
 
         final Volume volume = _persistit.getVolume("persistit");
@@ -478,11 +470,8 @@
         for (int i = 0; i < count + 100; i++) {
             assertEquals(i < count, exchange.to(i).isValueDefined());
         }
-        final Properties properties = _persistit.getProperties();
         _persistit.close();
-
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         exchange = _persistit.getExchange(_volumeName, "RecoveryTest", false);
         for (int i = 0; i < count + 100; i++) {
             if (i < count && !exchange.to(i).isValueDefined()) {
@@ -493,8 +482,7 @@
         }
 
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
         exchange = _persistit.getExchange(_volumeName, "RecoveryTest", false);
         for (int i = 0; i < count + 100; i++) {
             assertEquals(i < count, exchange.to(i).isValueDefined());
@@ -507,12 +495,10 @@
     @Test
     @Deprecated
     public void testNormalRestartUseOldVSpec() throws Exception {
-        final Configuration config = _persistit.getConfiguration();
         _persistit.close();
         UnitTestProperties.cleanUpDirectory(new File(UnitTestProperties.DATA_PATH));
-        config.setUseOldVSpec(true);
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _config.setUseOldVSpec(true);
+        _persistit = new Persistit(_config);
 
         final JournalManager jman = _persistit.getJournalManager();
         Exchange exchange = _persistit.getExchange(_volumeName, "RecoveryTest", true);
@@ -532,8 +518,7 @@
         }
         _persistit.close();
 
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(_config);
         exchange = _persistit.getExchange(_volumeName, "RecoveryTest", false);
         for (int i = 0; i < count + 100; i++) {
             if (i < count && !exchange.to(i).isValueDefined()) {
@@ -544,8 +529,7 @@
         }
 
         _persistit.close();
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(_config);
         exchange = _persistit.getExchange(_volumeName, "RecoveryTest", false);
         for (int i = 0; i < count + 100; i++) {
             assertEquals(i < count, exchange.to(i).isValueDefined());

=== modified file 'src/test/java/com/persistit/StatisticsTaskTest.java'
--- src/test/java/com/persistit/StatisticsTaskTest.java	2012-11-19 16:35:35 +0000
+++ src/test/java/com/persistit/StatisticsTaskTest.java	2012-11-21 16:34:24 +0000
@@ -15,7 +15,11 @@
 
 package com.persistit;
 
-import static com.persistit.StatisticsTask.*;
+import static com.persistit.StatisticsTask.COUNT_FORMAT;
+import static com.persistit.StatisticsTask.PCOUNT_FORMAT;
+import static com.persistit.StatisticsTask.PHEADER_FORMAT;
+import static com.persistit.StatisticsTask.PRATE_FORMAT;
+import static com.persistit.StatisticsTask.RATE_FORMAT;
 import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;

=== modified file 'src/test/java/com/persistit/TreeTest2.java'
--- src/test/java/com/persistit/TreeTest2.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/TreeTest2.java	2012-11-21 16:34:24 +0000
@@ -51,11 +51,9 @@
             txn.end();
         }
 
-        final Properties properties = _persistit.getProperties();
         _persistit.getJournalManager().flush();
         _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
 
         volume = _persistit.getVolume("persistit");
         assertTrue(1 != volume.getStructure().directoryExchange().getTree().getRootPageAddr());

=== modified file 'src/test/java/com/persistit/VolumeTest.java'
--- src/test/java/com/persistit/VolumeTest.java	2012-10-05 23:08:51 +0000
+++ src/test/java/com/persistit/VolumeTest.java	2012-11-21 16:34:24 +0000
@@ -233,7 +233,6 @@
         _persistit.copyBackPages();
 
         final List<File> journalFiles = _persistit.getJournalManager().unitTestGetAllJournalFiles();
-        final Properties properties = _persistit.getProperties();
         _persistit.crash();
 
         /*
@@ -244,8 +243,7 @@
             assertEquals("Deleted journal file " + file.getName(), true, success);
         }
 
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
+        _persistit = new Persistit(_config);
     }
 
     @Test

=== modified file 'src/test/java/com/persistit/WarmupTest.java'
--- src/test/java/com/persistit/WarmupTest.java	2012-08-28 14:29:50 +0000
+++ src/test/java/com/persistit/WarmupTest.java	2012-11-21 16:34:24 +0000
@@ -46,12 +46,10 @@
             buff[i] = pool.getBufferCopy(i);
         }
 
-        final Configuration config = _persistit.getConfiguration();
         ex = null;
         _persistit.close();
 
-        _persistit = new Persistit();
-        _persistit.initialize(config);
+        _persistit = new Persistit(_config);
         ex = _persistit.getExchange("persistit", "WarmupTest", false);
         pool = ex.getBufferPool();
 
@@ -101,16 +99,16 @@
 
         assertTrue("Buffer pool should have scrambled page address", breaks > 0);
 
-        final Configuration config = _persistit.getConfiguration();
         ex = null;
         pool = null;
         _persistit.copyBackPages();
         _persistit.close();
 
         _persistit = new Persistit();
-        config.setBufferInventoryEnabled(false);
-        config.setBufferPreloadEnabled(false);
-        _persistit.initialize(config);
+        _config.setBufferInventoryEnabled(false);
+        _config.setBufferPreloadEnabled(false);
+        _persistit.setConfiguration(_config);
+        _persistit.initialize();
 
         final Volume volume = _persistit.getVolume("persistit");
         final MediatedFileChannel mfc = (MediatedFileChannel) volume.getStorage().getChannel();

=== modified file 'src/test/java/com/persistit/stress/AbstractSuite.java'
--- src/test/java/com/persistit/stress/AbstractSuite.java	2012-10-23 19:08:32 +0000
+++ src/test/java/com/persistit/stress/AbstractSuite.java	2012-11-21 16:34:24 +0000
@@ -292,10 +292,7 @@
 
     protected Persistit makePersistit(final int pageSize, final String mem, final CommitPolicy policy)
             throws PersistitException {
-        final Persistit persistit = new Persistit();
-        persistit.initialize(makeConfiguration(pageSize, mem, policy));
-        return persistit;
-
+        return new Persistit(makeConfiguration(pageSize, mem, policy));
     }
 
     protected Configuration makeConfiguration(final int pageSize, final String mem, final CommitPolicy policy) {

=== modified file 'src/test/java/com/persistit/stress/InsertBigLoad.java'
--- src/test/java/com/persistit/stress/InsertBigLoad.java	2012-11-01 19:04:11 +0000
+++ src/test/java/com/persistit/stress/InsertBigLoad.java	2012-11-21 16:34:24 +0000
@@ -43,8 +43,7 @@
 
         final Configuration config = makeConfiguration(16384, "50000", CommitPolicy.SOFT);
         config.setTmpVolMaxSize(100000000000l);
-        final Persistit persistit = new Persistit();
-        persistit.initialize(config);
+        final Persistit persistit = new Persistit(config);
 
         try {
             execute(persistit);

=== modified file 'src/test/java/com/persistit/stress/PreloadMixtureTxn1.java'
--- src/test/java/com/persistit/stress/PreloadMixtureTxn1.java	2012-08-23 20:36:42 +0000
+++ src/test/java/com/persistit/stress/PreloadMixtureTxn1.java	2012-11-21 16:34:24 +0000
@@ -69,8 +69,7 @@
             configuration.setBufferInventoryEnabled(true);
             configuration.setBufferPreloadEnabled(true);
 
-            final Persistit persistit = new Persistit();
-            persistit.initialize(configuration);
+            final Persistit persistit = new Persistit(configuration);
 
             try {
                 execute(persistit);

=== modified file 'src/test/java/com/persistit/stress/unit/BigLoad.java'
--- src/test/java/com/persistit/stress/unit/BigLoad.java	2012-11-01 19:04:11 +0000
+++ src/test/java/com/persistit/stress/unit/BigLoad.java	2012-11-21 16:34:24 +0000
@@ -195,7 +195,8 @@
         final BigLoad bl = new BigLoad(records, buckets);
         final Persistit db = new Persistit();
         if (args.length > 2) {
-            db.initialize(args[2]);
+            db.setPropertiesFromFile(args[2]);
+            db.initialize();
         } else {
             db.initialize();
         }

=== modified file 'src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java'
--- src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java	2012-11-21 16:34:24 +0000
@@ -36,7 +36,8 @@
     @Test
     public void testBufferMemConfiguration() throws Exception {
         final Properties properties = UnitTestProperties.getPropertiesByMemory(true, "1M");
-        _persistit.initialize(properties);
+        _persistit.setProperties(properties);
+        _persistit.initialize();
         final BufferPoolInfo[] infoArray = _persistit.getManagement().getBufferPoolInfoArray();
         assertEquals(1, infoArray.length);
         final int bufferSize = infoArray[0].getBufferSize();
@@ -50,7 +51,8 @@
     public void testBufferMemConfigurationErrors() throws Exception {
         Properties properties = UnitTestProperties.getPropertiesByMemory(true, "1000,999");
         try {
-            _persistit.initialize(properties);
+            _persistit.setProperties(properties);
+            _persistit.initialize();
             fail("Accepted allocation 10000 bytes");
         } catch (final IllegalArgumentException e) {
             // okay
@@ -58,7 +60,8 @@
 
         properties = UnitTestProperties.getPropertiesByMemory(true, "10000G");
         try {
-            _persistit.initialize(properties);
+            _persistit.setProperties(properties);
+            _persistit.initialize();
             fail("Accepted allocation 10000G bytes");
         } catch (final IllegalArgumentException e) {
             // okay
@@ -67,7 +70,8 @@
         properties = UnitTestProperties.getPropertiesByMemory(true, "10M");
         properties.put("buffer.count.16384", "1234");
         try {
-            _persistit.initialize(properties);
+            _persistit.setProperties(properties);
+            _persistit.initialize();
             fail("Accepted allocation specified by both count and size");
         } catch (final IllegalArgumentException e) {
             // okay

=== modified file 'src/test/java/com/persistit/unit/FileLockTest.java'
--- src/test/java/com/persistit/unit/FileLockTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/unit/FileLockTest.java	2012-11-21 16:34:24 +0000
@@ -39,7 +39,8 @@
         final Properties properties = _persistit.getProperties();
         final Persistit p2 = new Persistit();
         try {
-            p2.initialize(properties);
+            p2.setProperties(properties);
+            p2.initialize();
             fail("Created second Persistit instance");
         } catch (final PersistitException pe) {
             // success - we intended to fail
@@ -51,7 +52,8 @@
         final Persistit p3 = new Persistit();
         // now this should succeed.
         try {
-            p3.initialize(properties);
+            p3.setProperties(properties);
+            p3.initialize();
         } finally {
             p3.close(false);
         }

=== modified file 'src/test/java/com/persistit/unit/Log4JLoggerTest.java'
--- src/test/java/com/persistit/unit/Log4JLoggerTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/unit/Log4JLoggerTest.java	2012-11-21 16:34:24 +0000
@@ -43,7 +43,8 @@
         BasicConfigurator.configure();
         final Persistit persistit = new Persistit();
         persistit.setPersistitLogger(new Log4JAdapter(logger));
-        persistit.initialize(UnitTestProperties.getAlternateProperties(true));
+        persistit.setProperties(UnitTestProperties.getAlternateProperties(true));
+        persistit.initialize();
         try {
             test1();
         } finally {

=== added file 'src/test/java/com/persistit/unit/SpringFrameworkConfigurationTest.java'
--- src/test/java/com/persistit/unit/SpringFrameworkConfigurationTest.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/persistit/unit/SpringFrameworkConfigurationTest.java	2012-11-21 16:34:24 +0000
@@ -0,0 +1,65 @@
+/**
+ * Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+ * 
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact [e-mail].
+ * 
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.persistit.unit;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import com.persistit.Persistit;
+import com.persistit.exception.PersistitException;
+
+/**
+ * Create a Persistit instance using Spring Framework.
+ * 
+ * @author peter
+ * 
+ */
+public class SpringFrameworkConfigurationTest {
+
+    public static class TestClient {
+        final Persistit db;
+
+        public TestClient(final Persistit db) {
+            this.db = db;
+        }
+
+        private void test() {
+            System.out.println(db.getVolumes());
+            try {
+                db.close();
+            } catch (final PersistitException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Test
+    public void configurePersistitFromSpring() throws Exception {
+        System.setProperty("com.persistit.datapath", UnitTestProperties.DATA_PATH);
+        final ApplicationContext context = new ClassPathXmlApplicationContext(
+                "com/persistit/unit/SpringFrameworkConfiguraitonTest.xml");
+
+        final Persistit persistit = (Persistit) context.getBean("persistit");
+        assertTrue("Persistit should be initialized", persistit.isInitialized());
+
+        final TestClient testClient = (TestClient) context.getBean("testClient");
+        testClient.test();
+    }
+
+}

=== added directory 'src/test/resources/com/persistit/unit'
=== added file 'src/test/resources/com/persistit/unit/SpringFrameworkConfiguraitonTest.xml'
--- src/test/resources/com/persistit/unit/SpringFrameworkConfiguraitonTest.xml	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/persistit/unit/SpringFrameworkConfiguraitonTest.xml	2012-11-21 16:34:24 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+    </bean>
+
+    <bean id="persistit" class="com.persistit.Persistit" init-method="initialize">
+        <property name="configuration">
+            <bean class="com.persistit.Configuration">
+                <property name="bufferPoolConfiguration" value="16384,count=1000" />
+                <property name="volumeList">
+                    <list>
+                        <bean class="com.persistit.VolumeSpecification">
+                            <constructor-arg
+                                value="${com.persistit.datapath}/persistit,create,pageSize:16384,initialPages:100,extensionPages:100,maximumPages:25000" />
+                        </bean>
+                    </list>
+                </property>
+                <property name="journalPath" value="${com.persistit.datapath}/persistit_journal" />
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="testClient" class="com.persistit.unit.SpringFrameworkConfigurationTest.TestClient">
+        <constructor-arg>
+            <ref local="persistit" />
+        </constructor-arg>
+    </bean>
+
+</beans>
\ No newline at end of file