Applied, thanks. ----- Original Message ----- From: "Gabriel Bucher" <[EMAIL PROTECTED]> To: "Darrell DeBoer" <[EMAIL PROTECTED]> Sent: Sunday, January 13, 2002 11:07 PM Subject: [Patch] rmi-remotemanager proposal (tag: v2-0a2candidate1)
> Hi Darrell, > > I send you the patches for the rmi-remotemanager proposal directly. > Could you update the cvs 'tag: v2-0a2candidate1' with the following > patch. The config files are really out of date! > > please delete also the following files (the changes are already in the > man tree!): > - > proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java > - proposals/rmi-remotemanager/java/org/apache/james/services/UsersStore.java > > Thank you. > > I will check the rmi-remotemanger proposal also in the latest cvs. If > its ok, will send you the patches directly to you. > > Cheers, > Buchi > ---------------------------------------------------------------------------- ---- > Index: build.xml > =================================================================== > RCS file: /home/cvspublic/jakarta-james/proposals/rmi-remotemanager/build.xml,v > retrieving revision 1.1 > diff -u -r1.1 build.xml > --- build.xml 26 Oct 2001 05:06:54 -0000 1.1 > +++ build.xml 13 Jan 2002 12:54:27 -0000 > @@ -31,7 +31,7 @@ > > <property name="name" value="james"/> > <property name="Name" value="James"/> > - <property name="version" value="2.0a1-dev"/> > + <property name="version" value="2.0a2"/> > <property name="year" value="1999-2001"/> > > <!-- There should be no need to override default compiler but need to change > Index: conf/james-assembly.xml > =================================================================== > RCS file: /home/cvspublic/jakarta-james/proposals/rmi-remotemanager/conf/james-assembl y.xml,v > retrieving revision 1.1 > diff -u -r1.1 james-assembly.xml > --- conf/james-assembly.xml 26 Oct 2001 05:06:54 -0000 1.1 > +++ conf/james-assembly.xml 13 Jan 2002 12:54:27 -0000 > @@ -13,18 +13,20 @@ > <provide name="users-store" role="org.apache.james.services.UsersStore"/> > <provide name="sockets" > role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> > - <provide name="connections" > + <provide name="connections" > role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/> > <provide name="scheduler" > role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> > + <provide name="database-connections" > + role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" /> > </block> > > <!-- The James Spool Manager block --> > - <block class="org.apache.james.transport.JamesSpoolManager" > + <block class="org.apache.james.transport.JamesSpoolManager" > name="spoolmanager" > > <provide name="James" role="org.apache.mailet.MailetContext"/> > <provide name="mailstore" role="org.apache.james.services.MailStore"/> > - <provide name="thread-manager" > + <provide name="thread-manager" > role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> > </block> > > @@ -35,38 +37,24 @@ > <provide name="users-store" role="org.apache.james.services.UsersStore"/> > <provide name="sockets" > role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> > - <provide name="connections" > + <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> > - > <block class="org.apache.james.remotemanager.RMIRemoteManager" name="rmiremotemanager" > > <provide name="users-store" role="org.apache.james.services.UsersStore"/> > <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"/> > <provide name="users-store" role="org.apache.james.services.UsersStore"/> > <provide name="sockets" > role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> > - <provide name="connections" > + <provide name="connections" > role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/> > <provide name="scheduler" > role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> > @@ -79,7 +67,7 @@ > <provide name="users-store" role="org.apache.james.services.UsersStore"/> > <provide name="sockets" > role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> > - <provide name="connections" > + <provide name="connections" > role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/> > <provide name="scheduler" > role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> > @@ -88,11 +76,10 @@ > > <!-- NNTP Server --> > <block class="org.apache.james.nntpserver.NNTPServer" name="nntpserver" > > - <provide name="mailstore" role="org.apache.james.services.MailStore"/> > - <provide name="users-store" role="org.apache.james.services.UsersStore"/> > + <provide name="nntpauth" role="org.apache.james.nntpserver.AuthService"/> > <provide name="sockets" > role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> > - <provide name="connections" > + <provide name="connections" > role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/> > <provide name="scheduler" > role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> > @@ -100,6 +87,11 @@ > role="org.apache.james.nntpserver.repository.NNTPRepository"/> > </block> > > + <!-- NNTP Authentication Service --> > + <block class="org.apache.james.nntpserver.AuthServiceImpl" name="nntpauth" > > + <provide name="users-store" role="org.apache.james.services.UsersStore"/> > + </block> > + > <!-- NNTP Repository --> > <block class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" name="nntp-repository" > > </block> > @@ -107,11 +99,11 @@ > <!-- The High Level Storage block --> > <block class="org.apache.james.core.AvalonMailStore" name="mailstore" > > <provide name="objectstorage" > - role="org.apache.avalon.cornerstone.services.store.Store"/> > + role="org.apache.avalon.cornerstone.services.store.Store"/> > <provide name="database-connections" > role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" /> > </block> > - > + > <!-- The User Storage block --> > <block class="org.apache.james.core.AvalonUsersStore" name="users-store" > > <!-- Configure file based user store here, defaults should be fine --> > @@ -120,21 +112,21 @@ > <provide name="database-connections" > role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" /> > </block> > - > + > > <!-- Configuration for Cornerstone Blocks only after here > NOTHING BELOW THIS SHOULD NEED CHANGING, > (unless you want secure sockets (TLS)) --> > > <!-- The Storage block --> > - <block class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager" > + <block class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager" > name="objectstorage"> > </block> > > <!-- The Connection Manager block --> > - <block class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionMana ger" > + <block class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionMana ger" > name="connections"> > - <provide name="thread-manager" > + <provide name="thread-manager" > role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> > </block> > > @@ -143,18 +135,18 @@ > name="sockets"/> > > <!-- The Time Manager block --> > - <block class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" > + <block class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" > name="scheduler"> > - <provide name="thread-manager" > + <provide name="thread-manager" > role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> > </block> > - > + > <!-- The DataSourceSelector block --> > - <block class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSele ctor" > + <block class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSele ctor" > name="database-connections"/> > > <!-- The ThreadManager block --> > - <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" > + <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" > name="thread-manager" /> > > </assembly> > Index: conf/james-config.xml > =================================================================== > RCS file: /home/cvspublic/jakarta-james/proposals/rmi-remotemanager/conf/james-config. xml,v > retrieving revision 1.1 > diff -u -r1.1 james-config.xml > --- conf/james-config.xml 26 Oct 2001 05:06:54 -0000 1.1 > +++ conf/james-config.xml 13 Jan 2002 12:54:29 -0000 > @@ -13,8 +13,8 @@ > CONFIRM? comment in the left > margin. > > - This is $Revision: 1.1 $ > - Committed on $Date: 2001/10/26 05:06:54 $ by: $Author: serge $ > + This is $Revision: 1.19 $ > + Committed on $Date: 2001/12/05 22:31:18 $ by: $Author: serge $ > --> > <config> > > @@ -43,28 +43,6 @@ > 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) --> > @@ -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> > @@ -99,10 +75,10 @@ > > <!-- Set the packages from which to load mailets and matches --> > <mailetpackages> > - <mailetpackage>org.apache.james.transport.mailets.</mailetpackage> > + <mailetpackage>org.apache.james.transport.mailets</mailetpackage> > </mailetpackages> > <matcherpackages> > - <matcherpackage>org.apache.james.transport.matchers.</matcherpackage> > + <matcherpackage>org.apache.james.transport.matchers</matcherpackage> > </matcherpackages> > > <!-- Processor CONFIGURATION SAMPLE: > @@ -142,24 +118,6 @@ > <mailet match="RecipientIs=badboy@badhost" class="Null"> > </mailet> > > - <!-- Sample listserv wrapping a local avalon list of users. --> > - <mailet match="CommandForListserv=james@localhost" > - class="AvalonListservManager"> > - <repositoryName>list-james</repositoryName> > - </mailet> > - > - <mailet match="RecipientIs=james@localhost" class="AvalonListserv"> > - <membersonly> false </membersonly> > - <attachmentsallowed> true </attachmentsallowed> > - <replytolist> true </replytolist> > - <repositoryName>list-james</repositoryName> > - <subjectprefix>JamesList</subjectprefix> > - </mailet> > - > - <mailet match="[EMAIL PROTECTED]" 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 +125,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 +216,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> > @@ -344,27 +293,6 @@ > </objects> > </rmiremotemanager> > > - <!-- 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> --> > @@ -434,11 +362,14 @@ > given OR 'localhost' --> > <helloName autodetect="TRUE">myMailServer</helloName> > <connectiontimeout>120000</connectiontimeout> > - <!-- make this true, if you want only authenticated users to access NNTP--> > - <authRequired>false</authRequired> > </handler> > </nntpserver> > > + <nntpauth> > + <!-- make this true, if you want only authenticated users to access NNTP--> > + <authRequired>false</authRequired> > + </nntpauth> > + > <nntp-repository> > <!-- make this true to disallow posting to all newsgroups--> > <readOnly>false</readOnly> > @@ -576,7 +507,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 > --> > @@ -646,16 +577,14 @@ > --> > <!-- > <data-source name="maildb" > - class="org.apache.avalon.excalibur.datasource.JdbcDataSource"> > + class="org.apache.james.util.mordred.JdbcDataSource"> > <driver>org.gjt.mm.mysql.Driver</driver> > <dburl>jdbc:mysql://127.0.0.1/mail</dburl> > <user>username</user> > <password>password</password> > </data-source> > - --> > - <!-- > <data-source name="maildb" > - class="org.apache.avalon.excalibur.datasource.JdbcDataSource"> > + class="org.apache.james.util.mordred.JdbcDataSource"> > <driver>com.inet.tds.TdsDriver</driver> > <dburl>jdbc:inetdae7:127.0.0.1?database=James</dburl> > <user>sa_james</user> > -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
