Author: eric
Date: Tue Apr 17 13:06:09 2012
New Revision: 1327082
URL: http://svn.apache.org/viewvc?rev=1327082&view=rev
Log:
Document James 3.0b4, server project (JAMES-1399)
Added:
james/server/trunk/src/site/xdoc/config-system.xml
- copied, changed from r1327023,
james/server/trunk/src/site/xdoc/config-serverwide.xml
Removed:
james/server/trunk/src/site/xdoc/config-serverwide.xml
Modified:
james/server/trunk/src/site/xdoc/config-antispam.xml
james/server/trunk/src/site/xdoc/config-dnsservice.xml
james/server/trunk/src/site/xdoc/config-domainlist.xml
james/server/trunk/src/site/xdoc/config-fetchmail.xml
james/server/trunk/src/site/xdoc/config-imap4.xml
james/server/trunk/src/site/xdoc/config-listmanager.xml
james/server/trunk/src/site/xdoc/config-mailbox.xml
james/server/trunk/src/site/xdoc/config-mailetcontainer.xml
james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml
james/server/trunk/src/site/xdoc/config-pop3.xml
james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml
james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml
james/server/trunk/src/site/xdoc/config-users.xml
james/server/trunk/src/site/xdoc/config.xml
james/server/trunk/src/site/xdoc/install.xml
james/server/trunk/src/site/xdoc/manage-domains.xml
james/server/trunk/src/site/xdoc/monitor-logging.xml
james/server/trunk/src/site/xdoc/quick-start.xml
james/server/trunk/src/site/xdoc/upgrade-2.3.xml
james/server/trunk/src/site/xdoc/upgrade.xml
Modified: james/server/trunk/src/site/xdoc/config-antispam.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-antispam.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-antispam.xml (original)
+++ james/server/trunk/src/site/xdoc/config-antispam.xml Tue Apr 17 13:06:09
2012
@@ -30,8 +30,8 @@
<p>Apache James Server Anti-Spam system can be configured via two main
different mechanisms:</p>
<ul>
- <li>SMTP Hooks; see <a
href="https://svn.apache.org/repos/asf/james/app/tag/3.0-beta4/src/main/resources/smtpserver-template.conf";>examples</a>.</li>
- <li>Mailets; see <a
href="https://svn.apache.org/repos/asf/james/app/tag/3.0-beta4/src/main/resources/mailetcontainer-template.conf";>examples</a>.</li>
+ <li>SMTP Hooks; see <a
href="https://svn.apache.org/repos/asf/james/app/tag/apache-james-3.0-beta4/src/main/resources/smtpserver-template.conf";>examples</a>.</li>
+ <li>Mailets; see <a
href="https://svn.apache.org/repos/asf/james/app/tag/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.conf";>examples</a>.</li>
</ul>
<subsection name="AntiSpam SMTP Hooks">
Modified: james/server/trunk/src/site/xdoc/config-dnsservice.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-dnsservice.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-dnsservice.xml (original)
+++ james/server/trunk/src/site/xdoc/config-dnsservice.xml Tue Apr 17 13:06:09
2012
@@ -29,7 +29,7 @@
<subsection name="dnsservice.conf">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/dnsservice-template.conf";>dnsservice-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/dnsservice-template.conf";>dnsservice-template.conf</a>
in SVN to get some examples and hints.</p>
<p>Specifies DNS Server information for use by various components inside
Apache James Server.</p>
Modified: james/server/trunk/src/site/xdoc/config-domainlist.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-domainlist.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-domainlist.xml (original)
+++ james/server/trunk/src/site/xdoc/config-domainlist.xml Tue Apr 17 13:06:09
2012
@@ -27,7 +27,7 @@
<section name="DomainList Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/domainlist-template.conf";>domainlist-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/domainlist-template.conf";>domainlist-template.conf</a>
in SVN to get some examples and hints.</p>
<p>This configuration block is defined by the
<strong>domainlist</strong> tag.</p>
Modified: james/server/trunk/src/site/xdoc/config-fetchmail.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-fetchmail.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-fetchmail.xml (original)
+++ james/server/trunk/src/site/xdoc/config-fetchmail.xml Tue Apr 17 13:06:09
2012
@@ -27,7 +27,7 @@
<section name="Fetchmail Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/fetchmail-template.conf";>fetchmail-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/fetchmail-template.conf";>fetchmail-template.conf</a>
in SVN to get some examples and hints.</p>
<p>Fetchmail acts as a gateway between an external message store such as
an IMAP
or POP3 server and James. Mail is fetched from the external message store
and
Modified: james/server/trunk/src/site/xdoc/config-imap4.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-imap4.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-imap4.xml (original)
+++ james/server/trunk/src/site/xdoc/config-imap4.xml Tue Apr 17 13:06:09 2012
@@ -27,7 +27,7 @@
<section name="IMAP4 Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/imapserver-template.conf";>imapserver-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/imapserver-template.conf";>imapserver-template.conf</a>
in SVN to get some examples and hints.</p>
<p>The IMAP4 service is controlled by a configuration block in the
imap4server.xml.
The imap4server tag defines the boundaries of the configuration block.
It encloses
Modified: james/server/trunk/src/site/xdoc/config-listmanager.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-listmanager.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-listmanager.xml (original)
+++ james/server/trunk/src/site/xdoc/config-listmanager.xml Tue Apr 17 13:06:09
2012
@@ -40,7 +40,7 @@
<subsection>
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/james-listmanager-template.conf";>james-listmanager.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/james-listmanager-template.conf";>james-listmanager.conf</a>
in SVN to get some examples and hints.</p>
<p>One of the frequent questions on the James-User Mailing List is how
to create a mailing list. This document explains one way of using the
@@ -148,7 +148,7 @@
<section name="miResources.xml">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/miResources.xml";>miResources.xml</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/miResources.xml";>miResources.xml</a>
in SVN to get some examples and hints.</p>
</section>
Modified: james/server/trunk/src/site/xdoc/config-mailbox.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-mailbox.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailbox.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailbox.xml Tue Apr 17 13:06:09 2012
@@ -27,7 +27,7 @@
<section name="Mailbox Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/mailbox-template.conf";>mailbox-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailbox-template.conf";>mailbox-template.conf</a>
in SVN 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>
Modified: james/server/trunk/src/site/xdoc/config-mailetcontainer.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-mailetcontainer.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailetcontainer.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailetcontainer.xml Tue Apr 17
13:06:09 2012
@@ -27,7 +27,7 @@
<section name="Mailet Container Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/mailetcontainer-template.conf";>mailetcontainer-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.conf";>mailetcontainer-template.conf</a>
in SVN to get some examples and hints.</p>
<p>Changes between 3.0-M2 and 3.0-beta3:</p>
<ul>
Modified: james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml Tue Apr 17
13:06:09 2012
@@ -31,7 +31,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
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/mailrepositorystore-template.conf";>mailrepositorystore-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailrepositorystore-template.conf";>mailrepositorystore-template.conf</a>
in SVN to get some examples and hints.</p>
<p>Mail Repository Stores are distinguished by where they store data.
There are five types of
storage: File, Database, DBFile, MBox and JCR.</p>
Modified: james/server/trunk/src/site/xdoc/config-pop3.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-pop3.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-pop3.xml (original)
+++ james/server/trunk/src/site/xdoc/config-pop3.xml Tue Apr 17 13:06:09 2012
@@ -27,7 +27,7 @@
<section name="POP3 Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/pop3server-template.conf";>pop3server-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/pop3server-template.conf";>pop3server-template.conf</a>
in SVN to get some examples and hints.</p>
<p>The POP3 service is controlled by a configuration block in the
pop3server.xml.
The pop3server tag defines the boundaries of the configuration block.
It encloses
Modified: james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml (original)
+++ james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml Tue Apr
17 13:06:09 2012
@@ -27,7 +27,7 @@
<section name="Recipient Rewrite Table Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/recipientrewritetable-template.conf";>recipientrewritetable-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/recipientrewritetable-template.conf";>recipientrewritetable-template.conf</a>
in SVN to get some examples and hints.</p>
<subsection name="JPA Recipient Rewrite Table">
Modified: james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml (original)
+++ james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml Tue Apr 17 13:06:09
2012
@@ -37,7 +37,7 @@
<section name="SMTP Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/smtpserver-template.conf";>smtpserver-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/smtpserver-template.conf";>smtpserver-template.conf</a>
in SVN to get some examples and hints.</p>
<p>The SMTP service is controlled by a configuration block in the
smptserver.xml.
The smtpserver tag defines the boundaries of the configuration block.
It encloses
@@ -197,7 +197,7 @@ Correct this.
<section name="LMTP Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/lmtpserver-template.conf";>lmtpserver-template.conf</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/lmtpserver-template.conf";>lmtpserver-template.conf</a>
in SVN to get some examples and hints.</p>
<p>The configuration is the same of for SMTP.</p>
Copied: james/server/trunk/src/site/xdoc/config-system.xml (from r1327023,
james/server/trunk/src/site/xdoc/config-serverwide.xml)
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-system.xml?p2=james/server/trunk/src/site/xdoc/config-system.xml&p1=james/server/trunk/src/site/xdoc/config-serverwide.xml&r1=1327023&r2=1327082&rev=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-serverwide.xml (original)
+++ james/server/trunk/src/site/xdoc/config-system.xml Tue Apr 17 13:06:09 2012
@@ -37,22 +37,22 @@
</subsection>
- <subsection name="spring-beans.xml">
+ <subsection name="spring-server.xml">
<p>In James distribution, the spring files are located under
conf/context folder and splitted into a main
file (james-server-context.xml) which imports 4 other files (1 per
mailbox type): james-mailbox-jcr-context.xml, james-mailbox-jpa-context.xml,
james-mailbox-maildir-context.xml,
james-mailbox-memory-context.xml.</p>
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/spring-beans.xml";>spring-beans.xml</a>
in SVN to
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/META-INF/org/apache/james/spring-server.xml";>spring-server.xml</a>
in SVN to
get some examples and hints.</p>
<p>spring beans files are the place where the Apache James Server wiring
is done. It should be modified only by expert-users.</p>
</subsection>
- <subsection name="database.properties">
+ <subsection name="james-database.properties">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/database.properties";>database.properties</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/james-database-template.properties";>james-database.properties</a>
in SVN to get some examples and hints.</p>
<p>The database connection in database.properties</p>
@@ -95,7 +95,7 @@
<subsection name="META-INF/persistence.xml">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a>
in SVN to get some examples and hints.</p>
<p>The JPA mapping and properties are defined in the in
META-INF/persistence.xml.</p>
@@ -108,7 +108,7 @@
<subsection name="jmx.properties">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/jmx.properties";>jmx.properties</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/jmx-template.properties";>jmx.properties</a>
in SVN to get some examples and hints.</p>
<p>This is used to configure the JMX MBean server via which all
management is achieved (also used by via the james-cli).</p>
@@ -123,7 +123,7 @@
<subsection name="sqlResources.xml">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/sqlResources.xml";>sqlResources.xml</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/sqlResources.xml";>sqlResources.xml</a>
in SVN to get some examples and hints.</p>
<p>This file is deprecated but some mailets... still need it. The
standard way to access database
is JPA, but some functionalities are not yet migrated and still need
the sqlResources.xml resources.</p>
@@ -144,7 +144,7 @@
<subsection name="JCR Repository Configuration">
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/jcr-repository.xml";>jcr-repository.xml</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/jcr-repository-template.xml";>jcr-repository.xml</a>
in SVN to get some examples and hints.</p>
<p>Used to configure the JCR mailbox (if configure in mailbox.xml).</p>
Modified: james/server/trunk/src/site/xdoc/config-users.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-users.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-users.xml (original)
+++ james/server/trunk/src/site/xdoc/config-users.xml Tue Apr 17 13:06:09 2012
@@ -31,7 +31,7 @@
<p>User repositories are required to store James user information and
authentication data</p>
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/usersrepository.xml";>usersrepository.xml</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/usersrepository.xml";>usersrepository.xml</a>
in SVN to get some examples and hints.</p>
</subsection>
Modified: james/server/trunk/src/site/xdoc/config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config.xml (original)
+++ james/server/trunk/src/site/xdoc/config.xml Tue Apr 17 13:06:09 2012
@@ -27,8 +27,12 @@
<section name="Configure Apache James Server">
- <p>All configuration files resides in the ./conf and ./conf/META-INF
folder.
- You can/must configure James for the following:</p>
+ <p>All configuration files resides in the ./conf and ./conf/META-INF
folder.</p>
+
+ <p>We ship with default configuration (embedded in jars) and -template
files
+ you can use to override the default configuration.</p>
+
+ <p>You can/must configure James for the following:</p>
<table>
@@ -39,123 +43,136 @@
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/spring-beans.xml";>spring-beans.xml</a></td>
- <td><a href="config-serverwide.html">Server-wide Configuration</a></td>
- <td></td>
- </tr>
- <tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/database.properties";>database.properties</a></td>
- <td><a href="config-serverwide.html">Server-wide Configuration</a></td>
- <td></td>
- </tr>
- <tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a></td>
- <td><a href="config-serverwide.html">Server-wide Configuration</a></td>
- <td></td>
- </tr>
- <tr>
- <td>
- <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/jmx.properties";>jmx.properties</a><br/>
-<!--
- <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/jmx.access";>jmx.access</a><br/>
- <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/jmx.password";>jmx.password</a><br/>
--->
- </td>
- <td><a href="config-serverwide.html">Server-wide Configuration</a></td>
- <td></td>
- </tr>
- <tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/sqlResources.xml";>sqlResources.xml</a></td>
- <td><a href="config-serverwide.html">Server-wide Configuration</a></td>
- <td>Deprecated</td>
- </tr>
- <tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/jcr-repository.xml";>jcr-repository.xml</a></td>
- <td><a href="config-serverwide.html">Server-wide Configuration</a></td>
- <td></td>
- </tr>
- <tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/domainlist.xml";>domainlist.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/domainlist-template.conf";>domainlist.conf</a></td>
<td><a href="config-domainlist.html">Domain List Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/usersrepository.xml";>usersrepository.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/usersrepository-template.conf";>usersrepository.conf</a></td>
<td><a href="config-users.html">Users Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/recipientrewritetable.xml";>recipientrewritetable.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/recipientrewritetable-template.conf";>recipientrewritetable.conf</a></td>
<td><a href="config-recipientrewritetable.html">Recipient Rewrite
Table Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/mailbox.xml";>mailbox.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailbox-template.conf";>mailbox.conf</a></td>
<td><a href="config-mailbox.html">Mailbox Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/mailrepositorystore.xml";>mailrepositorystore.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailrepositorystore-template.conf";>mailrepositorystore.conf</a></td>
<td><a href="config-mailrepositorystore.html">Mail Repository Stores
Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/dnsservice.xml";>dnsservice.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/dnsservice-template.conf";>dnsservice.conf</a></td>
<td><a href="config-dnsservice.html">DNS Service Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/smtpserver.xml";>smtpserver.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/smtpserver-template.conf";>smtpserver.conf</a></td>
<td><a href="config-smtp-lmtp.html">SMTP Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/lmtpserver-template.conf";>lmtpserver.conf</a></td>
<td><a href="config-smtp-lmtp.html">LMTP Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/pop3server.xml";>pop3server.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/pop3server-template.conf";>pop3server.conf</a></td>
<td><a href="config-pop3.html">POP3 Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/imapserver.xml";>imapserver.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/imapserver-template.conf";>imapserver.conf</a></td>
<td><a href="config-imap4.html">IMAP4 Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/mailetcontainer.xml";>mailetcontainer.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.conf";>mailetcontainer.conf</a></td>
<td><a href="config-mailetcontainer.html">Mailet Container
Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/fetchmail.xml";>fetchmail.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/fetchmail-template.conf";>fetchmail.conf</a></td>
<td><a href="config-fetchmail.html">FetchMail Configuration</a></td>
<td></td>
</tr>
<!--
Removed from trunk for now.
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/james-listmanager.xml";>james-listmanager.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/james-listmanager.xml";>james-listmanager.xml</a></td>
<td><a href="config-listmanager.html">List Manager
Configuration</a></td>
<td></td>
</tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/miResources.xml";>miResources.xml</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/miResources.xml";>miResources.xml</a></td>
<td>SQL Resources for Mailing lists</td>
<td></td>
</tr>
-->
+
+ </table>
+
+ <p>For most advanced system configuration, you can configure James for the
following:</p>
+
+ <table>
+
+ <tr>
+ <th>System Config File Sample</th>
+ <th>System Config Area</th>
+ <th>System Config Comment</th>
+ </tr>
+
+ <tr>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/META-INF/org/apache/james/spring-server.xml";>spring-server.xml</a></td>
+ <td><a href="config-system.html">System Configuration</a></td>
+ <td></td>
+ </tr>
<tr>
- <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/log4j.properties";>log4j.properties</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/james-database-template.properties";>james-database.properties</a></td>
+ <td><a href="config-system.html">System Configuration</a></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/META-INF/persistence-template.xml";>META-INF/persistence.xml</a></td>
+ <td><a href="config-system.html">System Configuration</a></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>
+ <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/jmx-template.properties";>jmx.properties</a><br/>
+<!--
+ <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/jmx.access";>jmx.access</a><br/>
+ <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/jmx.password";>jmx.password</a><br/>
+-->
+ </td>
+ <td><a href="config-system.html">System Configuration</a></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/log4j-template.properties";>log4j.properties</a></td>
<td>See <a href="monitor-logging.html">monitoring with log4j</a>
section.</td>
<td></td>
</tr>
-
+ <tr>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/sqlResources-template.xml";>sqlResources.xml</a></td>
+ <td><a href="config-system.html">System Configuration</a></td>
+ <td>Deprecated</td>
+ </tr>
+ <tr>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/jcr-repository-template.xml";>jcr-repository.xml</a></td>
+ <td><a href="config-system.html">System Configuration</a></td>
+ <td></td>
+ </tr>
+
</table>
- <p>See configurations related to <a href="config-tls.html">TLS</a>,
+ <p>See also more specific configurations related to <a
href="config-tls.html">TLS</a>,
<a href="config-sieve.html">Sieve</a> and
<a href="config-antispam.html">Antispam</a>.</p>
Modified: james/server/trunk/src/site/xdoc/install.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/install.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/install.xml (original)
+++ james/server/trunk/src/site/xdoc/install.xml Tue Apr 17 13:06:09 2012
@@ -109,13 +109,18 @@
</div>
-->
<p>After unpacking the binary, the next step is to adjust the initial
configuration.
- The configuration files reside in the ./conf and ./conf/META-INF
folders.</p>
+ All configuration files are embedded in jars. We ship in the conf foler
template configuration files.
+ </p>
+
+ <p>You can override the default configuration : copy the conf folder any
...-template... you need and update according to your needs.</p>
+
+ <p>Additional system files reside under the./conf/META-INF folder.</p>
<p>The out of the box configuration makes certain assumptions and has some
default
values that are unlikely to be appropriate for real-world servers.
There are a few issues that should be addressed immediately upon
installation:</p>
<ul>
- <li>Postmaster Address - Change according to your need - <a
href="config-serverwide.html">read more</a>.</li>
+ <li>Postmaster Address - Change according to your need - <a
href="config-system.html">read more</a>.</li>
<li>Most UNIX systems require superuser privileges to open sockets
below 1024,
which includes the IANA-standard SMTP (on port 25), POP3 (on port
110) and IMAP4 (on port 143).
These default ports can be changed in the conf file
Modified: james/server/trunk/src/site/xdoc/manage-domains.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/manage-domains.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/manage-domains.xml (original)
+++ james/server/trunk/src/site/xdoc/manage-domains.xml Tue Apr 17 13:06:09 2012
@@ -31,11 +31,11 @@
services. That is, once you've created a POP3 mail and set a password,
that same
is available for authenticated SMTP and NNTP.</p>
- <p>If you have XMLDomainList (default setup), you can only list the
available domains. To add a domain,
- you must add it in the domainlist.xml file.</p>
-
- <p>If you have JPADomainList for example, you can add, delete and list the
domains.</p>
+ <p>If you have JPADomainList (default setup), you can add, delete and list
the domains.</p>
+ <p>If you have XMLDomainList for example, you can only list the available
domains. To add a domain,
+ you must add it in the domainlist.conf file.</p>
+
</section>
<section name="Manage Domains via Cli">
Modified: james/server/trunk/src/site/xdoc/monitor-logging.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitor-logging.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitor-logging.xml (original)
+++ james/server/trunk/src/site/xdoc/monitor-logging.xml Tue Apr 17 13:06:09
2012
@@ -64,7 +64,7 @@ drwxrwxrwx. 7 root root 4096 2010-11-0
-rw-r--r--. 1 root root 71 2010-11-06 09:24 usersrepository.log
</source>
- <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/james-server-3.0-beta4/src/main/resources/log4j.properties";>log4j.properties</a>
in SVN to get some examples and hints.</p>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/log4j.properties";>log4j.properties</a>
in SVN to get some examples and hints.</p>
<p>You can rise the logging level on protocols.</p>
<p>Set log4j.logger.james.smtpserver=DEBUG, SMTPSERVER</p>
Modified: james/server/trunk/src/site/xdoc/quick-start.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/quick-start.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/quick-start.xml (original)
+++ james/server/trunk/src/site/xdoc/quick-start.xml Tue Apr 17 13:06:09 2012
@@ -68,9 +68,9 @@ Step 3: Understand James Features
Persistence
- Mailbox is for users' Inbox, Sent Items, Trash... folders - Mailbox
persistence is configured in spring-beans.xml (by default jpa, you set the
database connection properties in database.properties - can also be
maildir=file, jcr). We think to move this config out-of spring-beans.xml.
-- Mailrepositorystore is for spam, error,... mails, so nothing to do with
users visible mails. Available mailstore persistence are defined in
mailstore.xml. Each has an URL prefix (file, db, dbfile,...) that can be used
in mailetcontainer.xml to define where to store spam,... mails (exemple:
file://var/mail/error/).
-- Domain persistence is configured in domainlist.xml
-- Users persistence is configured in usersrepository.xml
+- Mailrepositorystore is for spam, error,... mails, so nothing to do with
users visible mails. Available mailstore persistence are defined in
mailstore.conf. Each has an URL prefix (file, db, dbfile,...) that can be used
in mailetcontainer.conf to define where to store spam,... mails (exemple:
file://var/mail/error/).
+- Domain persistence is configured in domainlist.conf
+- Users persistence is configured in usersrepository.conf
- All database connection use the database.properties in case of database
access.
Mailet Container -
http://james.apache.org/server/3/feature-mailetcontainer.html
@@ -80,35 +80,36 @@ SMTP Hooks - http://james.apache.org/ser
Step 4: Configure
#################
- * All configuration files reside in the conf folder.
+ * All configuration files are embedded in jars.
+ * We ship in the conf foler template configuration files.
+ * You can override the default configuration :
+ Copy the conf folder any ...-template... you need and update according
to your needs.
database.properties
-META-INF/persistence.xml
-dnsservice.xml
-domainlist.xml
-fetchmail.xml
-imapserver.xml
-james-listmanager.xml
-jcr-repository.xml
-jmx.access
-jmx.password
+META-INF/persistence.conf
+dnsservice.conf
+domainlist.conf
+fetchmail.conf
+imapserver.conf
+james-listmanager.conf
+jcr-repository.conf
jmx.properties
-lmtpserver.xml
+lmtpserver.conf
log4j.properties
-mailetcontainer.xml
-mailbox.xml
-mailserver.xml
-mailrepositorystore.xml
-pop3server.xml
-recipientrewritetable.xml
-smtpserver.xml
-sqlResources.xml
-usersrepository.xml
+mailetcontainer.conf
+mailbox.conf
+mailserver.conf
+mailrepositorystore.conf
+pop3server.conf
+recipientrewritetable.conf
+smtpserver.conf
+sqlResources.conf
+usersrepository.conf
wrapper.conf
lib folder (for your additional jar, e.g. JDBC drviers,...)
James is packaged with virtual hosting enabled, JPA (Derby database) storage
for the mails, users, and domains.
-On SMTP (see smtpserver.xml config)
+On SMTP (see smtpserver.conf config)
* authRequired is true by default, so you can safely deploy James on the
Internet (it won't be an open relay).
* verifyIdentity is true by default (you can only send mails with a FROM
being the authenticated user).
Modified: james/server/trunk/src/site/xdoc/upgrade-2.3.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/upgrade-2.3.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/upgrade-2.3.xml (original)
+++ james/server/trunk/src/site/xdoc/upgrade-2.3.xml Tue Apr 17 13:06:09 2012
@@ -44,7 +44,7 @@
<subsection name="Tool to Migrate Users and Mails">
- <p>Set in james23.xml configuration file the type of user repository you
were
+ <p>Set in usersrepository23.conf configuration file the type of user
repository you were
using in James 2.3 (example:
org.apache.james.user.file.UsersFileRepository).
You also need to set the URL you was using in 2.3 (db, file,...,
example: URL="file://var/users/).
If you were using file, you need to manually copy the user files to
the folder you have specified (example: var/users).</p>
Modified: james/server/trunk/src/site/xdoc/upgrade.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/upgrade.xml?rev=1327082&r1=1327081&r2=1327082&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/upgrade.xml (original)
+++ james/server/trunk/src/site/xdoc/upgrade.xml Tue Apr 17 13:06:09 2012
@@ -27,9 +27,14 @@
<section name="Upgrade">
- <p>Howto upgrade from previous version.</p>
+ <p>If you are already using Apache James 2.3, you may face
important changes.
+ We have written <a href="upgrade-2.3.html">this page</a> to help
you.</p>
+
+ <p>If you are want to do incremental upgrade
+ you may need <a href="upgrade-database.html">to upgrade your
database schema</a>.</p>
</section>
</body>
+
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
