? conf/samples
Index: conf/james-assembly.xml
===================================================================
RCS file: /home/cvspublic/james-server/proposals/imap2/conf/james-assembly.xml,v
retrieving revision 1.4
diff -u -r1.4 james-assembly.xml
--- conf/james-assembly.xml	17 Feb 2003 13:09:32 -0000	1.4
+++ conf/james-assembly.xml	13 May 2004 19:04:03 -0000
@@ -19,7 +19,7 @@
   <!-- -->
 
   <!-- The James block  -->
-  <block name="James" class="org.apache.james.JamesImap" >
+  <block name="James" class="org.apache.james.James" >
 
     <!-- Specify which components will provide the services required by this
     block. The roles are specified in the code and the .xinfo file. The names
@@ -30,13 +30,15 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+             role="org.apache.james.services.JamesConnectionManager"/>
     <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="imaphost"
              role="org.apache.james.imapserver.ImapHost"/>
+-->
   </block>
 
   <!-- The James Spool Manager block  -->
@@ -55,12 +57,13 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+             role="org.apache.james.services.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
   </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"/>
@@ -68,7 +71,7 @@
       <provide name="sockets"
                role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections"
-               role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+             role="org.apache.james.services.JamesConnectionManager"/>
       <provide name="James" role="org.apache.james.services.MailServer"/>
       <provide name="thread-manager"
                role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -79,6 +82,7 @@
   <block class="org.apache.james.imapserver.JamesImapHost" name="imaphost">
   </block>
 
+
   <!-- POP3 Server -->
   <block name="pop3server" class="org.apache.james.pop3server.POP3Server" >
     <provide name="mailstore" role="org.apache.james.services.MailStore"/>
@@ -86,7 +90,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+             role="org.apache.james.services.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -100,7 +104,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+             role="org.apache.james.services.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -112,7 +116,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+             role="org.apache.james.services.JamesConnectionManager"/>
     <provide name="nntp-repository"
              role="org.apache.james.nntpserver.repository.NNTPRepository"/>
     <provide name="thread-manager"
@@ -129,6 +133,15 @@
     <provide name="James" role="org.apache.james.services.MailServer"/>      
   </block>
 
+  <!-- FetchMail Service -->
+<!--
+  <block name="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" >
+    <provide name="scheduler"
+             role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> 
+    <provide name="James" role="org.apache.james.services.MailServer"/>      
+    <provide name="users-store" role="org.apache.james.services.UsersStore"/>          
+  </block>
+-->
   <!-- The High Level Storage block -->
   <block name="mailstore" class="org.apache.james.core.AvalonMailStore" >
     <provide name="objectstorage"
Index: java/org/apache/james/imapserver/ImapHandler.java
===================================================================
RCS file: /home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/ImapHandler.java,v
retrieving revision 1.10
diff -u -r1.10 ImapHandler.java
--- java/org/apache/james/imapserver/ImapHandler.java	30 Jan 2004 02:22:03 -0000	1.10
+++ java/org/apache/james/imapserver/ImapHandler.java	13 May 2004 19:04:03 -0000
@@ -26,6 +26,8 @@
 import org.apache.james.util.watchdog.Watchdog;
 import org.apache.james.util.watchdog.WatchdogTarget;
 import org.apache.mailet.MailRepository;
+import org.apache.mailet.User;
+
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -215,10 +217,15 @@
 
             //Write BYE message.
             if ( getLogger().isInfoEnabled() ) {
+		String user = "<unknown>";
+		User userObject = session.getUser();
+		if (null != userObject) {
+			user = userObject.getUserName();
+		}
                 StringBuffer logBuffer =
                         new StringBuffer( 128 )
                         .append( "Connection for " )
-                        .append( session.getUser().getUserName() )
+                        .append( user )
                         .append( " from " )
                         .append( remoteHost )
                         .append( " (" )
Index: java/org/apache/james/imapserver/ImapServer.xinfo
===================================================================
RCS file: /home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/ImapServer.xinfo,v
retrieving revision 1.2
diff -u -r1.2 ImapServer.xinfo
--- java/org/apache/james/imapserver/ImapServer.xinfo	17 Feb 2003 13:09:32 -0000	1.2
+++ java/org/apache/james/imapserver/ImapServer.xinfo	13 May 2004 19:04:03 -0000
@@ -15,7 +15,10 @@
       <service name="org.apache.james.services.UsersStore" version="1.0"/>
     </dependency>
     <dependency>
+<!--
       <service name="org.apache.avalon.cornerstone.services.connection.ConnectionManager" 
+-->
+      <service name="org.apache.james.services.JamesConnectionManager" 
                version="1.0"/>
     </dependency>
     <dependency>