Author: rdonkin
Date: Wed Sep 16 09:20:19 2009
New Revision: 815683
URL: http://svn.apache.org/viewvc?rev=815683&view=rev
Log:
JAMES-920 Improve naming https://issues.apache.org/jira/browse/JAMES-920
Added:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
- copied, changed from r815640,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
- copied, changed from r815640,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolContext.java
- copied, changed from r815618,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
Removed:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
Modified:
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/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.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
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Copied:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
(from r815640,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java&r1=815640&r2=815683&rev=815683&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
Wed Sep 16 09:20:19 2009
@@ -59,7 +59,7 @@
* inherit from this abstract implementation.
*
*/
-public abstract class AbstractJamesService extends AbstractHandlerFactory
+public abstract class AbstractProtocolServer extends AbstractHandlerFactory
implements Serviceable, Configurable, Disposable,
ConnectionHandlerFactory, ObjectFactory {
/**
@@ -700,7 +700,7 @@
*/
protected ConnectionHandler newHandler()
throws Exception {
- DelegatingJamesHandler theHandler =
(DelegatingJamesHandler)theHandlerPool.get();
+ JamesConnectionBridge theHandler =
(JamesConnectionBridge)theHandlerPool.get();
if (getLogger().isDebugEnabled()) {
getLogger().debug("Handler [" + theHandler + "] obtained from
pool.");
@@ -817,8 +817,8 @@
*/
public Object newInstance() throws Exception {
final String name = "Handler-" + handlerCount.getAndAdd(1);
- final DelegatingJamesHandler delegatingJamesHandler =
- new DelegatingJamesHandler(newProtocolHandlerInstance(),
dnsServer, name, getLogger());
+ final JamesConnectionBridge delegatingJamesHandler =
+ new JamesConnectionBridge(newProtocolHandlerInstance(), dnsServer,
name, getLogger());
return delegatingJamesHandler;
}
@@ -828,7 +828,7 @@
* @see org.apache.avalon.excalibur.pool.ObjectFactory#getCreatedClass()
*/
public Class getCreatedClass() {
- return DelegatingJamesHandler.class;
+ return JamesConnectionBridge.class;
}
}
Copied:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
(from r815640,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java&r1=815640&r2=815683&rev=815683&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
Wed Sep 16 09:20:19 2009
@@ -42,7 +42,7 @@
/**
* Common Handler code
*/
-public class DelegatingJamesHandler implements ProtocolHandlerHelper,
ConnectionHandler, Poolable, WatchdogTarget {
+public class JamesConnectionBridge implements ProtocolContext,
ConnectionHandler, Poolable, WatchdogTarget {
private static final int DEFAULT_OUTPUT_BUFFER_SIZE = 1024;
@@ -118,7 +118,7 @@
private final Log log;
- public DelegatingJamesHandler(final ProtocolHandler delegated, final
DNSService dnsServer, final String name,
+ public JamesConnectionBridge(final ProtocolHandler delegated, final
DNSService dnsServer, final String name,
final Logger logger) {
this.protocolHandler = delegated;
this.dnsServer = dnsServer;
@@ -438,7 +438,7 @@
}
/**
- * @see
org.apache.james.socket.ProtocolHandlerHelper#defaultErrorHandler(java.lang.RuntimeException)
+ * @see
org.apache.james.socket.ProtocolContext#defaultErrorHandler(java.lang.RuntimeException)
*/
public void defaultErrorHandler(RuntimeException e) {
if (log.isErrorEnabled()) {
@@ -448,63 +448,63 @@
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getRemoteIP()
+ * @see org.apache.james.socket.ProtocolContext#getRemoteIP()
*/
public String getRemoteIP() {
return remoteIP;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getInputReader()
+ * @see org.apache.james.socket.ProtocolContext#getInputReader()
*/
public CRLFTerminatedReader getInputReader() {
return inReader;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getInputStream()
+ * @see org.apache.james.socket.ProtocolContext#getInputStream()
*/
public InputStream getInputStream() {
return in;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getOutputStream()
+ * @see org.apache.james.socket.ProtocolContext#getOutputStream()
*/
public OutputStream getOutputStream() {
return outs;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getOutputWriter()
+ * @see org.apache.james.socket.ProtocolContext#getOutputWriter()
*/
public PrintWriter getOutputWriter() {
return out;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getRemoteHost()
+ * @see org.apache.james.socket.ProtocolContext#getRemoteHost()
*/
public String getRemoteHost() {
return remoteHost;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getWatchdog()
+ * @see org.apache.james.socket.ProtocolContext#getWatchdog()
*/
public Watchdog getWatchdog() {
return theWatchdog;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getSocket()
+ * @see org.apache.james.socket.ProtocolContext#getSocket()
*/
public Socket getSocket() {
return socket;
}
/**
- * @see org.apache.james.socket.ProtocolHandlerHelper#getLogger()
+ * @see org.apache.james.socket.ProtocolContext#getLogger()
*/
public Log getLogger() {
return log;
Copied:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolContext.java
(from r815618,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolContext.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolContext.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java&r1=815618&r2=815683&rev=815683&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolContext.java
Wed Sep 16 09:20:19 2009
@@ -30,7 +30,7 @@
* This is the helper interface provided to ProtocolHandlers to let them
* communicate with the outside world.
*/
-public interface ProtocolHandlerHelper {
+public interface ProtocolContext {
/**
* Writes a response to the client and flush it.
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=815683&r1=815682&r2=815683&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 09:20:19 2009
@@ -40,7 +40,7 @@
* Injects the ProtocolHandlerHelper service
* @param phh service
*/
- public void setProtocolHandlerHelper(ProtocolHandlerHelper phh);
+ public void setProtocolHandlerHelper(ProtocolContext phh);
/**
* Provides errorHandling
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=815683&r1=815682&r2=815683&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 09:20:19 2009
@@ -31,7 +31,7 @@
import org.apache.james.imap.main.ImapSessionImpl;
import org.apache.james.imap.main.OutputStreamImapResponseWriter;
import org.apache.james.socket.ProtocolHandler;
-import org.apache.james.socket.ProtocolHandlerHelper;
+import org.apache.james.socket.ProtocolContext;
/**
* Handles IMAP connections.
@@ -39,7 +39,7 @@
public class ImapHandler implements ProtocolHandler
{
- private ProtocolHandlerHelper helper;
+ 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'};
@@ -133,7 +133,7 @@
return helper.getLogger();
}
- public void setProtocolHandlerHelper(ProtocolHandlerHelper phh) {
+ public void setProtocolHandlerHelper(ProtocolContext phh) {
this.helper = phh;
}
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=815683&r1=815682&r2=815683&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
Wed Sep 16 09:20:19 2009
@@ -39,7 +39,7 @@
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.main.ImapRequestHandler;
import org.apache.james.services.FileSystem;
-import org.apache.james.socket.AbstractJamesService;
+import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.ProtocolHandler;
import org.apache.jsieve.mailet.Poster;
@@ -51,7 +51,7 @@
*
* <p>Also responsible for loading and parsing IMAP specific configuration.</p>
*/
-public class ImapServer extends AbstractJamesService implements ImapConstants,
Poster
+public class ImapServer extends AbstractProtocolServer implements
ImapConstants, Poster
{
private static final String softwaretype = "JAMES "+VERSION+" Server " +
Constants.SOFTWARE_VERSION;
@@ -90,14 +90,14 @@
}
/**
- * @see AbstractJamesService#getDefaultPort()
+ * @see AbstractProtocolServer#getDefaultPort()
*/
protected int getDefaultPort() {
return 143;
}
/**
- * @see AbstractJamesService#getServiceType()
+ * @see AbstractProtocolServer#getServiceType()
*/
public String getServiceType() {
return "IMAP Service";
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=815683&r1=815682&r2=815683&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 09:20:19 2009
@@ -25,7 +25,7 @@
import org.apache.james.nntpserver.repository.NNTPArticle;
import org.apache.james.nntpserver.repository.NNTPGroup;
import org.apache.james.socket.ProtocolHandler;
-import org.apache.james.socket.ProtocolHandlerHelper;
+import org.apache.james.socket.ProtocolContext;
import org.apache.james.util.stream.CharTerminatedInputStream;
import org.apache.james.util.stream.DotStuffingInputStream;
import org.apache.james.util.stream.ExtraDotOutputStream;
@@ -57,7 +57,7 @@
*/
public class NNTPHandler implements ProtocolHandler {
- private ProtocolHandlerHelper helper;
+ private ProtocolContext helper;
/**
* used to calculate DATE from - see 11.3
@@ -1509,7 +1509,7 @@
}
}
- public void setProtocolHandlerHelper(ProtocolHandlerHelper phh) {
+ public void setProtocolHandlerHelper(ProtocolContext phh) {
this.helper = phh;
}
Modified:
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java?rev=815683&r1=815682&r2=815683&view=diff
==============================================================================
---
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
(original)
+++
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
Wed Sep 16 09:20:19 2009
@@ -28,14 +28,14 @@
import org.apache.james.api.user.UsersRepository;
import org.apache.james.nntpserver.repository.NNTPRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.AbstractJamesService;
+import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.ProtocolHandler;
/**
* NNTP Server
*
*/
-public class NNTPServer extends AbstractJamesService implements
NNTPServerMBean {
+public class NNTPServer extends AbstractProtocolServer implements
NNTPServerMBean {
/**
* Whether authentication is required to access this NNTP server
@@ -118,21 +118,21 @@
}
/**
- * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
+ * @see org.apache.james.socket.AbstractProtocolServer#getDefaultPort()
*/
protected int getDefaultPort() {
return 119;
}
/**
- * @see org.apache.james.socket.AbstractJamesService#getServiceType()
+ * @see org.apache.james.socket.AbstractProtocolServer#getServiceType()
*/
public String getServiceType() {
return "NNTP Service";
}
/**
- * @see
org.apache.james.socket.AbstractJamesService#newProtocolHandlerInstance()
+ * @see
org.apache.james.socket.AbstractProtocolServer#newProtocolHandlerInstance()
*/
public ProtocolHandler newProtocolHandlerInstance() {
final NNTPHandler handler = new NNTPHandler(theConfigData);
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=815683&r1=815682&r2=815683&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 09:20:19 2009
@@ -27,7 +27,7 @@
import org.apache.james.services.MailRepository;
import org.apache.james.socket.CRLFTerminatedReader;
import org.apache.james.socket.ProtocolHandler;
-import org.apache.james.socket.ProtocolHandlerHelper;
+import org.apache.james.socket.ProtocolContext;
import org.apache.james.socket.Watchdog;
import org.apache.mailet.Mail;
@@ -45,7 +45,7 @@
*/
public class POP3Handler implements POP3Session, ProtocolHandler {
- private ProtocolHandlerHelper helper;
+ private ProtocolContext helper;
private final static byte COMMAND_MODE = 1;
private final static byte RESPONSE_MODE = 2;
@@ -492,9 +492,9 @@
}
/**
- * @see
org.apache.james.socket.ProtocolHandler#setProtocolHandlerHelper(org.apache.james.socket.ProtocolHandlerHelper)
+ * @see
org.apache.james.socket.ProtocolHandler#setProtocolHandlerHelper(org.apache.james.socket.ProtocolContext)
*/
- public void setProtocolHandlerHelper(ProtocolHandlerHelper phh) {
+ public void setProtocolHandlerHelper(ProtocolContext phh) {
this.helper = phh;
}
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java?rev=815683&r1=815682&r2=815683&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
Wed Sep 16 09:20:19 2009
@@ -28,7 +28,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.AbstractJamesService;
+import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.ProtocolHandler;
/**
@@ -38,7 +38,7 @@
*
* @version 1.0.0, 24/04/1999
*/
-public class POP3Server extends AbstractJamesService implements
POP3ServerMBean {
+public class POP3Server extends AbstractProtocolServer implements
POP3ServerMBean {
/**
* The handler chain - POP3handlers can lookup handlerchain to obtain
@@ -122,14 +122,14 @@
}
/**
- * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
+ * @see org.apache.james.socket.AbstractProtocolServer#getDefaultPort()
*/
protected int getDefaultPort() {
return 110;
}
/**
- * @see org.apache.james.socket.AbstractJamesService#getServiceType()
+ * @see org.apache.james.socket.AbstractProtocolServer#getServiceType()
*/
public String getServiceType() {
return "POP3 Service";
@@ -137,7 +137,7 @@
/**
- * @see
org.apache.james.socket.AbstractJamesService#newProtocolHandlerInstance()
+ * @see
org.apache.james.socket.AbstractProtocolServer#newProtocolHandlerInstance()
*/
public ProtocolHandler newProtocolHandlerInstance() {
//pass the handler chain to every POP3handler
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=815683&r1=815682&r2=815683&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
Wed Sep 16 09:20:19 2009
@@ -36,7 +36,7 @@
import org.apache.james.management.ProcessorManagementService;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.AbstractJamesService;
+import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.ProtocolHandler;
import java.util.ArrayList;
@@ -52,7 +52,7 @@
* @version 1.0.0, 24/04/1999
*/
public class RemoteManager
- extends AbstractJamesService implements RemoteManagerMBean {
+ extends AbstractProtocolServer implements RemoteManagerMBean {
/**
* A HashMap of (user id, passwords) for James administrators
@@ -274,21 +274,21 @@
}
/**
- * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
+ * @see org.apache.james.socket.AbstractProtocolServer#getDefaultPort()
*/
protected int getDefaultPort() {
return 4555;
}
/**
- * @see org.apache.james.socket.AbstractJamesService#getServiceType()
+ * @see org.apache.james.socket.AbstractProtocolServer#getServiceType()
*/
public String getServiceType() {
return "Remote Manager Service";
}
/**
- * @see
org.apache.james.socket.AbstractJamesService#newProtocolHandlerInstance()
+ * @see
org.apache.james.socket.AbstractProtocolServer#newProtocolHandlerInstance()
*/
public ProtocolHandler newProtocolHandlerInstance() {
return new RemoteManagerHandler(theConfigData);
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=815683&r1=815682&r2=815683&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 09:20:19 2009
@@ -44,7 +44,7 @@
import org.apache.james.management.ProcessorManagementService;
import org.apache.james.management.SpoolFilter;
import org.apache.james.socket.ProtocolHandler;
-import org.apache.james.socket.ProtocolHandlerHelper;
+import org.apache.james.socket.ProtocolContext;
import org.apache.mailet.MailAddress;
@@ -60,7 +60,7 @@
*/
public class RemoteManagerHandler implements ProtocolHandler {
- private ProtocolHandlerHelper helper;
+ private ProtocolContext helper;
private static final Class[] WORKER_METHOD_PARAMETERSET = new Class[]
{String.class};
@@ -1745,7 +1745,7 @@
}
- public void setProtocolHandlerHelper(ProtocolHandlerHelper phh) {
+ public void setProtocolHandlerHelper(ProtocolContext phh) {
this.helper = 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=815683&r1=815682&r2=815683&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 09:20:19 2009
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.james.socket.CRLFDelimitedByteBuffer;
import org.apache.james.socket.ProtocolHandler;
-import org.apache.james.socket.ProtocolHandlerHelper;
+import org.apache.james.socket.ProtocolContext;
/**
* Provides SMTP functionality by carrying out the server side of the SMTP
@@ -39,7 +39,7 @@
*/
public class SMTPHandler implements ProtocolHandler, SMTPSession {
- private ProtocolHandlerHelper helper;
+ private ProtocolContext helper;
private boolean sessionEnded = false;
@@ -375,7 +375,7 @@
helper.defaultErrorHandler(e);
}
- public void setProtocolHandlerHelper(ProtocolHandlerHelper phh) {
+ public void setProtocolHandlerHelper(ProtocolContext phh) {
helper = phh;
}
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=815683&r1=815682&r2=815683&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Wed Sep 16 09:20:19 2009
@@ -33,7 +33,7 @@
import org.apache.james.api.dnsservice.util.NetMatcher;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.AbstractJamesService;
+import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.ProtocolHandler;
import org.apache.mailet.MailetContext;
@@ -48,7 +48,7 @@
* IMPORTANT: SMTPServer extends AbstractJamesService. If you implement ANY
* lifecycle methods, you MUST call super.<method> as well.
*/
-public class SMTPServer extends AbstractJamesService implements
SMTPServerMBean {
+public class SMTPServer extends AbstractProtocolServer implements
SMTPServerMBean {
/**
@@ -261,14 +261,14 @@
}
/**
- * @see org.apache.james.core.AbstractJamesService#getDefaultPort()
+ * @see org.apache.james.core.AbstractProtocolServer#getDefaultPort()
*/
protected int getDefaultPort() {
return 25;
}
/**
- * @see org.apache.james.core.AbstractJamesService#getServiceType()
+ * @see org.apache.james.core.AbstractProtocolServer#getServiceType()
*/
public String getServiceType() {
return "SMTP Service";
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
