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 hb...@apache.org on 2001/04/29 09:42:41 UTC
cvs commit: jakarta-james/src/org/apache/james/imapserver BaseCommand.java SingleThreadedConnectionHandler.java
hbedi 01/04/29 00:42:41
Modified: src/org/apache/james/imapserver BaseCommand.java
SingleThreadedConnectionHandler.java
Log:
The Hello Name(greeting) is obtained from the configuration file.
james/BaseConnectionHandler handles the hello name and other
ConnectionHandlers derive from it.
Revision Changes Path
1.6 +2 -1 jakarta-james/src/org/apache/james/imapserver/BaseCommand.java
Index: BaseCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/BaseCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseCommand.java 2001/04/28 12:43:13 1.5
+++ BaseCommand.java 2001/04/29 07:42:40 1.6
@@ -16,6 +16,7 @@
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
+import org.apache.james.BaseConnectionHandler;
import org.apache.james.core.EnhancedMimeMessage;
@@ -28,7 +29,7 @@
*/
public abstract class BaseCommand
- extends AbstractLoggable {
+ extends BaseConnectionHandler {
//mainly to switch on stack traces and catch responses;
private static final boolean DEEP_DEBUG = true;
1.18 +3 -17 jakarta-james/src/org/apache/james/imapserver/SingleThreadedConnectionHandler.java
Index: SingleThreadedConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SingleThreadedConnectionHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SingleThreadedConnectionHandler.java 2001/04/28 15:14:37 1.17
+++ SingleThreadedConnectionHandler.java 2001/04/29 07:42:40 1.18
@@ -47,7 +47,7 @@
*/
public class SingleThreadedConnectionHandler
extends BaseCommand
- implements ConnectionHandler, Contextualizable, Composable, Configurable,
+ implements ConnectionHandler, Composable, Configurable,
Initializable, Disposable, Target, MailboxEventListener {
//mainly to switch on stack traces and catch responses;
@@ -100,7 +100,6 @@
private MailServer mailServer;
private UsersRepository users;
private TimeScheduler scheduler;
- private int timeout;
private Socket socket;
private BufferedReader in;
@@ -108,7 +107,6 @@
private OutputStream outs;
private String remoteHost;
private String remoteIP;
- private String servername;
private String softwaretype = "JAMES IMAP4rev1 Server " + Constants.SOFTWARE_VERSION;
private int state;
private String user;
@@ -147,18 +145,6 @@
lookup("org.apache.james.imapserver.Host");
}
- public void contextualize( final Context context )
- throws ContextException {
- servername = (String)context.get( Constants.HELO_NAME );
- if ( servername == null )
- servername = "IMAPServer";
- }
-
- public void configure( final Configuration configuration )
- throws ConfigurationException {
- timeout = configuration.getChild( "connectiontimeout" ).getValueAsInteger( 1800000 );
- }
-
public void initialize() throws Exception {
getLogger().info("SingleThreadedConnectionHandler starting ...");
namespaceToken = imapSystem.getNamespaceToken();
@@ -203,7 +189,7 @@
} else {
if (false) { // connection is pre-authenticated
out.println(UNTAGGED + SP + "PREAUTH" + SP + VERSION + SP
- + "server" + SP + this.servername + SP
+ + "server" + SP + this.helloName + SP
+ "logged in as" + SP + user);
state = AUTHENTICATED;
user = "preauth user";
@@ -212,7 +198,7 @@
+ ") received by SingleThreadedConnectionHandler");
} else {
out.println(UNTAGGED + SP + OK + SP + VERSION + SP
- + "server " + this.servername + SP + "ready.");
+ + "server " + this.helloName + SP + "ready.");
state = NON_AUTHENTICATED;
user = "unknown";
securityLogger.info("Non-authenticated connection from "
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org