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 se...@apache.org on 2001/10/31 15:30:17 UTC
cvs commit: jakarta-james/src/conf james-assembly.xml james-config.xml james-server.xml
serge 01/10/31 06:30:17
Modified: src/conf james-assembly.xml james-config.xml
james-server.xml
Log:
Moving IMAP to proposal directory.
Revision Changes Path
1.6 +0 -13 jakarta-james/src/conf/james-assembly.xml
Index: james-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-james/src/conf/james-assembly.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- james-assembly.xml 2001/10/25 02:58:29 1.5
+++ james-assembly.xml 2001/10/31 14:30:17 1.6
@@ -44,19 +44,6 @@
<provide name="James" role="org.apache.james.services.MailServer"/>
</block>
- <!-- WARNING - The IMAP server is only experimental, ie pre-alpha -->
- <block class="org.apache.james.imapserver.IMAPServer" name="imapserver" >
- <provide name="mailstore" role="org.apache.james.services.MailStore"/>
- <provide name="users-store" role="org.apache.james.services.UsersStore"/>
- <provide name="sockets"
- role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
- <provide name="connections"
- role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
- <provide name="scheduler"
- role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
- <provide name="James" role="org.apache.james.services.MailServer"/>
- </block>
-
<!-- POP3 Server -->
<block class="org.apache.james.pop3server.POP3Server" name="pop3server" >
<provide name="mailstore" role="org.apache.james.services.MailStore"/>
1.16 +4 -64 jakarta-james/src/conf/james-config.xml
Index: james-config.xml
===================================================================
RCS file: /home/cvs/jakarta-james/src/conf/james-config.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- james-config.xml 2001/09/28 20:39:51 1.15
+++ james-config.xml 2001/10/31 14:30:17 1.16
@@ -13,8 +13,8 @@
CONFIRM? comment in the left
margin.
- This is $Revision: 1.15 $
- Committed on $Date: 2001/09/28 20:39:51 $ by: $Author: danny $
+ This is $Revision: 1.16 $
+ Committed on $Date: 2001/10/31 14:30:17 $ by: $Author: serge $
-->
<config>
@@ -43,29 +43,7 @@
enableForwarding="TRUE"/>
- <!-- Set the type of permanent mailfolders to be used.
- If IMAP service is to be provided, storage must be 'IMAP'; if only POP3
- service is being provided then use must be 'basic' (default) . At some
- stage POP3 will, hopefully, be able to use IMAP storage as well. This
- choice is irrelevant if the only service provided is SMTP. -->
- <storage>basic</storage>
-
- <!-- If storage is set to IMAP, systemClass and hostClass must point to
- the appropriate classes. -->
- <imapSetup systemClass="org.apache.james.imapserver.SimpleSystem"
- hostClass="org.apache.james.imapserver.JamesHost"/>
- <imapHost>
- <recordRepository>var/mail/folderRecords/</recordRepository>
- <mailboxRepository>var/mail/mailboxes/</mailboxRepository>
- <namespaces token="#">
- <privateNamespace separator=".">#mail</privateNamespace>
- <otherusersNamespace separator=".">#users</otherusersNamespace>
- <sharedNamespace separator=".">#shared</sharedNamespace>
- </namespaces>
- </imapHost>
-
-
<!-- The inbox repository is the location for users inboxes -->
<!-- Default setting: file based repository - enter path ( :/// for absolute) -->
<inboxRepository>
@@ -73,16 +51,14 @@
type="MAIL">
</repository>
</inboxRepository>
-
<!-- Alternative inbox repository definition for DB use. -->
<!-- The format for the destinationURL is "db://<data-source>/<table>"
- <data-source> is the datasource name set up in the
database-connections block, below
- <table> is the name of the table to store user inboxes in
The user name is used as <repositoryName> for this repository config.
- -->
- <!-- <inboxRepository>
+ <inboxRepository>
<repository destinationURL="db://maildb/inbox/"
type="MAIL">
</repository>
@@ -156,10 +132,6 @@
<subjectprefix>JamesList</subjectprefix>
</mailet>
- <mailet match="RecipientIs=test@glissando.lokitech.com" class="ToProcessor">
- <processor> schedule </processor>
- </mailet>
-
<!-- Sends remaining mails to the transport processor for either
local or remote delivery -->
<mailet match="All" class="ToProcessor">
@@ -167,14 +139,6 @@
</mailet>
</processor>
- <processor name="schedule">
- <mailet match="All" class="ToRepository">
- <repositoryPath> file://var/mail/pending/</repositoryPath>
- <!-- <repositoryPath> db://maildb/PendingMail/pending </repositoryPath> -->
- <passThrough> true </passThrough>
- </mailet>
- </processor>
-
<!-- Processor CONFIGURATION SAMPLE: error is the processor mails with
failure conditions enter -->
<processor name="error">
@@ -266,7 +230,6 @@
<!-- Out of the box, this will log the message to a repository -->
<mailet match="All" class="ToRepository">
<repositoryPath>file://var/mail/spam/</repositoryPath>
- <!-- <repositoryPath> db://conf/spam.properties </repositoryPath> -->
</mailet>
</processor>
</spoolmanager>
@@ -306,27 +269,6 @@
</handler>
</remotemanager>
- <!-- WARNING - The IMAP server is only experimental, ie pre-alpha -->
- <imapserver>
-
- <port>143</port>
- <!-- <port>995</port> -->
- <!-- need to check what if any IMAP over SSL uses -->
- <!-- <bind> </bind> uncomment this if you want to bind to a specific
- inetaddress-->
- <!-- <useTLS>TRUE</useTLS> uncomment this if you want to use TLS (SSL)
- on this port -->
- <handler>
- <!-- helloName is the single host name this instance of James will
- use to identify itself for example, in SMTP and POP3 greetings. If
- autodetect is TRUE, James will attempt to discover its own name OR
- use 'localhost'. If autodetect is FALSE, James will use the value
- given OR 'localhost' -->
- <helloName autodetect="TRUE">myMailServer</helloName>
- <connectiontimeout>1800000</connectiontimeout>
- </handler>
- </imapserver>
-
<pop3server>
<port>110</port>
<!-- <port>995</port> -->
@@ -538,7 +480,7 @@
(Use of database or file-system is defined on a "per-repository" basis)
Note: Two user repositories are required for default configuration:
- LocalUsers - the users for whom you are providing POP3, IMAP or NNTP
+ LocalUsers - the users for whom you are providing POP3, NNTP, or
AUTH service
list-james - the users of the james@localhost mailiinglist
-->
@@ -615,7 +557,6 @@
<password>password</password>
</data-source>
-->
- <!--
<data-source name="maildb"
class="org.apache.avalon.excalibur.datasource.JdbcDataSource">
<driver>com.inet.tds.TdsDriver</driver>
@@ -623,7 +564,6 @@
<user>sa_james</user>
<password>blahblah</password>
</data-source>
- -->
</data-sources>
</database-connections>
1.4 +0 -2 jakarta-james/src/conf/james-server.xml
Index: james-server.xml
===================================================================
RCS file: /home/cvs/jakarta-james/src/conf/james-server.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- james-server.xml 2001/09/25 04:51:19 1.3
+++ james-server.xml 2001/10/31 14:30:17 1.4
@@ -26,8 +26,6 @@
<log-target name="dnsserver-target" location="/logs/dnsserver.log"/>
<category name="remotemanager" target="remotemanager-target" priority="DEBUG"/>
<log-target name="remotemanager-target" location="/logs/remotemanager.log"/>
- <category name="imapserver" target="imapserver-target" priority="DEBUG"/>
- <log-target name="imapserver-target" location="/logs/imapserver.log"/>
<category name="pop3server" target="pop3server-target" priority="DEBUG"/>
<log-target name="pop3server-target" location="/logs/pop3server.log"/>
<category name="smtpserver" target="smtpserver-target" priority="DEBUG"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>