Index: src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java	(working copy)
@@ -16,11 +16,11 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import org.apache.commons.collections.BeanMap;
-
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.commons.collections.BeanMap;
+
 /**
  * Bean configuration class. BeanConfig instances contain the class name
  * and property information required to instantiate a class that conforms
Index: src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java	(working copy)
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.config;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Entity resolver for Jackrabbit configuration files.
  * This simple resolver contains mappings for the following
Index: src/main/java/org/apache/jackrabbit/core/config/ConfigurationParser.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/config/ConfigurationParser.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/config/ConfigurationParser.java	(working copy)
@@ -16,6 +16,14 @@
  */
 package org.apache.jackrabbit.core.config;
 
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.jackrabbit.util.Text;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -23,14 +31,7 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.apache.jackrabbit.util.Text;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.util.Properties;
-
 /**
  * Configuration parser base class. This class provides the basic
  * functionality for parsing Jackrabbit configuration files. Subclasses
Index: src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java	(revision 485651)
+++ src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java	(working copy)
@@ -16,21 +16,6 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import org.apache.jackrabbit.core.fs.FileSystem;
-import org.apache.jackrabbit.core.fs.FileSystemException;
-import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -47,6 +32,22 @@
 import java.util.Map;
 import java.util.Properties;
 
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.jackrabbit.core.fs.FileSystem;
+import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
 /**
  * Repository configuration. This configuration class is used to
  * create configured repository objects.