http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/archive/install.html
----------------------------------------------------------------------
diff --git a/content/server/archive/install.html 
b/content/server/archive/install.html
index 9d95c59..6f3fe5f 100644
--- a/content/server/archive/install.html
+++ b/content/server/archive/install.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -38,7 +38,7 @@
     <script type="text/javascript" 
src="../../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../../css/print.css" type="text/css" 
media="print" />
       <meta name="author" content="Serge Knystautas" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -78,7 +78,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../../index.html" 
title="Home">Home</a>
             |
@@ -109,7 +109,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
  <li class="collapsed">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
                           <a href="../../server/index.html" 
title="Server">Server</a>
                   </li>
                                                                                
                                                                                
                                                                                
                           <li class="collapsed">

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/archive/usingJDBC_v2.0.html
----------------------------------------------------------------------
diff --git a/content/server/archive/usingJDBC_v2.0.html 
b/content/server/archive/usingJDBC_v2.0.html
index aa9f0a2..ed31057 100644
--- a/content/server/archive/usingJDBC_v2.0.html
+++ b/content/server/archive/usingJDBC_v2.0.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -38,7 +38,7 @@
     <script type="text/javascript" 
src="../../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../../css/print.css" type="text/css" 
media="print" />
       <meta name="author" content="Charles Benett" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -78,7 +78,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../../index.html" 
title="Home">Home</a>
             |
@@ -109,7 +109,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
  <li class="collapsed">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
                           <a href="../../server/index.html" 
title="Server">Server</a>
                   </li>
                                                                                
                                                                                
                                                                                
                           <li class="collapsed">

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/archive/usingLDAP_v1_2.html
----------------------------------------------------------------------
diff --git a/content/server/archive/usingLDAP_v1_2.html 
b/content/server/archive/usingLDAP_v1_2.html
index d53c7f0..5a9fe37 100644
--- a/content/server/archive/usingLDAP_v1_2.html
+++ b/content/server/archive/usingLDAP_v1_2.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -38,7 +38,7 @@
     <script type="text/javascript" 
src="../../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../../css/print.css" type="text/css" 
media="print" />
       <meta name="author" content="Charles Benett" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -78,7 +78,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../../index.html" 
title="Home">Home</a>
             |
@@ -109,7 +109,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
  <li class="collapsed">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
                           <a href="../../server/index.html" 
title="Server">Server</a>
                   </li>
                                                                                
                                                                                
                                                                                
                           <li class="collapsed">

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/archive/usingTLS_v1_2.html
----------------------------------------------------------------------
diff --git a/content/server/archive/usingTLS_v1_2.html 
b/content/server/archive/usingTLS_v1_2.html
index b2c3175..f46d9d6 100644
--- a/content/server/archive/usingTLS_v1_2.html
+++ b/content/server/archive/usingTLS_v1_2.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -38,7 +38,7 @@
     <script type="text/javascript" 
src="../../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../../css/print.css" type="text/css" 
media="print" />
       <meta name="author" content="Charles Benett" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -78,7 +78,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../../index.html" 
title="Home">Home</a>
             |
@@ -109,7 +109,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
  <li class="collapsed">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
<li class="collapsed">
                           <a href="../../server/index.html" 
title="Server">Server</a>
                   </li>
                                                                                
                                                                                
                                                                                
                           <li class="collapsed">

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-antispam.html
----------------------------------------------------------------------
diff --git a/content/server/config-antispam.html 
b/content/server/config-antispam.html
index 42544f9..a816988 100644
--- a/content/server/config-antispam.html
+++ b/content/server/config-antispam.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -37,7 +37,7 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,7 +108,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
            <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
                     <ul>
                       <li class="none">
@@ -117,7 +117,7 @@
                       <li class="none">
                           <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
             </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                    <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                  <li class="expanded">
                           <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                     <ul>
                                                                                
                                                                                
                     <li class="collapsed">
@@ -126,10 +126,10 @@
                       <li class="none">
                           <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
             </li>
-                      <li class="none">
+                                                                               
                             <li class="collapsed">
                           <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
-            </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                           <li class="expanded">
                           <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
@@ -187,6 +187,9 @@
                           <a href="../server/config-cassandra.html" 
title="Cassandra">Cassandra</a>
             </li>
                       <li class="none">
+                          <a href="../server/config-spring-jpa-postgres.html" 
title="Spring JPA Postgres">Spring JPA Postgres</a>
+            </li>
+                      <li class="none">
                           <a href="../server/config-quota.html" 
title="Quota">Quota</a>
             </li>
                       <li class="none">
@@ -310,9 +313,9 @@
     
 <ul>
        
-<li>SMTP Hooks; see <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver-template.xml";>examples</a>.</li>
+<li>SMTP Hooks; see <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>examples</a>.</li>
        
-<li>Mailets; see <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer-template.xml";>examples</a>.</li>
+<li>Mailets; see <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer.xml";>examples</a>.</li>
     </ul>
 
     

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-cassandra.html
----------------------------------------------------------------------
diff --git a/content/server/config-cassandra.html 
b/content/server/config-cassandra.html
index 0c6f61e..4c728ef 100644
--- a/content/server/config-cassandra.html
+++ b/content/server/config-cassandra.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -37,7 +37,7 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,7 +108,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
            <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
                     <ul>
                       <li class="none">
@@ -117,7 +117,7 @@
                       <li class="none">
                           <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
             </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                    <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                  <li class="expanded">
                           <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                     <ul>
                                                                                
                                                                                
                     <li class="collapsed">
@@ -126,10 +126,10 @@
                       <li class="none">
                           <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
             </li>
-                      <li class="none">
+                                                                               
                             <li class="collapsed">
                           <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
-            </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                           <li class="expanded">
                           <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
@@ -187,6 +187,9 @@
             <strong>Cassandra</strong>
           </li>
                       <li class="none">
+                          <a href="../server/config-spring-jpa-postgres.html" 
title="Spring JPA Postgres">Spring JPA Postgres</a>
+            </li>
+                      <li class="none">
                           <a href="../server/config-quota.html" 
title="Quota">Quota</a>
             </li>
                       <li class="none">
@@ -304,10 +307,10 @@
   <div class="section">
 <h2>Cassandra Configuration<a name="Cassandra_Configuration"></a></h2>
 
-    Note: Cassandra is only available with Guice distributions 
(cassandra-guice and cassandra-guice-ldap).
+    Note: Cassandra is only available with Guice wiring (cassandra-guice and 
cassandra-guice-ldap).
 
     
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra-template.properties</a>
 to get some examples and hints.</p>
+<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra.properties</a>
 to get some examples and hints.</p>
 
       
 <dl>
@@ -398,6 +401,62 @@
 <dd>Optional.
           If specified defines the Cassandra <a class="externalLink" 
href="http://docs.datastax.com/en/developer/java-driver/2.1/manual/pooling/";>Specify
 heartbeat timeout</a></dd>
 
+        
+<dt><b>mailbox.max.retry.acl</b></dt>
+        
+<dd>Optional. Defaults to 1000.<br /> Controls the number of retries upon 
Cassandra ACL updates.</dd>
+        
+<dt><b>mailbox.max.retry.modseq</b></dt>
+        
+<dd>Optional. Defaults to 100000.<br /> Controls the number of retries upon 
Cassandra ModSeq generation.</dd>
+        
+<dt><b>mailbox.max.retry.uid</b></dt>
+        
+<dd>Optional. Defaults to 100000.<br /> Controls the number of retries upon 
Cassandra Uid generation.</dd>
+        
+<dt><b>mailbox.max.retry.message.flags.update</b></dt>
+        
+<dd>Optional. Defaults to 1000.<br /> Controls the number of retries upon 
Cassandra flags update, in MessageMapper.</dd>
+        
+<dt><b>mailbox.max.retry.message.id.flags.update</b></dt>
+        
+<dd>Optional. Defaults to 1000.<br /> Controls the number of retries upon 
Cassandra flags update, in MessageIdMapper.</dd>
+        
+<dt><b>fetch.advance.row.count</b></dt>
+        
+<dd>Optional. Defaults to 1000.<br /> Controls the number of remaining rows we 
should wait before prefetch when paging.</dd>
+        
+<dt><b>chunk.size.flags.update</b></dt>
+        
+<dd>Optional. Defaults to 20.<br /> Controls the number of messages flags 
updates to be performed concurently by MessageMapper.</dd>
+        
+<dt><b>chunk.size.message.read</b></dt>
+        
+<dd>Optional. Defaults to 100.<br /> Controls the number of messages to be 
retrieved in parallel.</dd>
+        
+<dt><b>chunk.size.expunge</b></dt>
+        
+<dd>Optional. Defaults to 100.<br /> Controls the number of messages to be 
expunged in parallel.</dd>
+        
+<dt><b>mailbox.blob.part.size</b></dt>
+        
+<dd>Optional. Defaults to 102400 (100KB).<br /> Controls the size of blob 
parts used to store messages.</dd>
+        
+<dt><b>migration.v1.v2.on.the.fly</b></dt>
+        
+<dd>Optional. Defaults to false.<br /> Controls wether v1 to v2 migration 
should be run on the fly.</dd>
+        
+<dt><b>migration.v1.v2.thread.count</b></dt>
+        
+<dd>Optional. Defaults to 2.<br /> Controls the number of threads used to 
asynchronously migrate from v1 to v2.</dd>
+        
+<dt><b>migration.v1.v2.queue.length</b></dt>
+        
+<dd>Optional. Defaults to 1000.<br /> Controls the queue size of v1 to v2 
migration task. Drops when full.</dd>
+        
+<dt><b>migration.v1.read.fetch.size</b></dt>
+        
+<dd>Optional. Defaults to 10.<br /> Controls the fetch size of the request to 
retrieve all messages stored in V1 during the migration process.</dd>
       </dl>
 
 
@@ -406,6 +465,29 @@
 
   </div>
 
+  
+<div class="section">
+<h2>Cassandra migration process<a name="Cassandra_migration_process"></a></h2>
+    
+<p>Cassandra upgrades implies the creation of a new table. Thus restarting 
James is needed, as new tables are created on restart.</p>
+
+    
+<p>Once done, we ship code that tries to read from new tables, and if not 
possible backs up to old tables. You can thus safely run
+    without running additional migrations.</p>
+
+    
+<p>On the fly migration can be enabled. However, one might want to force the 
migration in a controlled fashion, and update
+    automatically current schema version used (assess in the database old 
versions is no more used, as the corresponding tables are empty).
+    Note that this process is safe: we ensure the service is not running 
concurrently on this James instance, that it does not bump
+    version upon partial failures, that race condition in version upgrades 
will be idempotent, etc...</p>
+
+    
+<p>These schema updates can be triggered by <a 
href="manage-webadmin.html">webadmin</a> using the Cassandra backend.</p>
+
+    
+<p>Note that currently the progress can be tracked by logs.</p>
+  </div>
+
 
 
 

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-dnsservice.html
----------------------------------------------------------------------
diff --git a/content/server/config-dnsservice.html 
b/content/server/config-dnsservice.html
index 64d3117..a6742aa 100644
--- a/content/server/config-dnsservice.html
+++ b/content/server/config-dnsservice.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -37,7 +37,7 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,7 +108,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
            <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
                     <ul>
                       <li class="none">
@@ -117,7 +117,7 @@
                       <li class="none">
                           <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
             </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                    <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                  <li class="expanded">
                           <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                     <ul>
                                                                                
                                                                                
                     <li class="collapsed">
@@ -126,10 +126,10 @@
                       <li class="none">
                           <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
             </li>
-                      <li class="none">
+                                                                               
                             <li class="collapsed">
                           <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
-            </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                           <li class="expanded">
                           <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
@@ -187,6 +187,9 @@
                           <a href="../server/config-cassandra.html" 
title="Cassandra">Cassandra</a>
             </li>
                       <li class="none">
+                          <a href="../server/config-spring-jpa-postgres.html" 
title="Spring JPA Postgres">Spring JPA Postgres</a>
+            </li>
+                      <li class="none">
                           <a href="../server/config-quota.html" 
title="Quota">Quota</a>
             </li>
                       <li class="none">
@@ -309,7 +312,7 @@
 <h3>dnsservice.xml<a name="dnsservice.xml"></a></h3>
 
       
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice-template.xml";>dnsservice-template.xml</a>
 in GIT to get some examples and hints.</p>
+<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice.xml";>dnsservice.xml</a>
 in GIT to get some examples and hints.</p>
 
       
 <p>Specifies DNS Server information for use by various components inside 
Apache James Server.</p>

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-domainlist.html
----------------------------------------------------------------------
diff --git a/content/server/config-domainlist.html 
b/content/server/config-domainlist.html
index a5934cd..6221b7f 100644
--- a/content/server/config-domainlist.html
+++ b/content/server/config-domainlist.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -37,7 +37,7 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,7 +108,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
            <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
                     <ul>
                       <li class="none">
@@ -117,7 +117,7 @@
                       <li class="none">
                           <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
             </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                    <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                  <li class="expanded">
                           <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                     <ul>
                                                                                
                                                                                
                     <li class="collapsed">
@@ -126,10 +126,10 @@
                       <li class="none">
                           <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
             </li>
-                      <li class="none">
+                                                                               
                             <li class="collapsed">
                           <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
-            </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                           <li class="expanded">
                           <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
@@ -187,6 +187,9 @@
                           <a href="../server/config-cassandra.html" 
title="Cassandra">Cassandra</a>
             </li>
                       <li class="none">
+                          <a href="../server/config-spring-jpa-postgres.html" 
title="Spring JPA Postgres">Spring JPA Postgres</a>
+            </li>
+                      <li class="none">
                           <a href="../server/config-quota.html" 
title="Quota">Quota</a>
             </li>
                       <li class="none">
@@ -305,7 +308,7 @@
 <h2>DomainList Configuration<a name="DomainList_Configuration"></a></h2>
 
     
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist-template.xml";>domainlist-template.xml</a>
 in GIT to get some examples and hints.</p>
+<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist.xml";>domainlist.xml</a>
 in GIT to get some examples and hints.</p>
     
       
 <p>This configuration block is defined by the <b>domainlist</b> tag.</p>
@@ -320,7 +323,7 @@
         
 <dd>Domainnames identifies the DNS namespace served by this instance of James. 
 These domainnames are used for both matcher/mailet processing and SMTP auth 
-to determine when a mail is intended for local delivery - Only applicable for 
XMLDomainList.</dd>
+to determine when a mail is intended for local delivery - Only applicable for 
XMLDomainList. The entries mentionned here will be created upon start.</dd>
         
 <dt><b>autodetect</b></dt>
         
@@ -336,9 +339,12 @@ The automatic IP detection is to support RFC 2821, Sec 
4.1.3, address literals.<
 <dt><b>defaultDomain</b></dt>
         
 <dd>Set the default domain which will be used if an email is send to a 
recipient without a domain part.
-            If not defaultdomain is set the first domain of the DomainList get 
used.</dd>
+            If not defaultdomain is set the first domain of the DomainList get 
used. If the default is not yet contained by the Domain List, the domain will 
be created upon start.</dd>
       </dl>
 
+      
+<p>Please note that you can expose the <b>DOMAIN</b> variable to create a 
domain upon start without requiring further configuration.</p>
+
 
 <p>To override autodetected domainames names simply add explicit domainname 
elements.
 In most cases this will be necessary. By default, the domainname 'localhost' 
is specified. This can be removed, if required.</p>

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-elasticsearch.html
----------------------------------------------------------------------
diff --git a/content/server/config-elasticsearch.html 
b/content/server/config-elasticsearch.html
index f8ea835..7794f0f 100644
--- a/content/server/config-elasticsearch.html
+++ b/content/server/config-elasticsearch.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -37,7 +37,7 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,7 +108,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
            <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
                     <ul>
                       <li class="none">
@@ -117,7 +117,7 @@
                       <li class="none">
                           <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
             </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                    <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                  <li class="expanded">
                           <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                     <ul>
                                                                                
                                                                                
                     <li class="collapsed">
@@ -126,10 +126,10 @@
                       <li class="none">
                           <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
             </li>
-                      <li class="none">
+                                                                               
                             <li class="collapsed">
                           <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
-            </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                           <li class="expanded">
                           <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
@@ -187,6 +187,9 @@
                           <a href="../server/config-cassandra.html" 
title="Cassandra">Cassandra</a>
             </li>
                       <li class="none">
+                          <a href="../server/config-spring-jpa-postgres.html" 
title="Spring JPA Postgres">Spring JPA Postgres</a>
+            </li>
+                      <li class="none">
                           <a href="../server/config-quota.html" 
title="Quota">Quota</a>
             </li>
                       <li class="none">
@@ -304,10 +307,10 @@
   <div class="section">
 <h2>ElasticSearch Configuration<a name="ElasticSearch_Configuration"></a></h2>
 
-      This configuration applies only to Guice packaging.
+      This configuration applies only to Guice wiring.
 
     
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch-template.properties</a>
 to get some examples and hints.</p>
+<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch.properties</a>
 to get some examples and hints.</p>
 
       Connection to a cluster :
 

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-events.html
----------------------------------------------------------------------
diff --git a/content/server/config-events.html 
b/content/server/config-events.html
index a1256c4..3cac977 100644
--- a/content/server/config-events.html
+++ b/content/server/config-events.html
@@ -18,7 +18,7 @@
   under the License.    
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at 2017-06-15 -->
+<!-- Generated by Apache Maven Doxia at 2017-08-09 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -37,7 +37,7 @@
     <script type="text/javascript" 
src="../js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
     <script type="text/javascript" 
src="../js/fancybox/jquery.fancybox-1.3.4.js"></script>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170615" />
+    <meta name="Date-Revision-yyyymmdd" content="20170809" />
     <meta http-equiv="Content-Language" content="en" />
                                                     
 <link rel="meta" href="http://james.apache.org//doap_james-project.rdf"; 
title="DOAP" type="application/rdf+xml"/>
@@ -77,7 +77,7 @@
             
                 
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2017-06-15</span>
+        <span id="publishDate">Last Published: 2017-08-09</span>
                       </div>
             <div class="xright">                    <a href="../index.html" 
title="Home">Home</a>
             |
@@ -108,7 +108,7 @@
                                                                                
                                                                                
                                                                       <li 
class="collapsed">
                           <a href="../documentation.html" title="About 
James">About James</a>
                   </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
            <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                                                
                                                                                
                                                                                
          <li class="expanded">
                           <a href="../server/index.html" 
title="Server">Server</a>
                     <ul>
                       <li class="none">
@@ -117,7 +117,7 @@
                       <li class="none">
                           <a href="../server/objectives.html" 
title="Objectives">Objectives</a>
             </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                    <li class="expanded">
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                      
                                                                                
                                                  <li class="expanded">
                           <a href="../server/quick-start.html" title="User 
Manual">User Manual</a>
                     <ul>
                                                                                
                                                                                
                     <li class="collapsed">
@@ -126,10 +126,10 @@
                       <li class="none">
                           <a href="../server/packaging.html" title="2. 
Packaging">2. Packaging</a>
             </li>
-                      <li class="none">
+                                                                               
                             <li class="collapsed">
                           <a href="../server/install.html" title="3. Install 
James">3. Install James</a>
-            </li>
-                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                         <li class="expanded">
+                  </li>
+                                                                               
                                                                                
                                                                                
                                                                                
                                                                                
                                           <li class="expanded">
                           <a href="../server/config.html" title="4. Configure 
James">4. Configure James</a>
                     <ul>
                       <li class="none">
@@ -187,6 +187,9 @@
                           <a href="../server/config-cassandra.html" 
title="Cassandra">Cassandra</a>
             </li>
                       <li class="none">
+                          <a href="../server/config-spring-jpa-postgres.html" 
title="Spring JPA Postgres">Spring JPA Postgres</a>
+            </li>
+                      <li class="none">
                           <a href="../server/config-quota.html" 
title="Quota">Quota</a>
             </li>
                       <li class="none">
@@ -304,10 +307,10 @@
         <div class="section">
 <h2>Events System Configuration<a name="Events_System_Configuration"></a></h2>
 
-            This configuration applies only to Spring packaging.
+            This configuration applies only to Spring wiring.
 
             
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events-template.xml";>events-template.xml</a>
 in GIT to get some examples and hints.</p>
+<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events.xml";>events.xml</a>
 in GIT to get some examples and hints.</p>
 
             
 <p>Use this configuration to define the type of Event System you want.</p>


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

Reply via email to