You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/01/10 10:14:50 UTC

[50/53] [abbrv] james-project git commit: JAMES-2277 tab to 4 space in xml

JAMES-2277 tab to 4 space in xml


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f643a258
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f643a258
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f643a258

Branch: refs/heads/master
Commit: f643a258f6ee54f897986e5261a9ceb3b1f1a2d2
Parents: 52c18ef
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue Dec 26 23:27:24 2017 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Jan 10 10:45:41 2018 +0100

----------------------------------------------------------------------
 .../package/etc/james/templates/imapserver.xml  |  52 ++---
 .../destination/conf/imapserver.xml             |  68 +++---
 .../cassandra/destination/conf/imapserver.xml   |  68 +++---
 .../guice/jpa/destination/conf/imapserver.xml   |  68 +++---
 .../run/spring/destination/conf/imapserver.xml  |  68 +++---
 mailbox/hbase/src/main/config/hbase-site.xml    |   4 +-
 .../jcr/src/test/resources/test-repository.xml  |  12 +-
 .../spring/src/test/resources/hbase-site.xml    |   4 +-
 mpt/all/pom.xml                                 |   2 +-
 mpt/antlib/src/site/site.xml                    |   6 +-
 mpt/antlib/src/site/xdoc/index.xml              |  54 ++---
 mpt/app/src/site/site.xml                       |   6 +-
 mpt/core/src/site/site.xml                      |   6 +-
 .../testdata/DefaultMailboxManagerConf.xml      |  36 ++--
 .../mailboxmanager/testdata/MixedMailstores.xml |   2 +-
 .../testdata/VirtualRepositoryMix.xml           | 214 +++++++++----------
 .../core/src/main/resources/test-repository.xml |  12 +-
 .../cassandra/src/test/resources/imapserver.xml |  52 ++---
 server/app/src/main/resources/imapserver.xml    |  54 ++---
 server/app/src/main/resources/lmtpserver.xml    |  24 +--
 .../app/src/main/resources/mailetcontainer.xml  |  40 ++--
 server/app/src/main/resources/pop3server.xml    |  58 ++---
 server/app/src/test/resources/imapserver.xml    |  54 ++---
 server/app/src/test/resources/pop3server.xml    |  58 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../jpa-guice/src/test/resources/imapserver.xml |  52 ++---
 .../sample-configuration/imapserver.xml         |  52 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../src/test/resources/test-repository.xml      |  12 +-
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 .../src/test/resources/imapserver.xml           |  52 ++---
 server/src/reporting-site/site.xml              |  40 ++--
 src/site/xdoc/documentation.xml                 |  16 +-
 src/site/xdoc/mail.xml                          |   2 +-
 src/site/xdoc/mailet/standard/index.xml         |   2 +-
 src/site/xdoc/server/index.xml                  |  10 +-
 40 files changed, 812 insertions(+), 812 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/imapserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/imapserver.xml b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/imapserver.xml
index 8ccb117..64e6509 100644
--- a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/imapserver.xml
+++ b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="true">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="true">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="true" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="true" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
index 9eed393..6616d24 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
@@ -21,42 +21,42 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="true">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="true">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="true" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="true" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml b/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml
index 9eed393..6616d24 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml
@@ -21,42 +21,42 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="true">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="true">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="true" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="true" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/dockerfiles/run/guice/jpa/destination/conf/imapserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/imapserver.xml b/dockerfiles/run/guice/jpa/destination/conf/imapserver.xml
index 9eed393..6616d24 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/imapserver.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/imapserver.xml
@@ -21,42 +21,42 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="true">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="true">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="true" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="true" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/dockerfiles/run/spring/destination/conf/imapserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/imapserver.xml b/dockerfiles/run/spring/destination/conf/imapserver.xml
index 9eed393..6616d24 100644
--- a/dockerfiles/run/spring/destination/conf/imapserver.xml
+++ b/dockerfiles/run/spring/destination/conf/imapserver.xml
@@ -21,42 +21,42 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="true">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="true">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="true" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="true" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-		<idleTimeInterval>120</idleTimeInterval>
-		<idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-		<disabledCaps>ACL|MOVE</disabledCaps>
-		<enableIdle>true</enableIdle>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mailbox/hbase/src/main/config/hbase-site.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/config/hbase-site.xml b/mailbox/hbase/src/main/config/hbase-site.xml
index 1857bac..a5183f7 100644
--- a/mailbox/hbase/src/main/config/hbase-site.xml
+++ b/mailbox/hbase/src/main/config/hbase-site.xml
@@ -30,12 +30,12 @@
         <name>hbase.rootdir</name>
         <value>hdfs://localhost:9000/hbase</value>
     </property>
-	
+
     <property>
         <name>hbase.master.port</name>
         <value>60000</value>
     </property>
-	
+
     <property>
         <name>hbase.regionserver.info.port</name>
         <value>6030</value>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mailbox/jcr/src/test/resources/test-repository.xml
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/test/resources/test-repository.xml b/mailbox/jcr/src/test/resources/test-repository.xml
index 8258dcd..592cca8 100644
--- a/mailbox/jcr/src/test/resources/test-repository.xml
+++ b/mailbox/jcr/src/test/resources/test-repository.xml
@@ -53,9 +53,9 @@
             persistence manager of the workspace:
             class: FQN of class implementing the PersistenceManager interface
         -->
-		<PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
-			<param name="persistent" value="false"/>
-		</PersistenceManager>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+            <param name="persistent" value="false"/>
+        </PersistenceManager>
         
         <SearchIndex class='org.apache.jackrabbit.core.query.lucene.SearchIndex'>
             <param name='path' value='${wsp.home}/index'/>
@@ -73,9 +73,9 @@
         <FileSystem class='org.apache.jackrabbit.core.fs.mem.MemoryFileSystem'>
         </FileSystem>
 
-		<PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
-			<param name="persistent" value="false"/>
-		</PersistenceManager>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+            <param name="persistent" value="false"/>
+        </PersistenceManager>
         
     </Versioning>
     <!--

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mailbox/spring/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/test/resources/hbase-site.xml b/mailbox/spring/src/test/resources/hbase-site.xml
index 1857bac..a5183f7 100644
--- a/mailbox/spring/src/test/resources/hbase-site.xml
+++ b/mailbox/spring/src/test/resources/hbase-site.xml
@@ -30,12 +30,12 @@
         <name>hbase.rootdir</name>
         <value>hdfs://localhost:9000/hbase</value>
     </property>
-	
+
     <property>
         <name>hbase.master.port</name>
         <value>60000</value>
     </property>
-	
+
     <property>
         <name>hbase.regionserver.info.port</name>
         <value>6030</value>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/all/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index 12e1d21..8287588 100644
--- a/mpt/all/pom.xml
+++ b/mpt/all/pom.xml
@@ -72,7 +72,7 @@ MPT is a functional test framework specialised for the ASCII line-base protocols
                         <goals>
                             <goal>single</goal>
                         </goals>
-			<phase>package</phase>
+            <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/antlib/src/site/site.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/src/site/site.xml b/mpt/antlib/src/site/site.xml
index 42dbd5a..5437b74 100644
--- a/mpt/antlib/src/site/site.xml
+++ b/mpt/antlib/src/site/site.xml
@@ -26,9 +26,9 @@
     <menu name="MPT AntLib">
       <item name="Overview" href="index.html"/>
       <item 
-      	name="DOAP" 
-      	href="doap_apache-james-mpt-antlib.rdf" 
-      	img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
+          name="DOAP"
+          href="doap_apache-james-mpt-antlib.rdf"
+          img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
     </menu>
     
     <menu ref="reports" />

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/antlib/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/src/site/xdoc/index.xml b/mpt/antlib/src/site/xdoc/index.xml
index 1b953a5..d95095b 100644
--- a/mpt/antlib/src/site/xdoc/index.xml
+++ b/mpt/antlib/src/site/xdoc/index.xml
@@ -56,28 +56,28 @@ element.
 <subsection name='Parameters'>
 <table> 
 <tr>
-	<td><strong>Attribute</strong></td> <td><strong>Description</strong></td> <td><strong>Required</strong></td>
+    <td><strong>Attribute</strong></td> <td><strong>Description</strong></td> <td><strong>Required</strong></td>
 </tr> 
 <tr>
-	<td>port</td> 
-	<td>Port number that the scripts should be executed against</td> 
-	<td>Yes</td>
+    <td>port</td>
+    <td>Port number that the scripts should be executed against</td>
+    <td>Yes</td>
 </tr>
 <tr>
-	<td>host</td> 
-	<td>Host name or IP address of the server against which the scripts should be executed</td> 
-	<td>No (Defaults to <code>127.0.0.1</code>)</td>
+    <td>host</td>
+    <td>Host name or IP address of the server against which the scripts should be executed</td>
+    <td>No (Defaults to <code>127.0.0.1</code>)</td>
 </tr> 
 <tr>
-	<td>script</td> 
-	<td>File containing a script to be executed. To execute multiple scripts, 
-	use a <a href='#Any Resource Collection'>Resource Collection</a></td> 
-	<td>When no resource collections elements exist</td>
+    <td>script</td>
+    <td>File containing a script to be executed. To execute multiple scripts,
+    use a <a href='#Any Resource Collection'>Resource Collection</a></td>
+    <td>When no resource collections elements exist</td>
 </tr> 
 <tr>
-	<td>skip</td> 
-	<td>Skips execution of scripts. For simple conditional execution.</td> 
-	<td>No</td>
+    <td>skip</td>
+    <td>Skips execution of scripts. For simple conditional execution.</td>
+    <td>No</td>
 </tr> 
 <tr>
     <td>shabang</td> 
@@ -113,30 +113,30 @@ The port can vary but the host is inherited.
 </p>
 <table> 
 <tr>
-	<td><strong>Attribute</strong></td> <td><strong>Description</strong></td> <td><strong>Required</strong></td>
+    <td><strong>Attribute</strong></td> <td><strong>Description</strong></td> <td><strong>Required</strong></td>
 </tr> 
 <tr>
-	<td>port</td> 
-	<td>Port number that the user addition script should be executed against</td> 
-	<td>Yes</td>
+    <td>port</td>
+    <td>Port number that the user addition script should be executed against</td>
+    <td>Yes</td>
 </tr>
 
 <tr>
-	<td>passwd</td> 
-	<td>Password to be set for user created. Will be passed to the script.</td> 
-	<td>No</td>
+    <td>passwd</td>
+    <td>Password to be set for user created. Will be passed to the script.</td>
+    <td>No</td>
 </tr> 
 
 <tr>
-	<td>user</td> 
-	<td>Name of the user to be created. Will be passed to the script.</td> 
-	<td>No</td>
+    <td>user</td>
+    <td>Name of the user to be created. Will be passed to the script.</td>
+    <td>No</td>
 </tr> 
 
 <tr>
-	<td>script</td> 
-	<td>File containing the user creation script</td> 
-	<td>Either this attribute must be set, or the user addition script </td>
+    <td>script</td>
+    <td>File containing the user creation script</td>
+    <td>Either this attribute must be set, or the user addition script </td>
 </tr> 
 </table>
 <p>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/app/src/site/site.xml
----------------------------------------------------------------------
diff --git a/mpt/app/src/site/site.xml b/mpt/app/src/site/site.xml
index 991da4c..471ec7d 100644
--- a/mpt/app/src/site/site.xml
+++ b/mpt/app/src/site/site.xml
@@ -26,9 +26,9 @@
     <menu name="Mail Protocol Tester">
       <item name="Interface" href="index.html"/>
       <item 
-      	name="DOAP" 
-      	href="doap_apache-james-mpt-app.rdf" 
-      	img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
+          name="DOAP"
+          href="doap_apache-james-mpt-app.rdf"
+          img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
     </menu>
     
     <menu ref="reports" />

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/mpt/core/src/site/site.xml b/mpt/core/src/site/site.xml
index e03aa93..0fdcafc 100644
--- a/mpt/core/src/site/site.xml
+++ b/mpt/core/src/site/site.xml
@@ -26,9 +26,9 @@
     <menu name="Mail Protocol Tester">
       <item name="Overview" href="index.html"/>
       <item 
-      	name="DOAP" 
-      	href="doap_apache-james-mpt.rdf" 
-      	img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
+          name="DOAP"
+          href="doap_apache-james-mpt.rdf"
+          img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
     </menu>
     
     <menu ref="reports" />

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/DefaultMailboxManagerConf.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/DefaultMailboxManagerConf.xml b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/DefaultMailboxManagerConf.xml
index 9b2a429..641b24a 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/DefaultMailboxManagerConf.xml
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/DefaultMailboxManagerConf.xml
@@ -18,24 +18,24 @@
   under the License.    
 -->
     <mailboxmanager>
-	   <namespaces>
-		   <usernamespace name="#mail" delimiter="." />
-	   </namespaces>	   
-		   
-	   <factory class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
-		<mount>
-			<point point="#system" />
-			<target class="org.apache.james.mailboxmanager.impl.MailStoreMailboxManager">
-				<repository destinationURL="file://var/mail/" type="MAIL" />
-			</target>
-		</mount>	 
-		<mount>
-			<point point="#mail" />
-			<target type="service" service="org.apache.james.mailboxmanager.impl.MailStoreMailboxManager">
-				<repository destinationURL="file://var/mail/inboxes/" type="MAIL" />
-			</target>
-		</mount>	 
-	   </factory>	   
+       <namespaces>
+           <usernamespace name="#mail" delimiter="." />
+       </namespaces>
+
+       <factory class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
+        <mount>
+            <point point="#system" />
+            <target class="org.apache.james.mailboxmanager.impl.MailStoreMailboxManager">
+                <repository destinationURL="file://var/mail/" type="MAIL" />
+            </target>
+        </mount>
+        <mount>
+            <point point="#mail" />
+            <target type="service" service="org.apache.james.mailboxmanager.impl.MailStoreMailboxManager">
+                <repository destinationURL="file://var/mail/inboxes/" type="MAIL" />
+            </target>
+        </mount>
+       </factory>
    </mailboxmanager>  
 
 </config>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/MixedMailstores.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/MixedMailstores.xml b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/MixedMailstores.xml
index 958ac9d..11d0198 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/MixedMailstores.xml
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/MixedMailstores.xml
@@ -39,7 +39,7 @@
                         <repository destinationURL="file://target/var/vm/user2_test"
                             type="MAIL"/>
                     </target>
-                </mount>    				   
+                </mount>
             </mounts>
         </factory>
     </mailboxmanager>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml
index db86a8a..2b6b125 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml
@@ -17,113 +17,113 @@
   specific language governing permissions and limitations
   under the License.    
 -->
-	<mailboxmanager>
-		<namespaces>
-			<usernamespace name="#mail" delimiter="."/>
-		</namespaces>
-		<factory
-			class="org.apache.james.mailboxmanager.impl.VirtualMailboxManagerFactory">
-			<mounts>
-				<mount>
-					<point point="#user"/>
-					<point point="#user1"/>
-					<target
-						class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
-						<myconf attr="test"/>
-					</target>
-				</mount>
+    <mailboxmanager>
+        <namespaces>
+            <usernamespace name="#mail" delimiter="."/>
+        </namespaces>
+        <factory
+            class="org.apache.james.mailboxmanager.impl.VirtualMailboxManagerFactory">
+            <mounts>
+                <mount>
+                    <point point="#user"/>
+                    <point point="#user1"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
+                        <myconf attr="test"/>
+                    </target>
+                </mount>
 
-				<mount>
-					<point point="#user2"/>
-					<point point="#user3"/>
-					<target
-						class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
-						<myconf attr="test2"/>
-					</target>
-				</mount>
-				<mount>
-					<point point="#system"/>
-					<target
-						class="org.apache.james.mailboxmanager.mailstore.MailStoreMailboxManagerFactory">
-						<repository destinationURL="file://var/mail/"
-							type="MAIL"/>
-					</target>
-				</mount>
-				<mount>
-					<point point="#mail"/>
-					<target
-						class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
-						<configFile name="file://conf/mailboxManagerSqlResources.xml"/>
-						<torque-properties>
-							<property name="torque.database.default"
-								value="mailboxmanager"/>
-							<property
-								name="torque.database.mailboxmanager.adapter"
-								value="derby"/>
-							<property
-								name="torque.dsfactory.mailboxmanager.factory"
-								value="org.apache.torque.dsfactory.SharedPoolDataSourceFactory"/>
-							<property
-								name="torque.dsfactory.mailboxmanager.connection.driver"
-								value="org.apache.derby.jdbc.EmbeddedDriver"/>
-							<property
-								name="torque.dsfactory.mailboxmanager.connection.url"
-								value="jdbc:derby:tmp/mailboxmanager-derbydb;create=true"/>
-							<property
-								name="torque.dsfactory.mailboxmanager.connection.user"
-								value="app"/>
-							<property
-								name="torque.dsfactory.mailboxmanager.connection.password"
-								value="app"/>
-							<property
-								name="torque.dsfactory.mailboxmanager.pool.maxActive"
-								value="100"/>
-						</torque-properties>
-					</target>
-				</mount>
-			</mounts>
-		</factory>
-	</mailboxmanager>
-	<mailboxmanager-without-torque>
-		<namespaces>
-			<usernamespace name="#mail" delimiter="."/>
-		</namespaces>
-		<factory
-			class="org.apache.james.mailboxmanager.impl.VirtualMailboxManagerFactory">
-			<mounts>
-				<mount>
-					<point point="#user"/>
-					<point point="#user1"/>
-					<target
-						class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
-						<myconf attr="test"/>
-					</target>
-				</mount>
+                <mount>
+                    <point point="#user2"/>
+                    <point point="#user3"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
+                        <myconf attr="test2"/>
+                    </target>
+                </mount>
+                <mount>
+                    <point point="#system"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mailstore.MailStoreMailboxManagerFactory">
+                        <repository destinationURL="file://var/mail/"
+                            type="MAIL"/>
+                    </target>
+                </mount>
+                <mount>
+                    <point point="#mail"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
+                        <configFile name="file://conf/mailboxManagerSqlResources.xml"/>
+                        <torque-properties>
+                            <property name="torque.database.default"
+                                value="mailboxmanager"/>
+                            <property
+                                name="torque.database.mailboxmanager.adapter"
+                                value="derby"/>
+                            <property
+                                name="torque.dsfactory.mailboxmanager.factory"
+                                value="org.apache.torque.dsfactory.SharedPoolDataSourceFactory"/>
+                            <property
+                                name="torque.dsfactory.mailboxmanager.connection.driver"
+                                value="org.apache.derby.jdbc.EmbeddedDriver"/>
+                            <property
+                                name="torque.dsfactory.mailboxmanager.connection.url"
+                                value="jdbc:derby:tmp/mailboxmanager-derbydb;create=true"/>
+                            <property
+                                name="torque.dsfactory.mailboxmanager.connection.user"
+                                value="app"/>
+                            <property
+                                name="torque.dsfactory.mailboxmanager.connection.password"
+                                value="app"/>
+                            <property
+                                name="torque.dsfactory.mailboxmanager.pool.maxActive"
+                                value="100"/>
+                        </torque-properties>
+                    </target>
+                </mount>
+            </mounts>
+        </factory>
+    </mailboxmanager>
+    <mailboxmanager-without-torque>
+        <namespaces>
+            <usernamespace name="#mail" delimiter="."/>
+        </namespaces>
+        <factory
+            class="org.apache.james.mailboxmanager.impl.VirtualMailboxManagerFactory">
+            <mounts>
+                <mount>
+                    <point point="#user"/>
+                    <point point="#user1"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
+                        <myconf attr="test"/>
+                    </target>
+                </mount>
 
-				<mount>
-					<point point="#user2"/>
-					<point point="#user3"/>
-					<target
-						class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
-						<myconf attr="test2"/>
-					</target>
-				</mount>
-				<mount>
-					<point point="#system"/>
-					<target
-						class="org.apache.james.mailboxmanager.mailstore.MailStoreMailboxManagerFactory">
-						<repository destinationURL="file://var/mail/"
-							type="MAIL"/>
-					</target>
-				</mount>
-				<mount>
-					<point point="#mail"/>
-					<target
-						class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
-						<myconf attr="test3"/>
-					</target>
-				</mount>
-			</mounts>
-		</factory>
-	</mailboxmanager-without-torque>
+                <mount>
+                    <point point="#user2"/>
+                    <point point="#user3"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
+                        <myconf attr="test2"/>
+                    </target>
+                </mount>
+                <mount>
+                    <point point="#system"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mailstore.MailStoreMailboxManagerFactory">
+                        <repository destinationURL="file://var/mail/"
+                            type="MAIL"/>
+                    </target>
+                </mount>
+                <mount>
+                    <point point="#mail"/>
+                    <target
+                        class="org.apache.james.mailboxmanager.mock.MockMailboxManagerFactory">
+                        <myconf attr="test3"/>
+                    </target>
+                </mount>
+            </mounts>
+        </factory>
+    </mailboxmanager-without-torque>
 </config>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/impl/imap-mailbox/core/src/main/resources/test-repository.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/test-repository.xml b/mpt/impl/imap-mailbox/core/src/main/resources/test-repository.xml
index 8258dcd..592cca8 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/test-repository.xml
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/test-repository.xml
@@ -53,9 +53,9 @@
             persistence manager of the workspace:
             class: FQN of class implementing the PersistenceManager interface
         -->
-		<PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
-			<param name="persistent" value="false"/>
-		</PersistenceManager>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+            <param name="persistent" value="false"/>
+        </PersistenceManager>
         
         <SearchIndex class='org.apache.jackrabbit.core.query.lucene.SearchIndex'>
             <param name='path' value='${wsp.home}/index'/>
@@ -73,9 +73,9 @@
         <FileSystem class='org.apache.jackrabbit.core.fs.mem.MemoryFileSystem'>
         </FileSystem>
 
-		<PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
-			<param name="persistent" value="false"/>
-		</PersistenceManager>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+            <param name="persistent" value="false"/>
+        </PersistenceManager>
         
     </Versioning>
     <!--

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/app/src/main/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/imapserver.xml b/server/app/src/main/resources/imapserver.xml
index cc2ab1b..80258ea 100644
--- a/server/app/src/main/resources/imapserver.xml
+++ b/server/app/src/main/resources/imapserver.xml
@@ -27,34 +27,34 @@
 
 <imapservers>
 
-	<!-- IMAP server is enabled by default -->
-	<!-- Disabling blocks will stop them from listening, -->
-	<!-- but does not free as many resources as removing them would -->
-	<imapserver enabled="true">
-	
+    <!-- IMAP server is enabled by default -->
+    <!-- Disabling blocks will stop them from listening, -->
+    <!-- but does not free as many resources as removing them would -->
+    <imapserver enabled="true">
+
        <jmxName>imapserver</jmxName>
 
-	   <!-- Configure this if you want to bind to a specific inetaddress -->
-	   <!-- port 143 is the well-known/IANA registered port for IMAP -->
-	   <!-- port 993 is the well-known/IANA registered port for IMAPS  ie over SSL/TLS -->
-	   <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
-	   <!-- in order to avoid relay check for locally generated bounces -->    
-	   <bind>0.0.0.0:143</bind>
-	    
-	   <connectionBacklog>200</connectionBacklog>
-	    
-	   <!-- Set to true to use TLS for the Socket.
-	         To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-	    -->
-	   <tls socketTLS="false" startTLS="false">
-	     <!-- To create a new keystore execute:
-	      keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-	       -->
-	     <keystore>file://conf/keystore</keystore>
-	     <secret>yoursecret</secret>
-	     <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-	   </tls>
-	      
+       <!-- Configure this if you want to bind to a specific inetaddress -->
+       <!-- port 143 is the well-known/IANA registered port for IMAP -->
+       <!-- port 993 is the well-known/IANA registered port for IMAPS  ie over SSL/TLS -->
+       <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+       <!-- in order to avoid relay check for locally generated bounces -->
+       <bind>0.0.0.0:143</bind>
+
+       <connectionBacklog>200</connectionBacklog>
+
+       <!-- Set to true to use TLS for the Socket.
+             To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+        -->
+       <tls socketTLS="false" startTLS="false">
+         <!-- To create a new keystore execute:
+          keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+           -->
+         <keystore>file://conf/keystore</keystore>
+         <secret>yoursecret</secret>
+         <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+       </tls>
+
        <!-- This is the name used by the server to identify itself in the IMAP -->
        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
        <!-- own host name and use that in the protocol.  If discovery fails, -->
@@ -72,6 +72,6 @@
        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
        <connectionLimitPerIP>0</connectionLimitPerIP>
 
-	</imapserver>
+    </imapserver>
 
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/app/src/main/resources/lmtpserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/lmtpserver.xml b/server/app/src/main/resources/lmtpserver.xml
index 15bb62f..a9b267c 100644
--- a/server/app/src/main/resources/lmtpserver.xml
+++ b/server/app/src/main/resources/lmtpserver.xml
@@ -27,18 +27,18 @@
 
 <lmtpservers>
  
-	<!-- The LMTP server is disabled by default -->
-	<!-- Disabling blocks will stop them from listening, -->
-	<!-- but does not free as many resources as removing them would -->
-	<lmtpserver enabled="false">
-	
+    <!-- The LMTP server is disabled by default -->
+    <!-- Disabling blocks will stop them from listening, -->
+    <!-- but does not free as many resources as removing them would -->
+    <lmtpserver enabled="false">
+
        <jmxName>lmtpserver</jmxName>
 
-	   <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
-	   <bind>127.0.0.1:24</bind>
-	    
-	   <connectionBacklog>200</connectionBacklog>
-	      
+       <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
+       <bind>127.0.0.1:24</bind>
+
+       <connectionBacklog>200</connectionBacklog>
+
        <!-- This is the name used by the server to identify itself in the LMTP -->
        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
        <!-- own host name and use that in the protocol.  If discovery fails, -->
@@ -72,6 +72,6 @@
            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
        </handlerchain>
 
-	</lmtpserver>
-	
+    </lmtpserver>
+
 </lmtpservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/app/src/main/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/app/src/main/resources/mailetcontainer.xml
index ce0f2c2..ae84957 100644
--- a/server/app/src/main/resources/mailetcontainer.xml
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -30,14 +30,14 @@
 <mailetcontainer enableJmx="true">
  
     <!-- MailAddress used for PostMaster -->
-	<context>
-	    <postmaster>postmaster@localhost</postmaster>
-	</context>
+    <context>
+        <postmaster>postmaster@localhost</postmaster>
+    </context>
 
     <!-- Number of spool threads -->
     <spooler>
-	  <threads>20</threads>
-	</spooler>
+      <threads>20</threads>
+    </spooler>
       
   <processors>
   
@@ -236,19 +236,19 @@ Regards, Postmaster XXX.YYY
        <!--
 
        <mailet match="IsOverQuota" class="ToProcessor">
-	      <processor>over-quota</processor>
-	    </mailet>
+          <processor>over-quota</processor>
+        </mailet>
          -->
 
        <!--  The RecipientRewriteTable will use the definitions found in recipientrewritetablexml -->
-	     <mailet match="All" class="RecipientRewriteTable" />
-	    
-	     <!-- Place a copy in the user Sent folder -->
-	     <mailet match="SenderIsLocal" class="ToSenderFolder">
-	       <folder>Sent</folder>
-	       <consume>false</consume>
-	     </mailet>
-	
+         <mailet match="All" class="RecipientRewriteTable" />
+
+         <!-- Place a copy in the user Sent folder -->
+         <mailet match="SenderIsLocal" class="ToSenderFolder">
+           <folder>Sent</folder>
+           <consume>false</consume>
+         </mailet>
+
        <!-- Is the recipient is for a local account, deliver it locally -->
        <mailet match="RecipientIsLocal" class="Sieve"/>
        <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
@@ -370,11 +370,11 @@ Regards, Postmaster XXX.YYY
      
        <!-- To place the spam messages in the user junk folder, uncomment this matcher/mailet configuration -->
        <!--
-	   <mailet match="RecipientIsLocal" class="ToRecipientFolder">
-	       <folder>Junk</folder>
-	       <consume>false</consume>
-	   </mailet>
-	    -->
+       <mailet match="RecipientIsLocal" class="ToRecipientFolder">
+           <folder>Junk</folder>
+           <consume>false</consume>
+       </mailet>
+        -->
 
        <!-- To destroy all messages, uncomment this matcher/mailet configuration -->
        <!--

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/app/src/main/resources/pop3server.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/pop3server.xml b/server/app/src/main/resources/pop3server.xml
index 83d1558..8b411d8 100644
--- a/server/app/src/main/resources/pop3server.xml
+++ b/server/app/src/main/resources/pop3server.xml
@@ -27,32 +27,32 @@
 
 <pop3servers>
 
-	<!-- The POP3 server is enabled by default -->
-	<!-- Disabling blocks will stop them from listening, -->
-	<!-- but does not free as many resources as removing them would -->
-	<pop3server enabled="true">
-	
-	   <jmxName>pop3server</jmxName>
-	
-	   <!-- Configure this to bind to a specific inetaddress -->
-	   <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS -->
-	   <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
-	   <bind>0.0.0.0:110</bind>
-	
-	   <connectionBacklog>200</connectionBacklog>
-	
-	   <!-- Set to true to support STARTTLS or SSL for the Socket.
-	         To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-	    -->
-	   <tls socketTLS="false" startTLS="false">
-	       <!-- To create a new keystore execute:
-	             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-	        -->
-	       <keystore>file://conf/keystore</keystore>
-	       <secret>yoursecret</secret>
-	       <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-	   </tls>
-	      
+    <!-- The POP3 server is enabled by default -->
+    <!-- Disabling blocks will stop them from listening, -->
+    <!-- but does not free as many resources as removing them would -->
+    <pop3server enabled="true">
+
+       <jmxName>pop3server</jmxName>
+
+       <!-- Configure this to bind to a specific inetaddress -->
+       <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS -->
+       <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
+       <bind>0.0.0.0:110</bind>
+
+       <connectionBacklog>200</connectionBacklog>
+
+       <!-- Set to true to support STARTTLS or SSL for the Socket.
+             To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+        -->
+       <tls socketTLS="false" startTLS="false">
+           <!-- To create a new keystore execute:
+                 keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+            -->
+           <keystore>file://conf/keystore</keystore>
+           <secret>yoursecret</secret>
+           <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+       </tls>
+
        <!-- This is the name used by the server to identify itself in the POP3 -->
        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
        <!-- own host name and use that in the protocol.  If discovery fails, -->
@@ -75,7 +75,7 @@
            <!-- know what you are doing -->
            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
        </handlerchain>
-	    
-	</pop3server>
-	
+
+    </pop3server>
+
 </pop3servers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/app/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/test/resources/imapserver.xml b/server/app/src/test/resources/imapserver.xml
index d5da735..4f95587 100644
--- a/server/app/src/test/resources/imapserver.xml
+++ b/server/app/src/test/resources/imapserver.xml
@@ -25,34 +25,34 @@
 
 <imapservers>
 
-	<!-- IMAP server is enabled by default -->
-	<!-- Disabling blocks will stop them from listening, -->
-	<!-- but does not free as many resources as removing them would -->
-	<imapserver enabled="true">
-	
+    <!-- IMAP server is enabled by default -->
+    <!-- Disabling blocks will stop them from listening, -->
+    <!-- but does not free as many resources as removing them would -->
+    <imapserver enabled="true">
+
        <jmxName>imapserver</jmxName>
 
-	   <!-- Configure this if you want to bind to a specific inetaddress -->
-	   <!-- port 143 is the well-known/IANA registered port for IMAP -->
-	   <!-- port 993 is the well-known/IANA registered port for IMAPS  ie over SSL/TLS -->
-	   <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
-	   <!-- in order to avoid relay check for locally generated bounces -->    
-	   <bind>0.0.0.0:1433</bind>
-	    
-	   <connectionBacklog>200</connectionBacklog>
-	    
-	   <!-- Set to true to use TLS for the Socket.
-	         To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-	    -->
-	   <tls socketTLS="false" startTLS="false">
-	     <!-- To create a new keystore execute:
-	      keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-	       -->
-	     <keystore>file://conf/keystore</keystore>
-	     <secret>yoursecret</secret>
-	     <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-	   </tls>
-	      
+       <!-- Configure this if you want to bind to a specific inetaddress -->
+       <!-- port 143 is the well-known/IANA registered port for IMAP -->
+       <!-- port 993 is the well-known/IANA registered port for IMAPS  ie over SSL/TLS -->
+       <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+       <!-- in order to avoid relay check for locally generated bounces -->
+       <bind>0.0.0.0:1433</bind>
+
+       <connectionBacklog>200</connectionBacklog>
+
+       <!-- Set to true to use TLS for the Socket.
+             To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+        -->
+       <tls socketTLS="false" startTLS="false">
+         <!-- To create a new keystore execute:
+          keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+           -->
+         <keystore>file://conf/keystore</keystore>
+         <secret>yoursecret</secret>
+         <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+       </tls>
+
        <!-- This is the name used by the server to identify itself in the SMTP -->
        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
        <!-- own host name and use that in the protocol.  If discovery fails, -->
@@ -68,6 +68,6 @@
        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
        <connectionLimitPerIP>0</connectionLimitPerIP>
          
-	</imapserver>
+    </imapserver>
 
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/app/src/test/resources/pop3server.xml
----------------------------------------------------------------------
diff --git a/server/app/src/test/resources/pop3server.xml b/server/app/src/test/resources/pop3server.xml
index 0f66f0f..2acc1c5 100644
--- a/server/app/src/test/resources/pop3server.xml
+++ b/server/app/src/test/resources/pop3server.xml
@@ -25,32 +25,32 @@
 
 <pop3servers>
 
-	<!-- The POP3 server is enabled by default -->
-	<!-- Disabling blocks will stop them from listening, -->
-	<!-- but does not free as many resources as removing them would -->
-	<pop3server enabled="true">
-	
-	   <jmxName>pop3server</jmxName>
-	
-	   <!-- Configure this to bind to a specific inetaddress -->
-	   <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS -->
-	   <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
-	   <bind>0.0.0.0:1100</bind>
-	
-	   <connectionBacklog>200</connectionBacklog>
-	
-	   <!-- Set to true to support STARTTLS or SSL for the Socket.
-	         To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-	    -->
-	   <tls socketTLS="false" startTLS="false">
-	       <!-- To create a new keystore execute:
-	             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-	        -->
-	       <keystore>file://conf/keystore</keystore>
-	       <secret>yoursecret</secret>
-	       <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-	   </tls>
-	      
+    <!-- The POP3 server is enabled by default -->
+    <!-- Disabling blocks will stop them from listening, -->
+    <!-- but does not free as many resources as removing them would -->
+    <pop3server enabled="true">
+
+       <jmxName>pop3server</jmxName>
+
+       <!-- Configure this to bind to a specific inetaddress -->
+       <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS -->
+       <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
+       <bind>0.0.0.0:1100</bind>
+
+       <connectionBacklog>200</connectionBacklog>
+
+       <!-- Set to true to support STARTTLS or SSL for the Socket.
+             To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+        -->
+       <tls socketTLS="false" startTLS="false">
+           <!-- To create a new keystore execute:
+                 keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+            -->
+           <keystore>file://conf/keystore</keystore>
+           <secret>yoursecret</secret>
+           <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+       </tls>
+
        <!-- This is the name used by the server to identify itself in the POP3 -->
        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
        <!-- own host name and use that in the protocol.  If discovery fails, -->
@@ -73,7 +73,7 @@
            <!-- know what you are doing -->
            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
        </handlerchain>
-	    
-	</pop3server>
-	
+
+    </pop3server>
+
 </pop3servers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/container/cli-integration/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/src/test/resources/imapserver.xml b/server/container/cli-integration/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/server/container/cli-integration/src/test/resources/imapserver.xml
+++ b/server/container/cli-integration/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/container/guice/cassandra-guice/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/resources/imapserver.xml b/server/container/guice/cassandra-guice/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/server/container/guice/cassandra-guice/src/test/resources/imapserver.xml
+++ b/server/container/guice/cassandra-guice/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/container/guice/jpa-guice/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/test/resources/imapserver.xml b/server/container/guice/jpa-guice/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/server/container/guice/jpa-guice/src/test/resources/imapserver.xml
+++ b/server/container/guice/jpa-guice/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/container/guice/memory-guice/sample-configuration/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/imapserver.xml b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
index c03b978..96387f5 100644
--- a/server/container/guice/memory-guice/sample-configuration/imapserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="true">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="true">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="true" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="true" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/container/guice/memory-guice/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/resources/imapserver.xml b/server/container/guice/memory-guice/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/server/container/guice/memory-guice/src/test/resources/imapserver.xml
+++ b/server/container/guice/memory-guice/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/data/data-jcr/src/test/resources/test-repository.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/test/resources/test-repository.xml b/server/data/data-jcr/src/test/resources/test-repository.xml
index 8258dcd..592cca8 100644
--- a/server/data/data-jcr/src/test/resources/test-repository.xml
+++ b/server/data/data-jcr/src/test/resources/test-repository.xml
@@ -53,9 +53,9 @@
             persistence manager of the workspace:
             class: FQN of class implementing the PersistenceManager interface
         -->
-		<PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
-			<param name="persistent" value="false"/>
-		</PersistenceManager>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+            <param name="persistent" value="false"/>
+        </PersistenceManager>
         
         <SearchIndex class='org.apache.jackrabbit.core.query.lucene.SearchIndex'>
             <param name='path' value='${wsp.home}/index'/>
@@ -73,9 +73,9 @@
         <FileSystem class='org.apache.jackrabbit.core.fs.mem.MemoryFileSystem'>
         </FileSystem>
 
-		<PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
-			<param name="persistent" value="false"/>
-		</PersistenceManager>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+            <param name="persistent" value="false"/>
+        </PersistenceManager>
         
     </Versioning>
     <!--

http://git-wip-us.apache.org/repos/asf/james-project/blob/f643a258/server/mailet/integration-testing/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/imapserver.xml b/server/mailet/integration-testing/src/test/resources/imapserver.xml
index ff478a9..28ce44c 100644
--- a/server/mailet/integration-testing/src/test/resources/imapserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/imapserver.xml
@@ -21,34 +21,34 @@ under the License.
 
 
 <imapservers>
-	<imapserver enabled="true">
-		<jmxName>imapserver</jmxName>
-		<bind>0.0.0.0:1143</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+    <imapserver enabled="true">
+        <jmxName>imapserver</jmxName>
+        <bind>0.0.0.0:1143</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
               -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
-	<imapserver enabled="true">
-		<jmxName>imapserver-ssl</jmxName>
-		<bind>0.0.0.0:1993</bind>
-		<connectionBacklog>200</connectionBacklog>
-		<tls socketTLS="false" startTLS="false">
-			<!-- To create a new keystore execute:
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
+    <imapserver enabled="true">
+        <jmxName>imapserver-ssl</jmxName>
+        <bind>0.0.0.0:1993</bind>
+        <connectionBacklog>200</connectionBacklog>
+        <tls socketTLS="false" startTLS="false">
+            <!-- To create a new keystore execute:
               keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
              -->
-			<keystore>file://conf/keystore</keystore>
-			<secret>james72laBalle</secret>
-			<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-		</tls>
-		<connectionLimit>0</connectionLimit>
-		<connectionLimitPerIP>0</connectionLimitPerIP>
-	</imapserver>
+            <keystore>file://conf/keystore</keystore>
+            <secret>james72laBalle</secret>
+            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+        </tls>
+        <connectionLimit>0</connectionLimit>
+        <connectionLimitPerIP>0</connectionLimitPerIP>
+    </imapserver>
 </imapservers>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org