Index: src/main/java/org/apache/jackrabbit/core/cluster/ClusterContext.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/ClusterContext.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/ClusterContext.java	(working copy)
@@ -16,11 +16,11 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import javax.jcr.RepositoryException;
+
 import org.apache.jackrabbit.core.config.ClusterConfig;
 import org.apache.jackrabbit.name.NamespaceResolver;
 
-import javax.jcr.RepositoryException;
-
 /**
  * Initial interface passed to a <code>ClusterNode</code>.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java	(working copy)
@@ -16,30 +16,31 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.observation.Event;
+
+import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.config.ClusterConfig;
 import org.apache.jackrabbit.core.config.ConfigurationException;
-import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
 import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
 import org.apache.jackrabbit.core.observation.EventState;
 import org.apache.jackrabbit.core.observation.EventStateCollection;
 import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.name.Path;
 import org.apache.jackrabbit.name.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import EDU.oswego.cs.dl.util.concurrent.Mutex;
 
-import javax.jcr.observation.Event;
-import javax.jcr.Session;
-import javax.jcr.RepositoryException;
-import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Collection;
-
 /**
  * Default clustered node implementation.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java	(working copy)
@@ -16,19 +16,20 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.xml.sax.ContentHandler;
+import java.io.InputStream;
+import java.io.OutputStream;
 
-import javax.jcr.Session;
-import javax.jcr.Repository;
-import javax.jcr.Workspace;
 import javax.jcr.Credentials;
+import javax.jcr.Item;
 import javax.jcr.Node;
-import javax.jcr.Item;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.ValueFactory;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import javax.jcr.Workspace;
 
+import org.xml.sax.ContentHandler;
+
 /**
  * Represents the session that has made some changes on another node in the cluster. The only method currently
  * implemented is {@link #getUserID()}.
Index: src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java	(working copy)
@@ -16,33 +16,33 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
 import org.apache.jackrabbit.core.nodetype.compact.ParseException;
+import org.apache.jackrabbit.core.observation.EventState;
+import org.apache.jackrabbit.core.observation.EventStateCollection;
 import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.observation.EventState;
-import org.apache.jackrabbit.core.observation.EventStateCollection;
+import org.apache.jackrabbit.name.NameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
 import org.apache.jackrabbit.name.Path;
 import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.NoPrefixDeclaredException;
-import org.apache.jackrabbit.name.NameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collection;
-
 import EDU.oswego.cs.dl.util.concurrent.Mutex;
 
 /**
Index: src/main/java/org/apache/jackrabbit/core/cluster/FileRecord.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/FileRecord.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/FileRecord.java	(working copy)
@@ -16,18 +16,18 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.apache.jackrabbit.name.NamespaceResolver;
-
+import java.io.BufferedInputStream;
+import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.DataInput;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 
+import org.apache.jackrabbit.name.NamespaceResolver;
+
 /**
  * Represents a file-based record. Physically, a file record contains its length in the
  * first 4 bytes, immediately followed by its creator in a length-prefixed, UTF-encoded
Index: src/main/java/org/apache/jackrabbit/core/cluster/FileRecordInput.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/FileRecordInput.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/FileRecordInput.java	(working copy)
@@ -16,28 +16,28 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
 import org.apache.jackrabbit.core.nodetype.compact.CompactNodeTypeDefReader;
 import org.apache.jackrabbit.core.nodetype.compact.ParseException;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NameFormat;
 import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.PathFormat;
 import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameFormat;
-import org.apache.jackrabbit.name.IllegalNameException;
 import org.apache.jackrabbit.name.UnknownPrefixException;
-import org.apache.jackrabbit.name.Path;
-import org.apache.jackrabbit.name.PathFormat;
-import org.apache.jackrabbit.name.MalformedPathException;
 import org.apache.jackrabbit.uuid.Constants;
 import org.apache.jackrabbit.uuid.UUID;
 
-import java.io.IOException;
-import java.io.DataInputStream;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Allows reading data from a <code>FileRecord</code>.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/FileRecordLog.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/FileRecordLog.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/FileRecordLog.java	(working copy)
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.File;
-import java.io.DataInputStream;
-import java.io.IOException;
 import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.io.DataOutputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A file record log is a file containing {@link FileRecord}s. Internally,
Index: src/main/java/org/apache/jackrabbit/core/cluster/FileRecordOutput.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/FileRecordOutput.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/FileRecordOutput.java	(working copy)
@@ -16,22 +16,22 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
 import org.apache.jackrabbit.core.nodetype.compact.CompactNodeTypeDefWriter;
+import org.apache.jackrabbit.name.NameFormat;
 import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameFormat;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
 import org.apache.jackrabbit.name.Path;
 import org.apache.jackrabbit.name.PathFormat;
-import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
 
-import java.io.IOException;
-import java.io.DataOutputStream;
-import java.io.StringWriter;
-import java.util.ArrayList;
-
 /**
  * Allows writing data to a <code>FileRecord</code>.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/FileRevision.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/FileRevision.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/FileRevision.java	(working copy)
@@ -16,14 +16,14 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileLock;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Maintains a file-based revision counter with locking, assuring uniqueness.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/Journal.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/Journal.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/Journal.java	(working copy)
@@ -16,15 +16,13 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.apache.jackrabbit.core.state.ChangeLog;
-import org.apache.jackrabbit.core.observation.EventStateCollection;
+import java.util.Collection;
+
 import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
+import org.apache.jackrabbit.core.observation.EventStateCollection;
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.QName;
 
-import java.util.Collection;
-
 /**
  * Journal interface. Defines operations on a journal that are used to synchronize clustered repository nodes.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/LockEventListener.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/LockEventListener.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/LockEventListener.java	(working copy)
@@ -16,10 +16,10 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import javax.jcr.RepositoryException;
+
 import org.apache.jackrabbit.core.NodeId;
 
-import javax.jcr.RepositoryException;
-
 /**
  * Interface used to receive information about incoming, external lock events.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/NamespaceEventListener.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/NamespaceEventListener.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/NamespaceEventListener.java	(working copy)
@@ -16,8 +16,6 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.apache.jackrabbit.core.NodeId;
-
 import javax.jcr.RepositoryException;
 
 /**
Index: src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.ChangeLog;
 
 /**
  * Describes a journal operation for a node addition.
Index: src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.ChangeLog;
 
 /**
  * Describes a journal operation for a node deletion.
Index: src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.ChangeLog;
 
 /**
  * Describes a journal operation for a node modification.
Index: src/main/java/org/apache/jackrabbit/core/cluster/NodeOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/NodeOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/NodeOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
-import org.apache.jackrabbit.core.NodeId;
 
 /**
  * Describes a journal record for a node change.
Index: src/main/java/org/apache/jackrabbit/core/cluster/NodeTypeEventListener.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/NodeTypeEventListener.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/NodeTypeEventListener.java	(working copy)
@@ -16,11 +16,12 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
+import java.util.Collection;
 
 import javax.jcr.RepositoryException;
-import java.util.Collection;
 
+import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
+
 /**
  * Interface used to receive information about incoming, external node type registry events.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.state.ChangeLog;
 
 /**
  * Describes a journal operation for a property addition.
Index: src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.state.ChangeLog;
 
 /**
  * Describes a journal operation for a property deletion.
Index: src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.state.ChangeLog;
 
 /**
  * Describes a journal operation for a property modification.
Index: src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.nodetype.PropDefId;
-import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.value.InternalValue;
 
 /**
Index: src/main/java/org/apache/jackrabbit/core/cluster/RecordProcessor.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/RecordProcessor.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/RecordProcessor.java	(working copy)
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import java.util.Collection;
+import java.util.Set;
+
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.name.Path;
 import org.apache.jackrabbit.name.QName;
 
-import java.util.Set;
-import java.util.Collection;
-
 /**
  * Listener interface on a journal that gets called back for records that should be processed.
  */
Index: src/main/java/org/apache/jackrabbit/core/cluster/UpdateEventChannel.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/UpdateEventChannel.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/UpdateEventChannel.java	(working copy)
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
+import org.apache.jackrabbit.core.observation.EventStateCollection;
 import org.apache.jackrabbit.core.state.ChangeLog;
-import org.apache.jackrabbit.core.observation.EventStateCollection;
 
 /**
  * Event channel used to transmit update operations.
Index: src/main/java/org/apache/jackrabbit/core/cluster/UpdateEventListener.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/cluster/UpdateEventListener.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/cluster/UpdateEventListener.java	(working copy)
@@ -17,9 +17,11 @@
 package org.apache.jackrabbit.core.cluster;
 
 import java.util.List;
-import org.apache.jackrabbit.core.state.ChangeLog;
+
 import javax.jcr.RepositoryException;
 
+import org.apache.jackrabbit.core.state.ChangeLog;
+
 /**
  * Interface used to receive information about incoming, external update events.
  */