Author: eric
Date: Sun Jan 20 16:38:53 2013
New Revision: 1435879
URL: http://svn.apache.org/viewvc?rev=1435879&view=rev
Log:
Revert back to xml extension for configuration files (JAMES-1471)
Added:
james/server/trunk/app/src/main/resources/dnsservice-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/dnsservice-template.conf
james/server/trunk/app/src/main/resources/domainlist-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/domainlist-template.conf
james/server/trunk/app/src/main/resources/fetchmail-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/fetchmail-template.conf
james/server/trunk/app/src/main/resources/imapserver-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/imapserver-template.conf
james/server/trunk/app/src/main/resources/jetm-monitoring.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/jetm-monitoring.conf
james/server/trunk/app/src/main/resources/lmtpserver-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/lmtpserver-template.conf
james/server/trunk/app/src/main/resources/mailbox-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/mailbox-template.conf
james/server/trunk/app/src/main/resources/mailetcontainer-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/mailetcontainer-template.conf
james/server/trunk/app/src/main/resources/mailrepositorystore-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/mailrepositorystore-template.conf
james/server/trunk/app/src/main/resources/pop3server-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/pop3server-template.conf
james/server/trunk/app/src/main/resources/recipientrewritetable-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/recipientrewritetable-template.conf
james/server/trunk/app/src/main/resources/smtpserver-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/smtpserver-template.conf
james/server/trunk/app/src/main/resources/usersrepository-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/usersrepository-template.conf
james/server/trunk/app/src/main/resources/usersrepository23-template.xml
- copied unchanged from r1432386,
james/server/trunk/app/src/main/resources/usersrepository23-template.conf
james/server/trunk/data/data-api/src/main/resources/domainlist.xml
- copied unchanged from r1432386,
james/server/trunk/data/data-api/src/main/resources/domainlist.conf
james/server/trunk/data/data-api/src/main/resources/mailrepositorystore.xml
- copied unchanged from r1432386,
james/server/trunk/data/data-api/src/main/resources/mailrepositorystore.conf
james/server/trunk/data/data-api/src/main/resources/recipientrewritetable.xml
- copied unchanged from r1432386,
james/server/trunk/data/data-api/src/main/resources/recipientrewritetable.conf
james/server/trunk/data/data-api/src/main/resources/usersrepository.xml
- copied unchanged from r1432386,
james/server/trunk/data/data-api/src/main/resources/usersrepository.conf
james/server/trunk/data/data-api/src/main/resources/usersrepository23.xml
- copied unchanged from r1432386,
james/server/trunk/data/data-api/src/main/resources/usersrepository23.conf
james/server/trunk/dns-service/dnsservice-api/src/main/resources/dnsservice.xml
- copied unchanged from r1432386,
james/server/trunk/dns-service/dnsservice-api/src/main/resources/dnsservice.conf
james/server/trunk/fetchmail/src/main/resources/fetchmail.xml
- copied unchanged from r1432386,
james/server/trunk/fetchmail/src/main/resources/fetchmail.conf
james/server/trunk/mailbox-adapter/src/main/resources/mailbox.xml
- copied unchanged from r1432386,
james/server/trunk/mailbox-adapter/src/main/resources/mailbox.conf
james/server/trunk/mailetcontainer-api/src/main/resources/mailetcontainer.xml
- copied unchanged from r1432386,
james/server/trunk/mailetcontainer-api/src/main/resources/mailetcontainer.conf
james/server/trunk/protocols/protocols-imap4/src/main/resources/imapserver.xml
- copied unchanged from r1432386,
james/server/trunk/protocols/protocols-imap4/src/main/resources/imapserver.conf
james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.xml
- copied unchanged from r1432386,
james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.conf
james/server/trunk/protocols/protocols-pop3/src/main/resources/pop3server.xml
- copied unchanged from r1432386,
james/server/trunk/protocols/protocols-pop3/src/main/resources/pop3server.conf
james/server/trunk/protocols/protocols-smtp/src/main/resources/smtpserver.xml
- copied unchanged from r1432386,
james/server/trunk/protocols/protocols-smtp/src/main/resources/smtpserver.conf
Removed:
james/server/trunk/app/src/main/resources/dnsservice-template.conf
james/server/trunk/app/src/main/resources/domainlist-template.conf
james/server/trunk/app/src/main/resources/fetchmail-template.conf
james/server/trunk/app/src/main/resources/imapserver-template.conf
james/server/trunk/app/src/main/resources/jetm-monitoring.conf
james/server/trunk/app/src/main/resources/lmtpserver-template.conf
james/server/trunk/app/src/main/resources/mailbox-template.conf
james/server/trunk/app/src/main/resources/mailetcontainer-template.conf
james/server/trunk/app/src/main/resources/mailrepositorystore-template.conf
james/server/trunk/app/src/main/resources/pop3server-template.conf
james/server/trunk/app/src/main/resources/recipientrewritetable-template.conf
james/server/trunk/app/src/main/resources/smtpserver-template.conf
james/server/trunk/app/src/main/resources/usersrepository-template.conf
james/server/trunk/app/src/main/resources/usersrepository23-template.conf
james/server/trunk/data/data-api/src/main/resources/domainlist.conf
james/server/trunk/data/data-api/src/main/resources/mailrepositorystore.conf
james/server/trunk/data/data-api/src/main/resources/recipientrewritetable.conf
james/server/trunk/data/data-api/src/main/resources/usersrepository.conf
james/server/trunk/data/data-api/src/main/resources/usersrepository23.conf
james/server/trunk/dns-service/dnsservice-api/src/main/resources/dnsservice.conf
james/server/trunk/fetchmail/src/main/resources/fetchmail.conf
james/server/trunk/mailbox-adapter/src/main/resources/mailbox.conf
james/server/trunk/mailetcontainer-api/src/main/resources/mailetcontainer.conf
james/server/trunk/protocols/protocols-imap4/src/main/resources/imapserver.conf
james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.conf
james/server/trunk/protocols/protocols-pop3/src/main/resources/pop3server.conf
james/server/trunk/protocols/protocols-smtp/src/main/resources/smtpserver.conf
Modified:
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
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-system.xml
james/server/trunk/src/site/xdoc/config-users.xml
james/server/trunk/src/site/xdoc/config.xml
james/server/trunk/src/site/xdoc/manage-domains.xml
james/server/trunk/src/site/xdoc/quick-start.xml
james/server/trunk/src/site/xdoc/upgrade-2.3.xml
Modified:
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java?rev=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
---
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
(original)
+++
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
Sun Jan 20 16:38:53 2013
@@ -35,7 +35,7 @@ import org.springframework.core.io.Resou
* Register Configuration and act as Configuration Provider.
*/
public class ConfigurationProviderImpl implements ConfigurationProvider,
ResourceLoaderAware, InitializingBean {
- private static final String CONFIGURATION_FILE_SUFFIX = ".conf";
+ private static final String CONFIGURATION_FILE_SUFFIX = ".xml";
/**
* A map of loaded configuration per bean.
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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-antispam.xml (original)
+++ james/server/trunk/src/site/xdoc/config-antispam.xml Sun Jan 20 16:38:53
2013
@@ -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/tags/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/tags/apache-james-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/tags/apache-james-3.0-beta4/src/main/resources/smtpserver-template.xml";>examples</a>.</li>
+ <li>Mailets; see <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.xml";>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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-dnsservice.xml (original)
+++ james/server/trunk/src/site/xdoc/config-dnsservice.xml Sun Jan 20 16:38:53
2013
@@ -27,9 +27,9 @@
<section name="DNS Service Configuration">
- <subsection name="dnsservice.conf">
+ <subsection name="dnsservice.xml">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/dnsservice-template.xml";>dnsservice-template.xml</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>
@@ -51,7 +51,7 @@
<dt><strong>autodiscover</strong></dt>
<dd>true or false - If you use autodiscover and add DNS servers
manually a combination of all the DNS servers will be used
If autodiscover is true, James will attempt to autodiscover the
DNS servers configured on your underlying system.
- Currently, this works if the OS has a unix-like /etc/resolv.conf,
+ Currently, this works if the OS has a unix-like /etc/resolv.xml,
or the system is Windows based with ipconfig or winipcfg. Change
autodiscover to false if you would like to turn off autodiscovery
and set the DNS servers manually in the servers section </dd>
<dt><strong>authoritative</strong></dt>
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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-domainlist.xml (original)
+++ james/server/trunk/src/site/xdoc/config-domainlist.xml Sun Jan 20 16:38:53
2013
@@ -27,7 +27,7 @@
<section name="DomainList Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/domainlist-template.xml";>domainlist-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-fetchmail.xml (original)
+++ james/server/trunk/src/site/xdoc/config-fetchmail.xml Sun Jan 20 16:38:53
2013
@@ -27,7 +27,7 @@
<section name="Fetchmail Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/fetchmail-template.xml";>fetchmail-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-imap4.xml (original)
+++ james/server/trunk/src/site/xdoc/config-imap4.xml Sun Jan 20 16:38:53 2013
@@ -27,7 +27,7 @@
<section name="IMAP4 Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/imapserver-template.xml";>imapserver-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-listmanager.xml (original)
+++ james/server/trunk/src/site/xdoc/config-listmanager.xml Sun Jan 20 16:38:53
2013
@@ -40,7 +40,7 @@
<subsection>
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/james-listmanager-template.xml";>james-listmanager.xml</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
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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailbox.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailbox.xml Sun Jan 20 16:38:53 2013
@@ -27,7 +27,7 @@
<section name="Mailbox Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailbox-template.xml";>mailbox-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailetcontainer.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailetcontainer.xml Sun Jan 20
16:38:53 2013
@@ -27,7 +27,7 @@
<section name="Mailet Container Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.xml";>mailetcontainer-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailrepositorystore.xml Sun Jan 20
16:38:53 2013
@@ -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/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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailrepositorystore-template.xml";>mailrepositorystore-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-pop3.xml (original)
+++ james/server/trunk/src/site/xdoc/config-pop3.xml Sun Jan 20 16:38:53 2013
@@ -27,7 +27,7 @@
<section name="POP3 Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/pop3server-template.xml";>pop3server-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml (original)
+++ james/server/trunk/src/site/xdoc/config-recipientrewritetable.xml Sun Jan
20 16:38:53 2013
@@ -27,7 +27,7 @@
<section name="Recipient Rewrite Table Configuration">
- <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>
+ <p>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/recipientrewritetable-template.xml";>recipientrewritetable-template.xml</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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml (original)
+++ james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml Sun Jan 20 16:38:53
2013
@@ -37,7 +37,7 @@
<section name="SMTP Configuration">
- <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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/smtpserver-template.xml";>smtpserver-template.xml</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/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>Consult <a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/lmtpserver-template.xml";>lmtpserver-template.xml</a>
in SVN to get some examples and hints.</p>
<p>The configuration is the same of for SMTP.</p>
Modified: james/server/trunk/src/site/xdoc/config-system.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-system.xml?rev=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-system.xml (original)
+++ james/server/trunk/src/site/xdoc/config-system.xml Sun Jan 20 16:38:53 2013
@@ -87,7 +87,7 @@
should check if its supported by your DB before enable it. See <a
href="http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html";>http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html</a>
(#7.11. LOB Streaming).</dd>
</dl>
- <p>Note for postgresql databases: Add standard_conforming_strings=off to
your postgresql.conf, otherwise you
+ <p>Note for postgresql databases: Add standard_conforming_strings=off to
your postgresql.xml, otherwise you
will get ""Invalid escape string Hint: Escape string must be empty or
one character. {prepstmnt 174928937
SELECT t0.mailbox_id, t0.mailbox_highest_modseq, t0.mailbox_last_uid,
t0.mailbox_name, t0.mailbox_namespace,
t0.mailbox_uid_validity, t0.user_name FROM public.james_mailbox t0
WHERE (t0.mailbox_name LIKE ?
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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-users.xml (original)
+++ james/server/trunk/src/site/xdoc/config-users.xml Sun Jan 20 16:38:53 2013
@@ -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/apache-james-3.0-beta4/src/main/resources/usersrepository-template.conf";>usersrepository.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/usersrepository-template.xml";>usersrepository.xml</a>
in SVN to get some examples and hints.</p>
</subsection>
@@ -219,7 +219,7 @@
</table>
-->
<!--
- <p>Six entries in JAMES.conf.xml must be set for this to work:
+ <p>Six entries in JAMES.xml.xml must be set for this to work:
<ul>
<li>change usersManager - type to ldap.</li>
<li>Set the ldapServer element to point to the correct host and
port</li>
Modified: james/server/trunk/src/site/xdoc/config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config.xml?rev=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config.xml (original)
+++ james/server/trunk/src/site/xdoc/config.xml Sun Jan 20 16:38:53 2013
@@ -30,9 +30,9 @@
<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. Simply copy in conf
folder *-template.conf
- to *.conf (example: smtpserver-template.conf to smtpserver.conf), and
change
- in *.conf the settings to map your needs.</p>
+ you can use to override the default configuration. Simply copy in conf
folder *-template.xml
+ to *.xml (example: smtpserver-template.xml to smtpserver.xml), and
change
+ in *.xml the settings to map your needs.</p>
<p>You can/must configure James for the following:</p>
@@ -45,62 +45,62 @@
</tr>
<tr>
- <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="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/domainlist-template.xml";>domainlist.xml</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/apache-james-3.0-beta4/src/main/resources/usersrepository-template.conf";>usersrepository.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/usersrepository-template.xml";>usersrepository.xml</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/apache-james-3.0-beta4/src/main/resources/recipientrewritetable-template.conf";>recipientrewritetable.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/recipientrewritetable-template.xml";>recipientrewritetable.xml</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/apache-james-3.0-beta4/src/main/resources/mailbox-template.conf";>mailbox.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailbox-template.xml";>mailbox.xml</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/apache-james-3.0-beta4/src/main/resources/mailrepositorystore-template.conf";>mailrepositorystore.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailrepositorystore-template.xml";>mailrepositorystore.xml</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/apache-james-3.0-beta4/src/main/resources/dnsservice-template.conf";>dnsservice.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/dnsservice-template.xml";>dnsservice.xml</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/apache-james-3.0-beta4/src/main/resources/smtpserver-template.conf";>smtpserver.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/smtpserver-template.xml";>smtpserver.xml</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/apache-james-3.0-beta4/src/main/resources/lmtpserver-template.conf";>lmtpserver.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/lmtpserver-template.xml";>lmtpserver.xml</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/apache-james-3.0-beta4/src/main/resources/pop3server-template.conf";>pop3server.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/pop3server-template.xml";>pop3server.xml</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/apache-james-3.0-beta4/src/main/resources/imapserver-template.conf";>imapserver.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/imapserver-template.xml";>imapserver.xml</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/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.conf";>mailetcontainer.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/mailetcontainer-template.xml";>mailetcontainer.xml</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/apache-james-3.0-beta4/src/main/resources/fetchmail-template.conf";>fetchmail.conf</a></td>
+ <td><a
href="https://svn.apache.org/repos/asf/james/app/tags/apache-james-3.0-beta4/src/main/resources/fetchmail-template.xml";>fetchmail.xml</a></td>
<td><a href="config-fetchmail.html">FetchMail Configuration</a></td>
<td></td>
</tr>
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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/manage-domains.xml (original)
+++ james/server/trunk/src/site/xdoc/manage-domains.xml Sun Jan 20 16:38:53 2013
@@ -34,7 +34,7 @@
<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>
+ you must add it in the domainlist.xml file.</p>
</section>
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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/quick-start.xml (original)
+++ james/server/trunk/src/site/xdoc/quick-start.xml Sun Jan 20 16:38:53 2013
@@ -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.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
+- 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
- All database connection use the database.properties in case of database
access.
Mailet Container -
http://james.apache.org/server/3/feature-mailetcontainer.html
@@ -86,30 +86,30 @@ Step 4: Configure
Copy the conf folder any ...-template... you need and update according
to your needs.
database.properties
-META-INF/persistence.conf
-dnsservice.conf
-domainlist.conf
-fetchmail.conf
-imapserver.conf
-james-listmanager.conf
-jcr-repository.conf
+META-INF/persistence.xml
+dnsservice.xml
+domainlist.xml
+fetchmail.xml
+imapserver.xml
+james-listmanager.xml
+jcr-repository.xml
jmx.properties
-lmtpserver.conf
+lmtpserver.xml
log4j.properties
-mailetcontainer.conf
-mailbox.conf
-mailserver.conf
-mailrepositorystore.conf
-pop3server.conf
-recipientrewritetable.conf
-smtpserver.conf
-sqlResources.conf
-usersrepository.conf
-wrapper.conf
+mailetcontainer.xml
+mailbox.xml
+mailserver.xml
+mailrepositorystore.xml
+pop3server.xml
+recipientrewritetable.xml
+smtpserver.xml
+sqlResources.xml
+usersrepository.xml
+wrapper.xml
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.conf config)
+On SMTP (see smtpserver.xml 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=1435879&r1=1435878&r2=1435879&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/upgrade-2.3.xml (original)
+++ james/server/trunk/src/site/xdoc/upgrade-2.3.xml Sun Jan 20 16:38:53 2013
@@ -44,7 +44,7 @@
<subsection name="Tool to Migrate Users and Mails">
- <p>Set in usersrepository23.conf configuration file the type of user
repository you were
+ <p>Set in usersrepository23.xml 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
