JAMESâ2104 Remove mentions of templates in documentation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/975fcf12 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/975fcf12 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/975fcf12 Branch: refs/heads/master Commit: 975fcf12e8888677a2388a6abc5f86a505479a4e Parents: a3dced9 Author: benwa <[email protected]> Authored: Mon Jul 31 11:51:47 2017 +0700 Committer: benwa <[email protected]> Committed: Tue Aug 8 10:41:18 2017 +0700 ---------------------------------------------------------------------- src/site/xdoc/server/config-antispam.xml | 4 +- src/site/xdoc/server/config-cassandra.xml | 2 +- src/site/xdoc/server/config-dnsservice.xml | 2 +- src/site/xdoc/server/config-domainlist.xml | 2 +- src/site/xdoc/server/config-elasticsearch.xml | 2 +- src/site/xdoc/server/config-events.xml | 2 +- src/site/xdoc/server/config-fetchmail.xml | 2 +- src/site/xdoc/server/config-guice.xml | 4 +- src/site/xdoc/server/config-imap4.xml | 2 +- src/site/xdoc/server/config-mailbox.xml | 2 +- src/site/xdoc/server/config-mailetcontainer.xml | 2 +- .../xdoc/server/config-mailrepositorystore.xml | 2 +- src/site/xdoc/server/config-pop3.xml | 2 +- src/site/xdoc/server/config-quota.xml | 4 +- .../server/config-recipientrewritetable.xml | 2 +- src/site/xdoc/server/config-smtp-lmtp.xml | 4 +- src/site/xdoc/server/config-system.xml | 6 +-- src/site/xdoc/server/config-users.xml | 2 +- src/site/xdoc/server/config.xml | 46 ++++++++++---------- src/site/xdoc/server/install.xml | 6 +-- src/site/xdoc/server/quick-start.xml | 5 +-- 21 files changed, 50 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-antispam.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-antispam.xml b/src/site/xdoc/server/config-antispam.xml index 37008b0..c1682cb 100644 --- a/src/site/xdoc/server/config-antispam.xml +++ b/src/site/xdoc/server/config-antispam.xml @@ -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://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver-template.xml";>examples</a>.</li> - <li>Mailets; see <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer-template.xml";>examples</a>.</li> + <li>SMTP Hooks; see <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>examples</a>.</li> + <li>Mailets; see <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer.xml";>examples</a>.</li> </ul> <subsection name="AntiSpam SMTP Hooks"> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-cassandra.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-cassandra.xml b/src/site/xdoc/server/config-cassandra.xml index 2534ceb..6b9bf24 100644 --- a/src/site/xdoc/server/config-cassandra.xml +++ b/src/site/xdoc/server/config-cassandra.xml @@ -29,7 +29,7 @@ Note: Cassandra is only available with Guice wiring (cassandra-guice and cassandra-guice-ldap). - <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra-template.properties</a> to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra.properties</a> to get some examples and hints.</p> <dl> <dt><strong>cassandra.nodes</strong></dt> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-dnsservice.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-dnsservice.xml b/src/site/xdoc/server/config-dnsservice.xml index 5ac1d5b..cd8c3f4 100755 --- a/src/site/xdoc/server/config-dnsservice.xml +++ b/src/site/xdoc/server/config-dnsservice.xml @@ -29,7 +29,7 @@ <subsection name="dnsservice.xml"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice-template.xml";>dnsservice-template.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice.xml";>dnsservice.xml</a> in GIT to get some examples and hints.</p> <p>Specifies DNS Server information for use by various components inside Apache James Server.</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-domainlist.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-domainlist.xml b/src/site/xdoc/server/config-domainlist.xml index 2c46dbe..3682df9 100644 --- a/src/site/xdoc/server/config-domainlist.xml +++ b/src/site/xdoc/server/config-domainlist.xml @@ -27,7 +27,7 @@ <section name="DomainList Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist-template.xml";>domainlist-template.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist.xml";>domainlist.xml</a> in GIT to get some examples and hints.</p> <p>This configuration block is defined by the <strong>domainlist</strong> tag.</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-elasticsearch.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-elasticsearch.xml b/src/site/xdoc/server/config-elasticsearch.xml index accb7f0..c554e4c 100644 --- a/src/site/xdoc/server/config-elasticsearch.xml +++ b/src/site/xdoc/server/config-elasticsearch.xml @@ -29,7 +29,7 @@ This configuration applies only to Guice wiring. - <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch-template.properties</a> to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch.properties</a> to get some examples and hints.</p> Connection to a cluster : http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-events.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-events.xml b/src/site/xdoc/server/config-events.xml index 92bf0e7..7bc0c48 100644 --- a/src/site/xdoc/server/config-events.xml +++ b/src/site/xdoc/server/config-events.xml @@ -29,7 +29,7 @@ This configuration applies only to Spring wiring. - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events-template.xml";>events-template.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events.xml";>events.xml</a> in GIT to get some examples and hints.</p> <p>Use this configuration to define the type of Event System you want.</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-fetchmail.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-fetchmail.xml b/src/site/xdoc/server/config-fetchmail.xml index c184db1..6feb0b2 100755 --- a/src/site/xdoc/server/config-fetchmail.xml +++ b/src/site/xdoc/server/config-fetchmail.xml @@ -29,7 +29,7 @@ This configuration file requires Spring wiring. - <p>Consult <a 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 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 or POP3 server and James. Mail is fetched from the external message store and http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-guice.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-guice.xml b/src/site/xdoc/server/config-guice.xml index f807656..74c2ad9 100644 --- a/src/site/xdoc/server/config-guice.xml +++ b/src/site/xdoc/server/config-guice.xml @@ -48,7 +48,7 @@ </tr> <tr> - <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties";>cassandra-template.properties</a></td> + <td><a 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> <td></td> </tr> @@ -58,7 +58,7 @@ <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties";>elasticsearch-template.properties</a></td> + <td><a 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> <td></td> </tr> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-imap4.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-imap4.xml b/src/site/xdoc/server/config-imap4.xml index c163590..0348a7d 100644 --- a/src/site/xdoc/server/config-imap4.xml +++ b/src/site/xdoc/server/config-imap4.xml @@ -27,7 +27,7 @@ <section name="IMAP4 Configuration"> - <p>Consult <a 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 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. The imap4server tag defines the boundaries of the configuration block. It encloses http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-mailbox.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-mailbox.xml b/src/site/xdoc/server/config-mailbox.xml index 3d18fe0..8db90f0 100644 --- a/src/site/xdoc/server/config-mailbox.xml +++ b/src/site/xdoc/server/config-mailbox.xml @@ -29,7 +29,7 @@ This configuration applies only to Spring wiring. - <p>Consult <a 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 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-project/blob/975fcf12/src/site/xdoc/server/config-mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-mailetcontainer.xml b/src/site/xdoc/server/config-mailetcontainer.xml index 629da0d..0931327 100644 --- a/src/site/xdoc/server/config-mailetcontainer.xml +++ b/src/site/xdoc/server/config-mailetcontainer.xml @@ -34,7 +34,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 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 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 <strong>mailserver</strong> tag. All administrators need to adjust the <strong>mailserver</strong> block upon installation.</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-mailrepositorystore.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-mailrepositorystore.xml b/src/site/xdoc/server/config-mailrepositorystore.xml index 3bf77c3..62e24b5 100644 --- a/src/site/xdoc/server/config-mailrepositorystore.xml +++ b/src/site/xdoc/server/config-mailrepositorystore.xml @@ -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://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 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 storage: File, Database, DBFile, MBox and JCR.</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-pop3.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-pop3.xml b/src/site/xdoc/server/config-pop3.xml index 2c4a89a..7acc82e 100644 --- a/src/site/xdoc/server/config-pop3.xml +++ b/src/site/xdoc/server/config-pop3.xml @@ -27,7 +27,7 @@ <section name="POP3 Configuration"> - <p>Consult <a 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 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. The pop3server tag defines the boundaries of the configuration block. It encloses http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-quota.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-quota.xml b/src/site/xdoc/server/config-quota.xml index 83de100..1198eb0 100644 --- a/src/site/xdoc/server/config-quota.xml +++ b/src/site/xdoc/server/config-quota.xml @@ -29,7 +29,7 @@ This configuration applies only to Spring wiring. - <p>Consult <a 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 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> @@ -66,7 +66,7 @@ </p> <p> - To choose the implementation you want for the given components you want simply have a look to the <a 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 href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota.xml";>quota.xml</a> file. </p> <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-recipientrewritetable.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-recipientrewritetable.xml b/src/site/xdoc/server/config-recipientrewritetable.xml index de5e126..b45c75f 100644 --- a/src/site/xdoc/server/config-recipientrewritetable.xml +++ b/src/site/xdoc/server/config-recipientrewritetable.xml @@ -27,7 +27,7 @@ <section name="Recipient Rewrite Table Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/recipientrewritetable-template.xml";>recipientrewritetable-template.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/recipientrewritetable.xml";>recipientrewritetable.xml</a> in GIT to get some examples and hints.</p> <subsection name="JPA Recipient Rewrite Table"> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-smtp-lmtp.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-smtp-lmtp.xml b/src/site/xdoc/server/config-smtp-lmtp.xml index 4991c07..3cf36cc 100644 --- a/src/site/xdoc/server/config-smtp-lmtp.xml +++ b/src/site/xdoc/server/config-smtp-lmtp.xml @@ -37,7 +37,7 @@ <section name="SMTP Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver-template.xml";>smtpserver-template.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>smtpserver.xml</a> in GIT 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://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver-template.xml";>lmtpserver-template.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a> in GIT to get some examples and hints.</p> <p>The configuration is the same of for SMTP.</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-system.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-system.xml b/src/site/xdoc/server/config-system.xml index 08098b7..0c8ca3c 100644 --- a/src/site/xdoc/server/config-system.xml +++ b/src/site/xdoc/server/config-system.xml @@ -56,7 +56,7 @@ <p>This configuration file is only relevant when using JPA, with Spring or Guice.</p> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/james-database-template.properties";>james-database.properties</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/james-database.properties";>james.properties</a> in GIT to get some examples and hints.</p> <p>The database connection in database.properties</p> @@ -112,7 +112,7 @@ <subsection name="jmx.properties"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jmx-template.properties";>jmx.properties</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jmx.properties";>jmx.properties</a> in GIT 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> @@ -151,7 +151,7 @@ <subsection name="JCR Repository Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jcr-repository-template.xml";>jcr-repository.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jcr-repository.xml";>jcr-repository.xml</a> in GIT to get some examples and hints.</p> <p>Used to configure the JCR mailbox (if configure in mailbox.xml).</p> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config-users.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-users.xml b/src/site/xdoc/server/config-users.xml index d259725..2b9831c 100644 --- a/src/site/xdoc/server/config-users.xml +++ b/src/site/xdoc/server/config-users.xml @@ -31,7 +31,7 @@ <p>User repositories are required to store James user information and authentication data</p> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/usersrepository-template.xml";>usersrepository.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/usersrepository.xml";>usersrepository.xml</a> in GIT to get some examples and hints.</p> </subsection> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/config.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config.xml b/src/site/xdoc/server/config.xml index 096e94f..00f9dd8 100644 --- a/src/site/xdoc/server/config.xml +++ b/src/site/xdoc/server/config.xml @@ -29,10 +29,8 @@ <p>All configuration files resides in the ./conf and ./conf/META-INF folder.</p> - <p>With default Spring wiring, 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.xml - to *.xml (example: smtpserver-template.xml to smtpserver.xml), and change - in *.xml the settings to map your needs.</p> + <p>With default Spring wiring, we ship with default configuration. It gets automatically deployed in the conf folder while unzipping. + Of course, you can change the files *.xml the settings to match your needs.</p> <p> For Guice based wiring, you are encouraged to take a look at default configuration of the <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice";>James docker images</a>.</p> @@ -52,72 +50,72 @@ </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist-template.xml";>domainlist.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist.xml";>domainlist.xml</a></td> <td><a href="config-domainlist.html">Domain List Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/usersrepository-template.xml";>usersrepository.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/usersrepository.xml";>usersrepository.xml</a></td> <td><a href="config-users.html">Users Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/recipientrewritetable-template.xml";>recipientrewritetable.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/recipientrewritetable.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://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailbox-template.xml";>mailbox.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailbox.xml";>mailbox.xml</a></td> <td><a href="config-mailbox.html">Mailbox Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota-template.xml";>mailbox.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota.xml";>mailbox.xml</a></td> <td><a href="config-quota.html">Quota Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events-template.xml";>events.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events.xml";>events.xml</a></td> <td><a href="config-events.html">Event system Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailrepositorystore-template.xml";>mailrepositorystore.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailrepositorystore.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://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice-template.xml";>dnsservice.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice.xml";>dnsservice.xml</a></td> <td><a href="config-dnsservice.html">DNS Service Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver-template.xml";>smtpserver.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>smtpserver.xml</a></td> <td><a href="config-smtp-lmtp.html">SMTP Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver-template.xml";>lmtpserver.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a></td> <td><a href="config-smtp-lmtp.html">LMTP Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/pop3server-template.xml";>pop3server.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/pop3server.xml";>pop3server.xml</a></td> <td><a href="config-pop3.html">POP3 Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/imapserver-template.xml";>imapserver.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/imapserver.xml";>imapserver.xml</a></td> <td><a href="config-imap4.html">IMAP4 Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer-template.xml";>mailetcontainer.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer.xml";>mailetcontainer.xml</a></td> <td><a href="config-mailetcontainer.html">Mailet Container Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/fetchmail-template.xml";>fetchmail.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/fetchmail.xml";>fetchmail.xml</a></td> <td><a href="config-fetchmail.html">FetchMail Configuration (Spring only)</a></td> <td></td> </tr> @@ -140,34 +138,34 @@ <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/james-database-template.properties";>james-database.properties</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/james-database.properties";>james-database.properties</a></td> <td><a href="config-system.html">System Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/META-INF/persistence-template.xml";>META-INF/persistence.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/META-INF/persistence.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://github.com/apache/james-project/tree/master/server/app/src/main/resources/jmx-template.properties";>jmx.properties</a><br/> + <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jmx.properties";>jmx.properties</a><br/> </td> <td><a href="config-system.html">System Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/log4j-template.properties";>log4j.properties</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/log4j.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://github.com/apache/james-project/tree/master/server/app/src/main/resources/sqlResources-template.xml";>sqlResources.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/sqlResources.xml";>sqlResources.xml</a></td> <td><a href="config-system.html">System Configuration</a></td> <td>Deprecated</td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jcr-repository-template.xml";>jcr-repository.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jcr-repository.xml";>jcr-repository.xml</a></td> <td><a href="config-system.html">System Configuration</a></td> <td></td> </tr> http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/install.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml index 9b9586c..c0de159 100644 --- a/src/site/xdoc/server/install.xml +++ b/src/site/xdoc/server/install.xml @@ -134,11 +134,9 @@ </div> --> <p>After unpacking the binary, the next step is to adjust the initial configuration. - All configuration files are embedded in jars. We ship in the conf folder template configuration files. + All configuration files are embedded in jars. We ship in the conf folder the configuration files that can be edited to match your needs. </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 http://git-wip-us.apache.org/repos/asf/james-project/blob/975fcf12/src/site/xdoc/server/quick-start.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/quick-start.xml b/src/site/xdoc/server/quick-start.xml index 73e1325..df7a6df 100644 --- a/src/site/xdoc/server/quick-start.xml +++ b/src/site/xdoc/server/quick-start.xml @@ -83,9 +83,8 @@ Step 4: Configure ################# * All configuration files are embedded in jars. - * We ship in the conf folder template configuration files. - * You can override the default configuration : - Copy the conf folder any ...-template... you need and update according to your needs. + * We ship in the conf folder the configuration files. + * You can override the default configuration by editing these files database.properties META-INF/persistence.xml --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
