Author: bago
Date: Wed Oct 14 11:59:52 2009
New Revision: 825099
URL: http://svn.apache.org/viewvc?rev=825099&view=rev
Log:
create a o.a.j.socket.api package and moved some common interface/util to that
package (JAMES-931)
Added:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
(contents, props changed)
- copied, changed from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFTerminatedReader.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java
(contents, props changed)
- copied, changed from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java
(contents, props changed)
- copied, changed from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandler.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java
(contents, props changed)
- copied, changed from r825094,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerFactory.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java
(contents, props changed)
- copied, changed from r825089,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolServer.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java
(contents, props changed)
- copied, changed from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
Removed:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFTerminatedReader.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandler.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerFactory.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolServer.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
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/SchedulerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.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/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.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/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.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
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
Wed Oct 14 11:59:52 2009
@@ -22,9 +22,9 @@
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.socket.shared.ProtocolHandler;
-import org.apache.james.socket.shared.ProtocolHandlerFactory;
-import org.apache.james.socket.shared.ProtocolServer;
+import org.apache.james.socket.api.ProtocolHandler;
+import org.apache.james.socket.api.ProtocolHandlerFactory;
+import org.apache.james.socket.api.ProtocolServer;
/**
* Server which creates connection handlers. All new James service must
@@ -87,14 +87,14 @@
public abstract ProtocolHandler newProtocolHandlerInstance();
/**
- * @see
org.apache.james.socket.shared.ProtocolHandlerFactory#prepare(org.apache.james.socket.shared.ProtocolServer)
+ * @see
org.apache.james.socket.api.ProtocolHandlerFactory#prepare(org.apache.james.socket.api.ProtocolServer)
*/
public void prepare(ProtocolServer server) throws Exception {
prepareInit();
}
/**
- * @see org.apache.james.socket.shared.ProtocolHandlerFactory#init()
+ * @see org.apache.james.socket.api.ProtocolHandlerFactory#init()
*/
public void init() throws Exception {
doInit();
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
Wed Oct 14 11:59:52 2009
@@ -56,9 +56,9 @@
import org.apache.excalibur.thread.ThreadPool;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.FileSystem;
-import org.apache.james.socket.shared.ProtocolHandlerFactory;
-import org.apache.james.socket.shared.ProtocolServer;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.ProtocolHandlerFactory;
+import org.apache.james.socket.api.ProtocolServer;
+import org.apache.james.socket.api.Watchdog;
/**
* Server which creates connection handlers.
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
Wed Oct 14 11:59:52 2009
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.Watchdog;
/**
* This will reset the Watchdog each time a certain amount of data has
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
Wed Oct 14 11:59:52 2009
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.Watchdog;
/**
* This will reset the Watchdog each time a certain amount of data has
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
Wed Oct 14 11:59:52 2009
@@ -21,7 +21,7 @@
package org.apache.james.socket;
import org.apache.excalibur.thread.ThreadPool;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.Watchdog;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -40,12 +40,12 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.logging.Log;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.socket.shared.CRLFTerminatedReader;
-import org.apache.james.socket.shared.ProtocolContext;
-import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.api.CRLFTerminatedReader;
+import org.apache.james.socket.api.ProtocolContext;
+import org.apache.james.socket.api.ProtocolHandler;
+import org.apache.james.socket.api.Watchdog;
import org.apache.james.socket.shared.SwitchableInputStream;
import org.apache.james.socket.shared.SwitchableOutputStream;
-import org.apache.james.socket.shared.Watchdog;
import org.apache.james.util.InternetPrintWriter;
/**
@@ -496,63 +496,63 @@
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getRemoteIP()
+ * @see org.apache.james.socket.api.ProtocolContext#getRemoteIP()
*/
public String getRemoteIP() {
return remoteIP;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getInputReader()
+ * @see org.apache.james.socket.api.ProtocolContext#getInputReader()
*/
public CRLFTerminatedReader getInputReader() {
return inReader;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getInputStream()
+ * @see org.apache.james.socket.api.ProtocolContext#getInputStream()
*/
public InputStream getInputStream() {
return in;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getOutputStream()
+ * @see org.apache.james.socket.api.ProtocolContext#getOutputStream()
*/
public OutputStream getOutputStream() {
return outs;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getOutputWriter()
+ * @see org.apache.james.socket.api.ProtocolContext#getOutputWriter()
*/
public PrintWriter getOutputWriter() {
return out;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getRemoteHost()
+ * @see org.apache.james.socket.api.ProtocolContext#getRemoteHost()
*/
public String getRemoteHost() {
return remoteHost;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getWatchdog()
+ * @see org.apache.james.socket.api.ProtocolContext#getWatchdog()
*/
public Watchdog getWatchdog() {
return theWatchdog;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#getLogger()
+ * @see org.apache.james.socket.api.ProtocolContext#getLogger()
*/
public Log getLogger() {
return log;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#isDisconnected()
+ * @see org.apache.james.socket.api.ProtocolContext#isDisconnected()
*/
public boolean isDisconnected() {
return socket == null;
@@ -566,14 +566,14 @@
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#isSecure()
+ * @see org.apache.james.socket.api.ProtocolContext#isSecure()
*/
public boolean isSecure() {
return secureEnabled;
}
/**
- * @see org.apache.james.socket.shared.ProtocolContext#secure()
+ * @see org.apache.james.socket.api.ProtocolContext#secure()
*/
public void secure() throws IOException {
if (factory == null) {
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
Wed Oct 14 11:59:52 2009
@@ -23,7 +23,7 @@
import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
import org.apache.avalon.cornerstone.services.scheduler.Target;
import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.Watchdog;
/**
* This class is a factory to produce Watchdogs, each of which is associated
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
Wed Oct 14 11:59:52 2009
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.thread.ThreadPool;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.Watchdog;
/**
* This class is a factory to produce Watchdogs, each of which is associated
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
Wed Oct 14 11:59:52 2009
@@ -20,7 +20,7 @@
package org.apache.james.socket;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.Watchdog;
/**
* This interface represents a factory for producing Watchdogs.
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -27,8 +27,8 @@
import org.apache.james.imap.main.ImapRequestHandler;
import org.apache.james.imap.main.ImapSessionImpl;
import org.apache.james.imap.main.OutputStreamImapResponseWriter;
-import org.apache.james.socket.shared.ProtocolContext;
-import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.api.ProtocolContext;
+import org.apache.james.socket.api.ProtocolHandler;
/**
* Handles IMAP connections.
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -40,7 +40,7 @@
import org.apache.james.imap.main.ImapRequestHandler;
import org.apache.james.services.FileSystem;
import org.apache.james.socket.AbstractProtocolServer;
-import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.api.ProtocolHandler;
import org.apache.jsieve.mailet.Poster;
/**
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -24,8 +24,8 @@
import org.apache.james.core.MailHeaders;
import org.apache.james.nntpserver.repository.NNTPArticle;
import org.apache.james.nntpserver.repository.NNTPGroup;
-import org.apache.james.socket.shared.ProtocolContext;
-import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.api.ProtocolContext;
+import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.util.stream.CharTerminatedInputStream;
import org.apache.james.util.stream.DotStuffingInputStream;
import org.apache.james.util.stream.ExtraDotOutputStream;
@@ -254,7 +254,7 @@
}
/**
- * @see
org.apache.james.socket.shared.ProtocolHandler#handleProtocol(ProtocolContext)
+ * @see
org.apache.james.socket.api.ProtocolHandler#handleProtocol(ProtocolContext)
*/
public void handleProtocol(ProtocolContext context) throws IOException {
// section 7.1
@@ -284,7 +284,7 @@
}
/**
- * @see
org.apache.james.socket.shared.ProtocolHandler#fatalFailure(java.lang.RuntimeException,
ProtocolContext)
+ * @see
org.apache.james.socket.api.ProtocolHandler#fatalFailure(java.lang.RuntimeException,
ProtocolContext)
*/
public void fatalFailure(final RuntimeException e, final ProtocolContext
context) {
// If the connection has been idled out, the
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -29,7 +29,7 @@
import org.apache.james.nntpserver.repository.NNTPRepository;
import org.apache.james.services.MailServer;
import org.apache.james.socket.AbstractProtocolServer;
-import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.api.ProtocolHandler;
/**
* NNTP Server
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -32,10 +32,10 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.MailRepository;
+import org.apache.james.socket.api.CRLFTerminatedReader;
+import org.apache.james.socket.api.ProtocolContext;
+import org.apache.james.socket.api.Watchdog;
import org.apache.james.socket.shared.AbstractProtocolHandler;
-import org.apache.james.socket.shared.CRLFTerminatedReader;
-import org.apache.james.socket.shared.ProtocolContext;
-import org.apache.james.socket.shared.Watchdog;
import org.apache.mailet.Mail;
/**
@@ -117,7 +117,7 @@
/**
- * @see
org.apache.james.socket.shared.AbstractProtocolHandler#handleProtocolInternal(org.apache.james.socket.shared.ProtocolContext)
+ * @see
org.apache.james.socket.shared.AbstractProtocolHandler#handleProtocolInternal(org.apache.james.socket.api.ProtocolContext)
*/
public void handleProtocolInternal(ProtocolContext context) throws
IOException {
this.context = context;
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -31,8 +31,8 @@
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
import org.apache.james.socket.AbstractProtocolServer;
+import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.configuration.JamesConfiguration;
-import org.apache.james.socket.shared.ProtocolHandler;
/**
* <p>Accepts POP3 connections on a server socket and dispatches them to
POP3Handlers.</p>
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
Wed Oct 14 11:59:52 2009
@@ -27,8 +27,8 @@
import java.util.Map;
import org.apache.james.services.MailRepository;
+import org.apache.james.socket.api.Watchdog;
import org.apache.james.socket.shared.TLSSupportedSession;
-import org.apache.james.socket.shared.Watchdog;
import org.apache.mailet.Mail;
/**
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -34,8 +34,8 @@
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
import org.apache.james.socket.AbstractProtocolServer;
+import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.configuration.JamesConfiguration;
-import org.apache.james.socket.shared.ProtocolHandler;
/**
* Provides a really rude network interface to administer James.
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -29,10 +29,10 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.james.socket.shared.CRLFTerminatedReader;
-import org.apache.james.socket.shared.ProtocolContext;
-import org.apache.james.socket.shared.ProtocolHandler;
-import org.apache.james.socket.shared.Watchdog;
+import org.apache.james.socket.api.CRLFTerminatedReader;
+import org.apache.james.socket.api.ProtocolContext;
+import org.apache.james.socket.api.ProtocolHandler;
+import org.apache.james.socket.api.Watchdog;
/**
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
Wed Oct 14 11:59:52 2009
@@ -21,8 +21,8 @@
import java.util.Map;
+import org.apache.james.socket.api.Watchdog;
import org.apache.james.socket.shared.LogEnabledSession;
-import org.apache.james.socket.shared.Watchdog;
public interface RemoteManagerSession extends LogEnabledSession{
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -28,9 +28,9 @@
import java.util.Map;
import java.util.Random;
+import org.apache.james.socket.api.ProtocolContext;
import org.apache.james.socket.shared.AbstractProtocolHandler;
import org.apache.james.socket.shared.CRLFDelimitedByteBuffer;
-import org.apache.james.socket.shared.ProtocolContext;
/**
* Provides SMTP functionality by carrying out the server side of the SMTP
@@ -91,7 +91,7 @@
}
/**
- * @see
org.apache.james.socket.shared.AbstractProtocolHandler#handleProtocolInternal(org.apache.james.socket.shared.ProtocolContext)
+ * @see
org.apache.james.socket.shared.AbstractProtocolHandler#handleProtocolInternal(org.apache.james.socket.api.ProtocolContext)
*/
public void handleProtocolInternal(ProtocolContext context) throws
IOException {
this.context = context;
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=825099&r1=825098&r2=825099&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 Oct 14 11:59:52 2009
@@ -33,8 +33,8 @@
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
import org.apache.james.socket.AbstractProtocolServer;
+import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.configuration.JamesConfiguration;
-import org.apache.james.socket.shared.ProtocolHandler;
import org.apache.mailet.MailetContext;
/**
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
(from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFTerminatedReader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFTerminatedReader.java&r1=824730&r2=825099&rev=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFTerminatedReader.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
Wed Oct 14 11:59:52 2009
@@ -19,7 +19,7 @@
-package org.apache.james.socket.shared;
+package org.apache.james.socket.api;
import java.io.InputStream;
import java.io.Reader;
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1.2.2
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/CRLFTerminatedReader.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java
(from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java&r1=824730&r2=825099&rev=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java
Wed Oct 14 11:59:52 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.socket.api;
import java.io.IOException;
import java.io.InputStream;
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java
(from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandler.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandler.java&r1=824730&r2=825099&rev=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandler.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java
Wed Oct 14 11:59:52 2009
@@ -17,10 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.socket.api;
import java.io.IOException;
+
/**
* Handles protocol interactions.
*/
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java
(from r825094,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerFactory.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerFactory.java&r1=825094&r2=825099&rev=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerFactory.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java
Wed Oct 14 11:59:52 2009
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.socket.api;
+
/**
* An interface each protocol factory will expose to socket services.
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolHandlerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java
(from r825089,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolServer.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolServer.java&r1=825089&r2=825099&rev=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolServer.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java
Wed Oct 14 11:59:52 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.socket.api;
/**
* Each socket provider implements this interface.
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/ProtocolServer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java
(from r824730,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java&r1=824730&r2=825099&rev=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java
Wed Oct 14 11:59:52 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.socket.api;
/**
* This interface represents an abstract watchdog process that serves to
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1.4.3
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/api/Watchdog.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java?rev=825099&r1=825098&r2=825099&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java
Wed Oct 14 11:59:52 2009
@@ -24,6 +24,8 @@
import java.io.IOException;
import org.apache.commons.logging.Log;
+import org.apache.james.socket.api.ProtocolContext;
+import org.apache.james.socket.api.ProtocolHandler;
/**
* Abstract base class for ProtocolHandler
@@ -36,7 +38,7 @@
private String user;
/**
- * @see org.apache.james.socket.shared.ProtocolHandler#resetHandler()
+ * @see org.apache.james.socket.api.ProtocolHandler#resetHandler()
*/
public void resetHandler() {
user = null;
@@ -44,7 +46,7 @@
}
/**
- * @see
org.apache.james.socket.shared.ProtocolHandler#handleProtocol(org.apache.james.socket.shared.ProtocolContext)
+ * @see
org.apache.james.socket.api.ProtocolHandler#handleProtocol(org.apache.james.socket.api.ProtocolContext)
*/
public void handleProtocol(ProtocolContext context) throws IOException {
this.context = context;
@@ -102,7 +104,7 @@
}
/**
- * @see
org.apache.james.socket.shared.ProtocolHandler#fatalFailure(java.lang.RuntimeException,
org.apache.james.socket.shared.ProtocolContext)
+ * @see
org.apache.james.socket.api.ProtocolHandler#fatalFailure(java.lang.RuntimeException,
org.apache.james.socket.api.ProtocolContext)
*/
public void fatalFailure(RuntimeException e, ProtocolContext context) {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
