http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/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 8db90f0..9109a2a 100644 --- a/src/site/xdoc/server/config-mailbox.xml +++ b/src/site/xdoc/server/config-mailbox.xml @@ -37,7 +37,7 @@ <dl> <dt><strong>provider</strong></dt> - <dd>Supported providers are: jpa (default), jcr, maildir, memory. Be aware that maildir will only work on unix like operation systems! + <dd>Supported providers are: jpa (default), maildir, memory. Be aware that maildir will only work on unix like operation systems! Cassandra mailbox need to be compiled and run using java 8.</dd> </dl>
http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/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 f4ab529..da7f535 100644 --- a/src/site/xdoc/server/config-mailrepositorystore.xml +++ b/src/site/xdoc/server/config-mailrepositorystore.xml @@ -34,7 +34,7 @@ <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 several types of - storage: File, Database, Cassandra, DBFile, MBox and JCR.</p> + storage: File, Database, Cassandra, DBFile, and MBox.</p> </subsection> @@ -96,17 +96,6 @@ </subsection> - <subsection name="JCR Repositories"> - - <p>Warning: deprecated. This feature will be removed as part of James release 3.2.0 unless it is maintained. - See https://issues.apache.org/jira/browse/JAMES-2323. Use File Repositories instead.</p> - - <p>Store mails in a JCR (Java Content Repository) based implementation.</p> - - <p>If you enable this you need to make sure that embedded Jackrabbit instance is started as well. Check the container configuration</p> - - </subsection> - <subsection name="CassandraMailRepository"> <p>Cassandra Guice wiring allows to use the <code>cassandra://</code> protocol for your ToRepository mailets.</p> </subsection> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/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 c4ab38f..038eb1e 100644 --- a/src/site/xdoc/server/config-system.xml +++ b/src/site/xdoc/server/config-system.xml @@ -40,7 +40,7 @@ <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, + file (james-server-context.xml) which imports 3 other files (1 per mailbox type): james-mailbox-jpa-context.xml, james-mailbox-maildir-context.xml, james-mailbox-memory-context.xml.</p> <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml";>spring-server.xml</a> in GIT to @@ -151,14 +151,6 @@ </subsection> - <subsection name="JCR Repository Configuration"> - - <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> - - </subsection> - </section> </body> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/src/site/xdoc/server/config.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config.xml b/src/site/xdoc/server/config.xml index 96dad73..ce19d31 100644 --- a/src/site/xdoc/server/config.xml +++ b/src/site/xdoc/server/config.xml @@ -178,11 +178,6 @@ <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.xml";>jcr-repository.xml</a></td> - <td><a href="config-system.html">System Configuration</a></td> - <td></td> - </tr> </table> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/src/site/xdoc/server/feature-persistence.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/feature-persistence.xml b/src/site/xdoc/server/feature-persistence.xml index 4c8c1a2..3a26184 100644 --- a/src/site/xdoc/server/feature-persistence.xml +++ b/src/site/xdoc/server/feature-persistence.xml @@ -42,11 +42,11 @@ <p>Apache James Server uses the <a href="http://james.apache.org/mailbox";>Apache James Mailbox</a> storage system to store the users mailboxes.</p> - <p>The mailbox library supports different persistence mecanisms: MailDir, Database (via JPA) and JCR.</p> + <p>The mailbox library supports different persistence mecanisms: MailDir, Database (via JPA).</p> <p>Mailbox persistence is configured in spring-beans.xml (by default JPA, you set the database connection properties in database.properties - can also be - MailDir, JCR).</p> + MailDir).</p> </subsection> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/src/site/xdoc/server/features.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/features.xml b/src/site/xdoc/server/features.xml index cd8cb1d..2d8f460 100644 --- a/src/site/xdoc/server/features.xml +++ b/src/site/xdoc/server/features.xml @@ -212,14 +212,6 @@ <td></td> </tr> <tr> - <td>JCR (Jackrabbit) Database Mail Store</td> - <td>deprecated</td> - <td>yes</td> - <td>no</td> - <td></td> - <td></td> - </tr> - <tr> <td>Alternate Mail stores</td> <td>Experimental</td> <td>yes</td> @@ -252,14 +244,6 @@ <td>3.0.0</td> </tr> <tr> - <td>JCR Users</td> - <td>Stable</td> - <td>yes</td> - <td>no</td> - <td>1.2.1</td> - <td>1.2.1</td> - </tr> - <tr> <td>LDAP Users</td> <td>Experimental</td> <td>yes</td> @@ -346,4 +330,4 @@ </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/src/site/xdoc/server/monitor-folders.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/monitor-folders.xml b/src/site/xdoc/server/monitor-folders.xml index 2320118..e392d49 100644 --- a/src/site/xdoc/server/monitor-folders.xml +++ b/src/site/xdoc/server/monitor-folders.xml @@ -65,7 +65,7 @@ store mailetcontainer.xml configuration). Sub folders of var/mail can be address-error, error, relay-denied, spam</p> - <p>The store folder contains the files related to database, jcr, activemq,... needed by James. + <p>The store folder contains the files related to database, activemq,... needed by James. James Server default settings comes with a embedded Derby database that stores the users, domains and mailboxes (the user mails) (see store/derby folder).</p> @@ -95,14 +95,6 @@ maildir mailboxes. Use var/store/maildir folder to contain the user's mails.</p> -<source> -jackrabbit -</source> - - <p>You can configure James to use JCR (Java Content Repository, based - on Apache Jackrabbit) as storage for the user mailboxes. Use - var/store/jackrabbit folder to contain the user's mails.</p> - </subsection> <subsection name="Monitor tmp Folder Usage"> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/src/site/xdoc/server/packaging.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml index 1a8f484..f69b92f 100644 --- a/src/site/xdoc/server/packaging.xml +++ b/src/site/xdoc/server/packaging.xml @@ -155,7 +155,7 @@ </tr> <tr> <td>Mailbox implementation</td> - <td>JPA/MailDir/JCR/Memory</td> + <td>JPA/MailDir/Memory</td> <td>Cassandra</td> <td>Cassandra</td> <td>JPA</td> http://git-wip-us.apache.org/repos/asf/james-project/blob/876987c8/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 f7438d8..cf21714 100644 --- a/src/site/xdoc/server/quick-start.xml +++ b/src/site/xdoc/server/quick-start.xml @@ -69,7 +69,7 @@ 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. +- 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). 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 @@ -93,7 +93,6 @@ domainlist.xml fetchmail.xml imapserver.xml james-listmanager.xml -jcr-repository.xml jmx.properties lmtpserver.xml log4j.properties --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
