Index: src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java	(working copy)
@@ -16,18 +16,9 @@
  */
 package org.apache.jackrabbit.core.fs.db;
 
-import org.apache.jackrabbit.core.fs.FileSystem;
-import org.apache.jackrabbit.core.fs.FileSystemException;
-import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
-import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
-import org.apache.jackrabbit.util.Text;
-import org.apache.jackrabbit.util.TransientFileFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilterInputStream;
 import java.io.FilterOutputStream;
@@ -35,7 +26,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.FileInputStream;
 import java.io.RandomAccessFile;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -44,9 +34,20 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
-import java.util.HashMap;
 
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.core.fs.FileSystem;
+import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
+import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
+import org.apache.jackrabbit.util.Text;
+import org.apache.jackrabbit.util.TransientFileFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Base class for database file systems. This class contains common
  * functionality for database file system subclasses that normally differ only
Index: src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/db/DerbyFileSystem.java	(working copy)
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.fs.db;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Connection;
-
 /**
  * <code>DerbyFileSystem</code> is a JDBC-based <code>FileSystem</code>
  * implementation for Jackrabbit that persists file system entries in an
Index: src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java	(working copy)
@@ -16,11 +16,12 @@
  */
 package org.apache.jackrabbit.core.fs.db;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
 
 /**
  * Database file system that uses JNDI to acquire the database connection.
Index: src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java	(working copy)
@@ -16,32 +16,33 @@
  */
 package org.apache.jackrabbit.core.fs.db;
 
-import org.apache.jackrabbit.util.Text;
-import org.apache.jackrabbit.util.TransientFileFactory;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.lang.reflect.Method;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import javax.jcr.RepositoryException;
+
 import org.apache.jackrabbit.core.fs.FileSystemException;
 import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
 import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
+import org.apache.jackrabbit.util.Text;
+import org.apache.jackrabbit.util.TransientFileFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jcr.RepositoryException;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.Blob;
-import java.sql.Connection;
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.File;
-import java.io.FilterOutputStream;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.RandomAccessFile;
-import java.lang.reflect.Method;
-
 /**
  * <code>OracleFileSystem</code> is a JDBC-based <code>FileSystem</code>
  * implementation for Jackrabbit that persists file system entries in an
Index: src/main/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java	(working copy)
@@ -16,10 +16,6 @@
  */
 package org.apache.jackrabbit.core.fs.local;
 
-import org.apache.jackrabbit.util.LazyFileInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -28,6 +24,10 @@
 import java.util.HashSet;
 import java.util.Iterator;
 
+import org.apache.jackrabbit.util.LazyFileInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * This Class implements a very simple open handle monitor for the local
  * file system. This is usefull, if the list of open handles, referenced by
Index: src/main/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java	(working copy)
@@ -16,13 +16,6 @@
  */
 package org.apache.jackrabbit.core.fs.local;
 
-import org.apache.jackrabbit.core.fs.FileSystem;
-import org.apache.jackrabbit.core.fs.FileSystemException;
-import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
-import org.apache.jackrabbit.util.LazyFileInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileNotFoundException;
@@ -32,6 +25,13 @@
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
 
+import org.apache.jackrabbit.core.fs.FileSystem;
+import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
+import org.apache.jackrabbit.util.LazyFileInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * A <code>LocalFileSystem</code> ...
  */
Index: src/main/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java	(revision 486054)
+++ src/main/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java	(working copy)
@@ -16,11 +16,11 @@
  */
 package org.apache.jackrabbit.core.fs.local;
 
-import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
-
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
+
 /**
  * Implements a buffered output stream on a random access file.
  */