Author: rdonkin
Date: Wed Sep 16 14:05:37 2009
New Revision: 815791
URL: http://svn.apache.org/viewvc?rev=815791&view=rev
Log:
JAMES-920 Switch from helper set by setter to context set on handle
https://issues.apache.org/jira/browse/JAMES-920
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
Wed Sep 16 14:05:37 2009
@@ -122,7 +122,6 @@
final Logger logger) {
this.protocolHandler = delegated;
this.dnsServer = dnsServer;
- this.protocolHandler.setProtocolHandlerHelper(this);
if (name == null) {
this.name = DEFAULT_NAME;
} else {
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
Wed Sep 16 14:05:37 2009
@@ -21,6 +21,9 @@
import java.io.IOException;
+/**
+ * Handles protocol interactions.
+ */
public interface ProtocolHandler {
/**
@@ -35,13 +38,6 @@
* Resets the handler data to a basic state.
*/
public abstract void resetHandler();
-
-
- /**
- * Injects the ProtocolHandlerHelper service
- * @param phh service
- */
- public void setProtocolHandlerHelper(ProtocolContext phh);
/**
* Called when a fatal failure occurs during processing.
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
Wed Sep 16 14:05:37 2009
@@ -21,7 +21,6 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
@@ -36,8 +35,6 @@
*/
public class ImapHandler implements ProtocolHandler
{
-
- private ProtocolContext helper;
private static final byte[] EMERGENCY_SIGNOFF = {'*',' ', 'B', 'Y', 'E', '
',
'S', 'e', 'r', 'v', 'e', 'r', ' ', 'f', 'a', 'u', 'l', 't', '\r',
'\n'};
@@ -56,15 +53,9 @@
* Resets the handler data to a basic state.
*/
public void resetHandler() {
-
// Clear user data
- try {
- if (session != null) {
- session.logout();
- }
- } catch (Exception e) {
- getLogger().warn("Failed to close mailbox: " + e.getMessage());
- getLogger().debug(e.getMessage(), e);
+ if (session != null) {
+ session.logout();
}
session = null;
}
@@ -73,7 +64,7 @@
* @see ProtocolHandler#handleProtocol(ProtocolContext)
*/
public void handleProtocol(final ProtocolContext context) throws
IOException {
- getLogger().debug(
+ context.getLogger().debug(
"Connection from " + context.getRemoteHost() + " (" +
context.getRemoteIP()
+ ") opened.");
final OutputStreamImapResponseWriter writer = new
OutputStreamImapResponseWriter( context.getOutputStream() );
@@ -94,7 +85,7 @@
session.logout();
}
- getLogger().info(
+ context.getLogger().info(
"Connection from " + context.getRemoteHost() + " (" +
context.getRemoteIP()
+ ") closed.");
}
@@ -123,17 +114,8 @@
try {
context.getOutputStream().write(EMERGENCY_SIGNOFF);
} catch (Throwable t) {
- getLogger().debug("Write emergency signoff failed.", t);
+ context.getLogger().debug("Write emergency signoff failed.", t);
}
}
-
- public Log getLogger() {
- return helper.getLogger();
- }
-
- public void setProtocolHandlerHelper(ProtocolContext phh) {
- this.helper = phh;
- }
-
}
Modified:
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
(original)
+++
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
Wed Sep 16 14:05:37 2009
@@ -1535,6 +1535,4 @@
return false;
}
}
-
- public void setProtocolHandlerHelper(ProtocolContext phh) {}
}
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
Wed Sep 16 14:05:37 2009
@@ -490,10 +490,4 @@
public OutputStream getOutputStream() {
return context.getOutputStream();
}
-
- /**
- * @see
org.apache.james.socket.ProtocolHandler#setProtocolHandlerHelper(org.apache.james.socket.ProtocolContext)
- */
- public void setProtocolHandlerHelper(ProtocolContext phh) {
- }
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Wed Sep 16 14:05:37 2009
@@ -54,9 +54,6 @@
*
* TODO: -improve protocol
* -much more...
- *
- * @version $Revision$
- *
*/
public class RemoteManagerHandler implements ProtocolHandler {
@@ -1793,7 +1790,4 @@
return userList;
}
-
-
- public void setProtocolHandlerHelper(ProtocolContext phh) {}
}
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=815791&r1=815790&r2=815791&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Wed Sep 16 14:05:37 2009
@@ -374,8 +374,6 @@
public void fatalFailure(RuntimeException e, ProtocolContext context) {
}
-
- public void setProtocolHandlerHelper(ProtocolContext phh) {}
public String getHelloName() {
return getConfigurationData().getHelloName();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
