You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/01/30 08:12:24 UTC

[13/16] james-project git commit: JAMES-2323 Deprecate JcrMailRepository

JAMES-2323 Deprecate JcrMailRepository


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/25bbee66
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/25bbee66
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/25bbee66

Branch: refs/heads/master
Commit: 25bbee66ae704b40407935303de14bf4fff911d7
Parents: 1d6f4b7
Author: benwa <bt...@linagora.com>
Authored: Mon Jan 29 16:37:04 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 30 15:11:15 2018 +0700

----------------------------------------------------------------------
 .../app/src/main/resources/mailrepositorystore.xml  | 16 +---------------
 .../james/mailrepository/jcr/JCRMailRepository.java |  7 +++++++
 src/site/xdoc/server/config-mailrepositorystore.xml |  5 ++++-
 3 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/25bbee66/server/app/src/main/resources/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailrepositorystore.xml b/server/app/src/main/resources/mailrepositorystore.xml
index 5ddddc8..d389d1b 100644
--- a/server/app/src/main/resources/mailrepositorystore.xml
+++ b/server/app/src/main/resources/mailrepositorystore.xml
@@ -67,21 +67,7 @@
                <filestore>file://var/dbmail</filestore>
            </config>
        </mailrepository>
-        
-       <!-- If you enable this you need to make sure that embedded Jackrabbit instance is started as well. Check the container configuration --> 
-       <!--
-       <mailrepository class="org.apache.james.mailrepository.jcr.JCRMailRepository">
-           <protocols>
-               <protocol>jcr</protocol>
-           </protocols>
-           <config>
-               <repository>//localhost/jackrabbit.repository</repository>
-               <username>admin</username>
-               <password>admin</password>
-               <workspace>default</workspace>
-           </config>
-       </mailrepository>
-        -->
+
    </mailrepositories>
    
 </mailrepositorystore>

http://git-wip-us.apache.org/repos/asf/james-project/blob/25bbee66/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
index ff8ac28..3fd5754 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
@@ -68,7 +68,14 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Mail repository that is backed by a JCR content repository.
+ *
+ * @Depracted: See JAMES-2323
+ *
+ * Will be removed in James 3.2.0 upcoming release.
+ *
+ * Use a modern, maintained MailRepository instead. For instead FileMailRepository.
  */
+@Deprecated
 public class JCRMailRepository extends AbstractMailRepository implements MailRepository {
     private static final Logger LOGGER = LoggerFactory.getLogger(JCRMailRepository.class);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/25bbee66/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 3d0b9f8..9564849 100644
--- a/src/site/xdoc/server/config-mailrepositorystore.xml
+++ b/src/site/xdoc/server/config-mailrepositorystore.xml
@@ -97,7 +97,10 @@
     </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>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org