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 rd...@apache.org on 2008/02/05 20:59:26 UTC

svn commit: r618761 - in /james/server/trunk: jcr-backend-function/src/main/java/org/apache/james/jcr/ phoenix-deployment/ phoenix-deployment/src/conf/ phoenix-deployment/src/java/org/apache/james/phoenix/jcr/

Author: rdonkin
Date: Tue Feb  5 11:59:21 2008
New Revision: 618761

URL: http://svn.apache.org/viewvc?rev=618761&view=rev
Log:
Added JCR to deployment

Added:
    james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/
    james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/AvalonJCRMailRepository.java
      - copied unchanged from r618710, james/server/trunk/jcr-backend-function/src/main/java/org/apache/james/jcr/AvalonJCRMailRepository.java
Removed:
    james/server/trunk/jcr-backend-function/src/main/java/org/apache/james/jcr/AvalonJCRMailRepository.java
Modified:
    james/server/trunk/phoenix-deployment/build.xml
    james/server/trunk/phoenix-deployment/pom.xml
    james/server/trunk/phoenix-deployment/src/conf/james-config.xml

Modified: james/server/trunk/phoenix-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=618761&r1=618760&r2=618761&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Tue Feb  5 11:59:21 2008
@@ -104,6 +104,10 @@
             <include name="${commons-digester.jar}"/>
             <include name="${mime4j.jar}"/>
             <include name="${commons-io.jar}"/>   
+            <include name="${jackrabbit-api.jar}"/>
+            <include name="${jackrabbit-commons.jar}"/>
+            <include name="${jackrabbit-rmi.jar}"/>
+            <include name="${jcr.jar}"/>   
             <!-- TODO: include libraries without wildcards -->
             <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
             <include name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
@@ -509,6 +513,12 @@
                 <include name='${jarname.activemq-core}'/>
                 <include name='${jarname.activemq-jaas}'/>    
              </lib>   
+             <lib dir='${lib.dir}/${path.lib.jackrabbit}'>
+                <include name='${jarname.jackrabbit-api}'/>
+                <include name='${jarname.jackrabbit-commons}'/>
+                <include name='${jarname.jackrabbit-rmi}'/>    
+             </lib>   
+            <lib dir="${lib.dir}/${path.lib.jcr}" includes="${jarname.jcr}" />   
             <lib dir='${lib.dir}/concurrent/jars'>
                 <include name='backport-util-concurrent-2.1.jar'/>
             </lib>    

Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=618761&r1=618760&r2=618761&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Tue Feb  5 11:59:21 2008
@@ -117,6 +117,10 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-experimental-activemq-function</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-jcr-backend-function</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -205,7 +209,26 @@
       <groupId>org.apache.avalon.cornerstone.store</groupId>
       <artifactId>cornerstone-store-api</artifactId>
     </dependency>
-    
+        <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-api</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-commons</artifactId>
+      <version>1.3</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: james/server/trunk/phoenix-deployment/src/conf/james-config.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-config.xml?rev=618761&r1=618760&r2=618761&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-config.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-config.xml Tue Feb  5 11:59:21 2008
@@ -113,6 +113,11 @@
                      postfix=".INBOX" translateDelimiters="true" type="MAIL" />
       </inboxRepository>
        -->
+       <!-- JCR Support
+       <inboxRepository>
+         <repository destinationURL="jcr://james:inbox/" type="MAIL"/>
+       </inboxRepository> 
+       -->
       <!-- Set to true to support virtualHosting. If virtualHosting support is enabled the server will accept thread every user independ on -->
       <!-- domain level. -->
       <enableVirtualHosting> false </enableVirtualHosting>     
@@ -1296,6 +1301,21 @@
                <model>CACHE</model>
             </models>
          </repository>
+         
+         <repository class="org.apache.james.jcr.AvalonJCRMailRepository">
+             <protocols>
+               <protocol>jcr</protocol>
+             </protocols>
+             <types>
+               <type>MAIL</type>
+             </types>
+             <config>
+               <repository>//localhost/jackrabbit.repository</repository>
+               <username>admin</username>
+               <password>admin</password>
+               <workspace>default</workspace>
+             </config>
+           </repository>
       </repositories>
       
    </mailstore>



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