http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-fetchmail.html
----------------------------------------------------------------------
diff --git a/content/server/config-fetchmail.html 
b/content/server/config-fetchmail.html
index f5dcbc4..37f9608 100644
--- a/content/server/config-fetchmail.html
+++ b/content/server/config-fetchmail.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>Fetchmail Configuration<a name="Fetchmail_Configuration"></a></h2>
 
-    This configuration file requires Spring packaging.
+    This configuration file requires Spring wiring.
 
     
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/fetchmail-template.xml";>fetchmail-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/fetchmail.xml";>fetchmail.xml</a>
 in GIT to get some examples and hints.</p>
 
     
 <p>Fetchmail acts as a gateway between an external message store such as an 
IMAP

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-guice.html
----------------------------------------------------------------------
diff --git a/content/server/config-guice.html b/content/server/config-guice.html
index c0a95a3..b6169fb 100644
--- a/content/server/config-guice.html
+++ b/content/server/config-guice.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>Guice configure Apache James Server<a 
name="Guice_configure_Apache_James_Server"></a></h2>
 
     
-<p>Such configuration only applies to Guice packaging.</p>
+<p>Such configuration only applies to Guice wiring.</p>
 
     
 <p>You are encouraged to contribute by developing a new backend guice module.
@@ -336,7 +339,7 @@
       
 <tr class="b">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra-template.properties</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra.properties</a></td>
         
 <td><a href="config-cassandra.html">Cassandra Configuration</a></td>
         
@@ -354,7 +357,7 @@
       
 <tr class="b">
         
-<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch-template.properties</a></td>
+<td><a class="externalLink" 
href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch.properties</a></td>
         
 <td><a href="config-elasticsearch.html">ElasticSearch Configuration</a></td>
         

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-imap4.html
----------------------------------------------------------------------
diff --git a/content/server/config-imap4.html b/content/server/config-imap4.html
index 6f30fb8..ce513db 100644
--- a/content/server/config-imap4.html
+++ b/content/server/config-imap4.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>IMAP4 Configuration<a name="IMAP4_Configuration"></a></h2>
 
       
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/imapserver-template.xml";>imapserver-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/imapserver.xml";>imapserver.xml</a>
 in GIT to get some examples and hints.</p>
 
     
 <p>The IMAP4 service is controlled by a configuration block in the 
imap4server.xml.

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-mailbox.html
----------------------------------------------------------------------
diff --git a/content/server/config-mailbox.html 
b/content/server/config-mailbox.html
index ffa5676..3464406 100644
--- a/content/server/config-mailbox.html
+++ b/content/server/config-mailbox.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>Mailbox Configuration<a name="Mailbox_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/mailbox-template.xml";>mailbox-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/mailbox.xml";>mailbox.xml</a>
 in GIT to get some examples and hints.</p>
     
     
 <p>Use this configuration to define the type of mailbox storage used to 
persist the user's mails.</p>

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-mailetcontainer.html
----------------------------------------------------------------------
diff --git a/content/server/config-mailetcontainer.html 
b/content/server/config-mailetcontainer.html
index e5c4039..d6910ec 100644
--- a/content/server/config-mailetcontainer.html
+++ b/content/server/config-mailetcontainer.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">
@@ -314,7 +317,7 @@
 <p>Apache James Server includes a number of pre-packaged <a 
href="dev-provided-mailets.html">Mailets and Matchers</a>.</p>
 
       
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer-template.xml";>mailetcontainer-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/mailetcontainer.xml";>mailetcontainer.xml</a>
 in GIT to get some examples and hints.</p>
 
       
 <p>This configuration block is defined by the <b>mailserver</b> tag.  All 
administrators 

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-mailrepositorystore.html
----------------------------------------------------------------------
diff --git a/content/server/config-mailrepositorystore.html 
b/content/server/config-mailrepositorystore.html
index f4bf220..0f0984d 100644
--- a/content/server/config-mailrepositorystore.html
+++ b/content/server/config-mailrepositorystore.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">
@@ -312,7 +315,7 @@
 <p>Read <a href="feature-persistence.html">documentation about persistence</a> 
for a description of the Mail Repository Store functionality.</p>
     
       
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailrepositorystore-template.xml";>mailrepositorystore-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/mailrepositorystore.xml";>mailrepositorystore.xml</a>
 in GIT to get some examples and hints.</p>
 
       
 <p>Mail Repository Stores are distinguished by where they store data.  There 
are five types of 

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-pop3.html
----------------------------------------------------------------------
diff --git a/content/server/config-pop3.html b/content/server/config-pop3.html
index e8ed95b..77f0ed4 100644
--- a/content/server/config-pop3.html
+++ b/content/server/config-pop3.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>POP3 Configuration<a name="POP3_Configuration"></a></h2>
   
     
-<p>Consult <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/pop3server-template.xml";>pop3server-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/pop3server.xml";>pop3server.xml</a>
 in GIT to get some examples and hints.</p>
 
     
 <p>The POP3 service is controlled by a configuration block in the 
pop3server.xml.

http://git-wip-us.apache.org/repos/asf/james-site/blob/0e4c47ea/content/server/config-quota.html
----------------------------------------------------------------------
diff --git a/content/server/config-quota.html b/content/server/config-quota.html
index 2b560fb..78d8fb0 100644
--- a/content/server/config-quota.html
+++ b/content/server/config-quota.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">
             <strong>Quota</strong>
           </li>
                       <li class="none">
@@ -304,10 +307,10 @@
   <div class="section">
 <h2>Quota Configuration<a name="Quota_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/quota-template.xml";>quota-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/quota.xml";>quota.xml</a>
 in GIT to get some examples and hints.</p>
     
     
 <p>Use this configuration to define the type of quota storage used to persist 
the quotas.</p>
@@ -356,7 +359,7 @@
 
     
 <p>
-      To choose the implementation you want for the given components you want 
simply have a look to the <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota-template.xml";>quota-template.xml</a>
 file.
+      To choose the implementation you want for the given components you want 
simply have a look to the <a class="externalLink" 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota.xml";>quota.xml</a>
 file.
     </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