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 no...@apache.org on 2005/05/03 07:43:14 UTC
svn commit: r167864 -
/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
Author: noel
Date: Mon May 2 22:43:14 2005
New Revision: 167864
URL: http://svn.apache.org/viewcvs?rev=167864&view=rev
Log:
merge smtpserver from v2 and trunk. avalon updates
Modified:
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java?rev=167864&r1=167863&r2=167864&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java Mon May 2 22:43:14 2005
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation. *
+ * Copyright (c) 1999-2005 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -30,6 +30,8 @@
import org.apache.james.util.watchdog.BytesReadResetInputStream;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.dates.RFC822DateFormat;
import org.apache.mailet.MailAddress;
import javax.mail.MessagingException;
import java.io.*;
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java?rev=167864&r1=167863&r2=167864&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java Mon May 2 22:43:14 2005
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation. *
+ * Copyright (c) 1999-2005 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -23,15 +23,12 @@
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
@@ -126,17 +123,17 @@
= new SMTPHandlerConfigurationDataImpl();
/**
- * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
+ * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
*/
- public void compose(final ComponentManager componentManager) throws ComponentException {
- super.compose(componentManager);
- mailetcontext = (MailetContext) componentManager.lookup("org.apache.mailet.MailetContext");
- mailServer = (MailServer) componentManager.lookup("org.apache.james.services.MailServer");
+ public void service( final ServiceManager manager ) throws ServiceException {
+ super.service( manager );
+ mailetcontext = (MailetContext) manager.lookup("org.apache.mailet.MailetContext");
+ mailServer = (MailServer) manager.lookup("org.apache.james.services.MailServer");
UsersStore usersStore =
- (UsersStore) componentManager.lookup("org.apache.james.services.UsersStore");
+ (UsersStore) manager.lookup("org.apache.james.services.UsersStore");
users = usersStore.getRepository("LocalUsers");
if (users == null) {
- throw new ComponentException("The user repository could not be found.");
+ throw new ServiceException("","The user repository could not be found.");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org