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 do...@apache.org on 2001/03/07 05:01:30 UTC
cvs commit: jakarta-james/src/org/apache/james/imapserver SingleThreadedConnectionHandler.java
donaldp 01/03/06 20:01:30
Modified: src/org/apache/james/imapserver
SingleThreadedConnectionHandler.java
Log:
Fixed a search replace gone bad.
Revision Changes Path
1.11 +15 -19 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SingleThreadedConnectionHandler.java 2001/03/07 03:55:25 1.10
+++ SingleThreadedConnectionHandler.java 2001/03/07 04:01:30 1.11
@@ -203,7 +203,7 @@
+ "logged in as" + SP + user);
state = AUTHENTICATED;
user = "preauth user";
- securityGetLogger().info("Pre-authenticated connection from "
+ securityLogger.info("Pre-authenticated connection from "
+ remoteHost + "(" + remoteIP
+ ") received by SingleThreadedConnectionHandler");
} else {
@@ -211,7 +211,7 @@
+ "server " + this.servername + SP + "ready.");
state = NON_AUTHENTICATED;
user = "unknown";
- securityGetLogger().info("Non-authenticated connection from "
+ securityLogger.info("Non-authenticated connection from "
+ remoteHost + "(" + remoteIP
+ ") received by SingleThreadedConnectionHandler");
}
@@ -370,7 +370,7 @@
out.println(tag + SP + NO + SP + "Auth type not supported.");
getLogger().info("Attempt to use Authenticate command by "
+ remoteHost + "(" + remoteIP + ")");
- securityGetLogger().info("Attempt to use Authenticate command by "
+ securityLogger.info("Attempt to use Authenticate command by "
+ remoteHost + "(" + remoteIP + ")");
return true;
} else if (command.equalsIgnoreCase("LOGIN")) {
@@ -384,7 +384,7 @@
user = decodeAstring(commandLine.nextToken());
String password = decodeAstring(commandLine.nextToken());
if (users.test(user, password)) {
- securityGetLogger().info("Login successful for " + user + " from "
+ securityLogger.info("Login successful for " + user + " from "
+ remoteHost + "(" + remoteIP + ")");
// four possibilites handled:
// private mail: isLocal, is Remote
@@ -435,7 +435,7 @@
} // failed password test
// We should add ability to monitor attempts to login
out.println(tag + SP + NO + SP + "LOGIN failed");
- securityGetLogger().error("Failed attempt to use Login command for account "
+ securityLogger.error("Failed attempt to use Login command for account "
+ user + " from " + remoteHost + "(" + remoteIP
+ ")");
return true;
@@ -535,13 +535,13 @@
if (target.setRights(user, identity, changes)) {
out.println(tag + SP + OK + SP
+ "SetACL command completed");
- securityGetLogger().info("ACL rights for " + identity + " in "
+ securityLogger.info("ACL rights for " + identity + " in "
+ folder + " changed by " + user + " : "
+ changes);
} else {
out.println(tag + SP + NO + SP
+ "SetACL command failed");
- securityGetLogger().info("Failed attempt to change ACL rights for "
+ securityLogger.info("Failed attempt to change ACL rights for "
+ identity + " in " + folder + " by "
+ user);
}
@@ -583,12 +583,12 @@
if (target.setRights(user, identity, changes)) {
out.println(tag + SP + OK + SP
+ "DeleteACL command completed");
- securityGetLogger().info("ACL rights for " + identity + " in "
+ securityLogger.info("ACL rights for " + identity + " in "
+ folder + " deleted by " + user);
} else {
out.println(tag + SP + NO + SP
+ "SetACL command failed");
- securityGetLogger().info("Failed attempt to change ACL rights for "
+ securityLogger.info("Failed attempt to change ACL rights for "
+ identity + " in " + folder + " by "
+ user);
}
@@ -1218,7 +1218,7 @@
return true;
}
CommandFetch fetcher = new CommandFetch();
- fetcher.setLogger(logger);
+ fetcher.setLogger( getLogger() );
fetcher.setRequest(request);
fetcher.service();
return true;
@@ -1231,7 +1231,7 @@
}
//storeCommand(commandLine, false);
CommandStore storer = new CommandStore();
- storer.setLogger(logger);
+ storer.setLogger( getLogger() );
storer.setRequest(request);
storer.service();
return true;
@@ -1245,13 +1245,13 @@
if (uidCommand.equalsIgnoreCase("STORE")) {
//storeCommand(commandLine, true);
CommandStore storer = new CommandStore();
- storer.setLogger(logger);
+ storer.setLogger( getLogger() );
storer.setRequest(request);
storer.service();
return true;
} else if (uidCommand.equalsIgnoreCase("FETCH")) {
CommandFetch fetcher = new CommandFetch();
- fetcher.setLogger(logger);
+ fetcher.setLogger( getLogger() );
fetcher.setRequest(request);
fetcher.service();
return true;
@@ -1327,14 +1327,14 @@
}
public void logACE(AccessControlException ace) {
- securityGetLogger().error("AccessControlException by user " + user
+ securityLogger.error("AccessControlException by user " + user
+ " from " + remoteHost + "(" + remoteIP
+ ") with " + commandRaw + " was "
+ ace.getMessage());
}
public void logAZE(AuthorizationException aze) {
- securityGetLogger().error("AuthorizationException by user " + user
+ securityLogger.error("AuthorizationException by user " + user
+ " from " + remoteHost + "(" + remoteIP
+ ") with " + commandRaw + " was "
+ aze.getMessage());
@@ -1350,10 +1350,6 @@
public String getUser() {
return user;
- }
-
- public Logger getLogger() {
- return logger;
}
private String decodeAstring(String rawAstring) {