Index: SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.30
diff -u -r1.30 SMTPHandler.java
--- SMTPHandler.java	2 Oct 2002 06:57:56 -0000	1.30
+++ SMTPHandler.java	13 Oct 2002 18:02:24 -0000
@@ -223,11 +223,6 @@
     private int lengthReset = 20000;
                                     
     /**
-     * The scheduler used to handle timeouts for the SMTP interaction.
-     */
-    private TimeScheduler scheduler;
-
-    /**
      * The user repository for this server - used to authenticate
      * users.
      */
@@ -252,9 +247,6 @@
      */
     public void compose(final ComponentManager componentManager) throws ComponentException {
         mailServer = (MailServer) componentManager.lookup("org.apache.james.services.MailServer");
-        scheduler =
-            (TimeScheduler) componentManager.lookup(
-                "org.apache.avalon.cornerstone.services.scheduler.TimeScheduler");
         UsersStore usersStore =
             (UsersStore) componentManager.lookup("org.apache.james.services.UsersStore");
         users = usersStore.getRepository("LocalUsers");
@@ -326,7 +318,7 @@
             // Format is:  Sat, 24 Jan 1998 13:16:09 -0500
 
             final PeriodicTimeTrigger trigger = new PeriodicTimeTrigger( timeout, -1 );
-            scheduler.addTrigger( this.toString(), trigger, this );
+            scheduler.addTrigger( getID(), trigger, this );
             StringBuffer responseBuffer =
                 new StringBuffer(192)
                     .append("220 ")
@@ -339,10 +331,10 @@
             writeLoggedFlushedResponse(responseString);
 
             while (parseCommand(readCommandLine())) {
-                scheduler.resetTrigger(this.toString());
+                scheduler.resetTrigger(getID());
             }
             getLogger().debug("Closing socket.");
-            scheduler.removeTrigger(this.toString());
+            scheduler.removeTrigger(getID());
         } catch (SocketException se) {
             if (getLogger().isDebugEnabled()) {
                 StringBuffer errorBuffer = 
@@ -1156,7 +1148,7 @@
             try {
                 // Setup the input stream to notify the scheduler periodically
                 InputStream msgIn =
-                    new SchedulerNotifyInputStream(in, scheduler, this.toString(), 20000);
+                    new SchedulerNotifyInputStream(in, scheduler, getID(), 20000);
                 // Look for data termination
                 msgIn = new CharTerminatedInputStream(msgIn, SMTPTerminator);
                 // if the message size limit has been set, we'll