Author: norman Date: Thu Sep 22 13:28:58 2011 New Revision: 1174123 URL: http://svn.apache.org/viewvc?rev=1174123&view=rev Log: Adjust for latest protocol changes
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java (original) +++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java Thu Sep 22 13:28:58 2011 @@ -23,8 +23,6 @@ import java.util.LinkedList; import java.util.List; import org.apache.james.protocols.api.handler.HandlersPackage; -import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger; -import org.apache.james.protocols.impl.log.LineHandlerResultLogger; import org.apache.james.protocols.smtp.core.ExpnCmdHandler; import org.apache.james.protocols.smtp.core.log.HookResultLogger; import org.apache.james.protocols.smtp.core.NoopCmdHandler; @@ -68,8 +66,6 @@ public class CoreCmdHandlerLoader implem // logging stuff private final String COMMANDHANDLERRESULTLOGGER = SMTPCommandHandlerResultLogger.class.getName(); - private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName(); - private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName(); private final String HOOKRESULTLOGGER = HookResultLogger.class.getName(); private final List<String> commands = new LinkedList<String>(); @@ -96,8 +92,6 @@ public class CoreCmdHandlerLoader implem // Add logging stuff commands.add(COMMANDHANDLERRESULTLOGGER); - commands.add(CONNECTHANDLERRESULTLOGGER); - commands.add(LINEHANDLERRESULTLOGGER); commands.add(HOOKRESULTLOGGER); } Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Thu Sep 22 13:28:58 2011 @@ -23,8 +23,6 @@ import java.util.LinkedList; import java.util.List; import org.apache.james.protocols.api.handler.HandlersPackage; -import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger; -import org.apache.james.protocols.impl.log.LineHandlerResultLogger; public class CoreCmdHandlerLoader implements HandlersPackage { @@ -48,8 +46,7 @@ public class CoreCmdHandlerLoader implem // logging stuff private final String COMMANDHANDLERRESULTLOGGER = POP3CommandHandlerResultLogger.class.getName(); - private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName(); - private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName(); + private final List<String> commands = new LinkedList<String>(); @@ -75,8 +72,6 @@ public class CoreCmdHandlerLoader implem // Add logging stuff commands.add(COMMANDHANDLERRESULTLOGGER); - commands.add(CONNECTHANDLERRESULTLOGGER); - commands.add(LINEHANDLERRESULTLOGGER); } /* Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java Thu Sep 22 13:28:58 2011 @@ -65,18 +65,18 @@ public class POP3CommandDispatcherLineHa } - public boolean onLine(POP3Session session, byte[] line) { + @Override + public void onLine(POP3Session session, byte[] line) { MailboxSession mSession = (MailboxSession) session.getState().get(POP3Session.MAILBOX_SESSION); // notify the mailboxmanager about the start of the processing manager.startProcessingRequest(mSession); // do the processing - boolean disconnect = super.onLine(session, line); + super.onLine(session, line); // notify the mailboxmanager about the end of the processing manager.endProcessingRequest(mSession); - return disconnect; } Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java Thu Sep 22 13:28:58 2011 @@ -31,14 +31,13 @@ public class WelcomeMessageHandler imple /** * @see org.apache.james.pop3server.ConnectHandler#onConnect(org.apache.james.pop3server.POP3Session) */ - public boolean onConnect(POP3Session session) { + public void onConnect(POP3Session session) { StringBuilder responseBuffer = new StringBuilder(); // Initially greet the connector // Format is: Sat, 24 Jan 1998 13:16:09 -0500 responseBuffer.append(session.getConfigurationData().getHelloName()).append(" POP3 server (").append(softwaretype).append(") ready "); POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, responseBuffer.toString()); session.writeResponse(response); - return false; } } Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java Thu Sep 22 13:28:58 2011 @@ -56,17 +56,10 @@ public abstract class AbstractConnectHan } } - /* - * (non-Javadoc) - * - * @see - * org.apache.james.protocols.api.ConnectHandlerResultHandler#onResponse - * (org.apache.james.protocols.api.ProtocolSession, boolean, long, - * org.apache.james.protocols.api.ConnectHandler) - */ - public boolean onResponse(ProtocolSession session, boolean response, long executionTime, ConnectHandler<S> handler) { - cStats.get(handler.getClass().getName()).increment(response); - return response; + + + public void onResponse(ProtocolSession session, long executionTime, ConnectHandler<S> handler) { + cStats.get(handler.getClass().getName()).increment(); } /* Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java Thu Sep 22 13:28:58 2011 @@ -51,9 +51,8 @@ public abstract class AbstractLineHandle * .apache.james.protocols.api.ProtocolSession, boolean, long, * org.apache.james.protocols.api.LineHandler) */ - public boolean onResponse(ProtocolSession session, boolean response, long executionTime, LineHandler<S> handler) { - lStats.get(handler.getClass().getName()).increment(response); - return response; + public void onResponse(ProtocolSession session, long executionTime, LineHandler<S> handler) { + lStats.get(handler.getClass().getName()).increment(); } /* Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java Thu Sep 22 13:28:58 2011 @@ -36,7 +36,6 @@ public class ConnectHandlerStats extends private String name; private String handlerName; private MBeanServer mbeanserver; - private AtomicLong disconnect = new AtomicLong(0); private AtomicLong all = new AtomicLong(0); public ConnectHandlerStats(String jmxName, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException { @@ -54,10 +53,7 @@ public class ConnectHandlerStats extends * * @param disconnected */ - public void increment(boolean disconnected) { - if (disconnected) { - disconnect.incrementAndGet(); - } + public void increment() { all.incrementAndGet(); } @@ -85,7 +81,7 @@ public class ConnectHandlerStats extends * @see org.apache.james.socket.HandlerStatsMBean#getDisconnect() */ public long getDisconnect() { - return disconnect.get(); + return 0; } /* Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java Thu Sep 22 13:28:58 2011 @@ -39,7 +39,6 @@ public class LineHandlerStats extends St private String name; private String handlerName; private MBeanServer mbeanserver; - private AtomicLong disconnect = new AtomicLong(0); private AtomicLong all = new AtomicLong(0); public LineHandlerStats(String jmxName, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException { @@ -57,10 +56,7 @@ public class LineHandlerStats extends St * * @param result */ - public void increment(boolean disconnected) { - if (disconnected) { - disconnect.incrementAndGet(); - } + public void increment() { all.incrementAndGet(); } @@ -88,7 +84,7 @@ public class LineHandlerStats extends St * @see org.apache.james.socket.HandlerStatsMBean#getDisconnect() */ public long getDisconnect() { - return disconnect.get(); + return 0; } /* Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Thu Sep 22 13:28:58 2011 @@ -23,8 +23,7 @@ import java.util.LinkedList; import java.util.List; import org.apache.james.protocols.api.handler.HandlersPackage; -import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger; -import org.apache.james.protocols.impl.log.LineHandlerResultLogger; + import org.apache.james.protocols.smtp.core.ExpnCmdHandler; import org.apache.james.protocols.smtp.core.HeloCmdHandler; import org.apache.james.protocols.smtp.core.HelpCmdHandler; @@ -76,8 +75,6 @@ public class CoreCmdHandlerLoader implem // logging stuff private final String COMMANDHANDLERRESULTLOGGER = SMTPCommandHandlerResultLogger.class.getName(); - private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName(); - private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName(); private final String HOOKRESULTLOGGER = HookResultLogger.class.getName(); private final List<String> commands = new LinkedList<String>(); @@ -112,8 +109,6 @@ public class CoreCmdHandlerLoader implem // Add logging stuff commands.add(COMMANDHANDLERRESULTLOGGER); - commands.add(CONNECTHANDLERRESULTLOGGER); - commands.add(LINEHANDLERRESULTLOGGER); commands.add(HOOKRESULTLOGGER); } Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?rev=1174123&r1=1174122&r2=1174123&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java Thu Sep 22 13:28:58 2011 @@ -61,7 +61,7 @@ public class POP3BeforeSMTPHandler imple /** * @see org.apache.james.smtpserver.protocol.ConnectHandler#onConnect(SMTPSession) */ - public boolean onConnect(SMTPSession session) { + public void onConnect(SMTPSession session) { // some kind of random cleanup process if (Math.random() > 0.99) { @@ -72,7 +72,6 @@ public class POP3BeforeSMTPHandler imple if (!session.isRelayingAllowed() && POP3BeforeSMTPHelper.isAuthorized(session.getRemoteIPAddress())) { session.setRelayingAllowed(true); } - return false; } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org