Peter M. Goldstein (Mon, Oct 14, 2002 at 11:21:09AM CEST):
> I've committed your changes (or minor variations of them) to resolve
> points one through six. I'm hesitant to commit your proposed fix for
Thank you. But:
The files you committed missed a few subtleties of my patches
and introduced some minor bugs. I append new patches:
1) james-server.xml:
Index: james-server.xml
===================================================================
RCS file: /home/cvspublic/jakarta-james/proposals/imap/conf/james-server.xml,v
retrieving revision 1.3
diff -u -r1.3 james-server.xml
--- james-server.xml 14 Oct 2002 07:03:49 -0000 1.3
+++ james-server.xml 21 Oct 2002 20:55:34 -0000
@@ -26,7 +26,7 @@
<category name="remotemanager" log-level="DEBUG">
<log-target id-ref="remotemanager-target"/>
</category>
- <category name="imapserver" log-level="DEBUG"/>
+ <category name="imapserver" log-level="DEBUG">
<log-target id-ref="imapserver-target"/>
</category>
<category name="pop3server" log-level="DEBUG">
2) james-config.xml:
Index: james-config.xml
===================================================================
RCS file: /home/cvspublic/jakarta-james/proposals/imap/conf/james-config.xml,v
retrieving revision 1.4
diff -u -r1.4 james-config.xml
--- james-config.xml 14 Oct 2002 07:03:49 -0000 1.4
+++ james-config.xml 21 Oct 2002 20:54:51 -0000
@@ -42,7 +42,7 @@
<usernames ignoreCase="true" enableAliases="true" enableForwarding="true"/>
<!-- Set the type of permanent mailfolders to be used. -->
- <!-- If IMAP service is to be provided, the storage type
+ <!-- If IMAP service is to be provided, the storage type -->
<!-- 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. -->
3) james-assembly.xml removed several scheduler-dependencies.
Now James refuses to start up, so I restored them:
Index: james-assembly.xml
===================================================================
RCS file: /home/cvspublic/jakarta-james/proposals/imap/conf/james-assembly.xml,v
retrieving revision 1.4
diff -u -r1.4 james-assembly.xml
--- james-assembly.xml 14 Oct 2002 07:03:49 -0000 1.4
+++ james-assembly.xml 21 Oct 2002 20:53:53 -0000
@@ -56,6 +56,8 @@
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>
@@ -90,6 +92,8 @@
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>
@@ -102,6 +106,8 @@
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>
@@ -112,6 +118,8 @@
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="nntp-repository"
role="org.apache.james.nntpserver.repository.NNTPRepository"/>
</block>
4) build.xml didn't get committed.
The <exclude> elements are not strictly necessary if the version of
James.java in the IMAP branch is newer than the main one but that's
a big "if".
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-james/proposals/imap/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- build.xml 27 Sep 2002 08:49:11 -0000 1.6
+++ build.xml 21 Oct 2002 20:56:26 -0000
@@ -176,6 +176,7 @@
<chmod perm="+x">
<fileset dir="${dist.dir}/bin">
<include name="run.sh"/>
+ <include name="phoenix.sh"/>
</fileset>
</chmod>
<fixcrlf srcdir="." includes="build.sh" eol="lf"/>
@@ -194,6 +195,8 @@
<include name="**/*.properties"/>
<include name="**/*.xinfo"/>
<include name="**/*.mxinfo"/>
+ <exclude name="org/apache/james/James.java"/>
+ <exclude name="org/apache/james/James.xinfo"/>
</fileset>
</copy>
<copy todir="${build.src}">
Bye,
Peter
--
To unsubscribe, e-mail: <mailto:james-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:james-dev-help@;jakarta.apache.org>
