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/08/28 23:46:59 UTC

svn commit: r690016 - in /james/server/trunk: phoenix-deployment/src/conf/james-assembly.xml phoenix-deployment/src/conf/james-config.xml spoolmanager-function/src/main/resources/org/apache/james/James.xinfo

Author: rdonkin
Date: Thu Aug 28 14:46:59 2008
New Revision: 690016

URL: http://svn.apache.org/viewvc?rev=690016&view=rev
Log:
Removed remains of old IMAP. Will add new in after move

Modified:
    james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
    james/server/trunk/phoenix-deployment/src/conf/james-config.xml
    james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/James.xinfo

Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=690016&r1=690015&r2=690016&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Thu Aug 28 14:46:59 2008
@@ -53,15 +53,8 @@
     <provide name="scheduler"
              role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
     <provide name="database-connections"
-             role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
-    <provide name="mailboxmanager"
-             role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" />         
+             role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />        
   </block>
-
-    
-  <block name="mailboxmanager" class="org.apache.james.mailboxmanager.impl.DefaultMailboxManagerProvider">
-      <provide name="filesystem" role="org.apache.james.services.FileSystem" />    
-  </block>  
    
   <!-- The James Spool Manager block  -->
   <block name="spoolmanager" class="org.apache.james.transport.JamesSpoolManager" >
@@ -123,28 +116,7 @@
     <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
     <provide name="users-store" role="org.apache.james.api.user.UsersStore"/>
   </block>
-    
-    <!-- IMAP Server -->
-  <block name="imap-connections"
-         class="org.apache.james.util.connection.SimpleConnectionManager" >
-    <provide name="thread-manager"
-             role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
-  </block>  
-    
-  <block name="imapserver" class="org.apache.james.imapserver.ImapServer" >
-    <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
-    <provide name="sockets"
-             role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
-    <provide name="imap-connections"
-             role="org.apache.james.socket.JamesConnectionManager"/>
-    <provide name="James" role="org.apache.james.services.MailServer"/>
-    <provide name="thread-manager"
-             role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
-    <provide name="mailboxmanager"
-             role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" />    
-    <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/>    
-  </block>      
-    
+        
   <!-- POP3 Server -->
   <block name="pop3server" class="org.apache.james.pop3server.POP3Server" >
     <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>

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=690016&r1=690015&r2=690016&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-config.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-config.xml Thu Aug 28 14:46:59 2008
@@ -140,7 +140,7 @@
     <!--
         Don't forget to activate mailboxmanager inboxRepository in the 
         James block, if you want to receive mail in your IMAP mailbox
-    --> 
+    --><!-- 
     <mailboxmanager>
         <namespaces>
             <usernamespace name="#mail" delimiter="."/>
@@ -174,23 +174,23 @@
                            value="100"/>
                    </torque-properties>
         </factory>
-    </mailboxmanager>
+    </mailboxmanager>-->
     
   <!-- Experimental IMAP support 
       
         Don't forget to activate mailboxmanager inboxRepository in the 
         James block, if you want to receive mail in your IMAP mailbox
-    -->     
-   <imap-connections>
+   
+   <imap-connections>-->
       <!-- RFC 3501 requires a minimum timeout of 30 minutes -->
-      <idle-timeout>1800000</idle-timeout>
+<!--       <idle-timeout>1800000</idle-timeout>
       <max-connections>100</max-connections>
-      <!--
+-->      <!--
       <max-connections-per-ip>0</max-connections-per-ip>
       -->
-   </imap-connections>      
+<!--    </imap-connections>   -->   
     
-   <imapserver enabled="true">
+<!--  <imapserver enabled="true"> -->
       <!-- port 993 is the well-known/IANA registered port for IMAPs ie over SSL/TLS -->
         <!-- <port>993</port> -->
         <!-- JAMES TLS uses JSSE. This means that for many Sun JVMs,
@@ -222,13 +222,12 @@
         </handler> 
       -->
       <!-- Experimental high port -->
-      <port>10143</port>
-      <handler>
+      <!-- <port>10143</port> 
+      <handler>-->
        <!-- RFC 3501 requires a minimum timeout of 30 minutes -->
-       <connectiontimeout>1800000</connectiontimeout>         
+<!--         <connectiontimeout>1800000</connectiontimeout>         
        <streamdump enabled="true" directory="../apps/james/streamdump" />
-      </handler>      
-   </imapserver>
+      </handler>      -->
     
    <!-- This is an example configuration for FetchMail, a JavaMail based gateway  -->
    <!-- service that pulls messages from other sources, and inserts them into the -->

Modified: james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/James.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/James.xinfo?rev=690016&r1=690015&r2=690016&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/James.xinfo (original)
+++ james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/James.xinfo Thu Aug 28 14:46:59 2008
@@ -61,10 +61,7 @@
     </dependency>
     <dependency>
       <service name="org.apache.james.api.domainlist.DomainList" version="1.0"/>
-    </dependency>
-    <dependency>
-      <service name="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" version="1.0"/>
-    </dependency>      
+    </dependency>   
   </dependencies>
 
 



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