svn commit: r1172483 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ smtp/src/main/java/org/apache/james/protocols/smtp/

[norman]

Author: norman
Date: Mon Sep 19 06:44:49 2011
New Revision: 1172483

URL: http://svn.apache.org/viewvc?rev=1172483&view=rev
Log:
Merge TLSSupportedSession with ProtocolSession

Removed:
    
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/TLSSupportedSession.java
Modified:
    
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
    
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
    
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java

Modified: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java?rev=1172483&r1=1172482&r2=1172483&view=diff
==============================================================================
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
 (original)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
 Mon Sep 19 06:44:49 2011
@@ -21,9 +21,9 @@ package org.apache.james.protocols.api;
 
 import java.net.InetSocketAddress;
 
+
 import org.apache.james.protocols.api.ProtocolTransport;
 import org.apache.james.protocols.api.Response;
-import org.apache.james.protocols.api.TLSSupportedSession;
 import org.slf4j.Logger;
 
 /**
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
  * 
  * 
  */
-public abstract class AbstractSession implements TLSSupportedSession {
+public abstract class AbstractSession implements ProtocolSession {
     protected InetSocketAddress socketAddress;
     private Logger logger;
     private SessionLog pLog = null;

Modified: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java?rev=1172483&r1=1172482&r2=1172483&view=diff
==============================================================================
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
 (original)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
 Mon Sep 19 06:44:49 2011
@@ -50,7 +50,8 @@ public interface ProtocolSession {
     void resetState();
     
     /**
-     * Write the response back to the client
+     * Write the response back to the client. Special care MUST be take to 
handle {@link StartTlsResponse} instances.
+     * 
      * 
      * @param response
      */
@@ -90,4 +91,33 @@ public interface ProtocolSession {
      * @return Response
      */
     Response newFatalErrorResponse();
+    
+    /**
+     * Returns the user name associated with this interaction.
+     *
+     * @return the user name
+     */
+    String getUser();
+
+    /**
+     * Sets the user name associated with this interaction.
+     *
+     * @param user the user name
+     */
+    void setUser(String user);
+
+    /**
+     * Return true if StartTLS is supported by the configuration
+     * 
+     * @return supported
+     */
+    boolean isStartTLSSupported();
+    
+    /**
+     * Return true if the starttls was started
+     * 
+     * @return true
+     */
+    boolean isTLSStarted();
+
 }

Modified: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java?rev=1172483&r1=1172482&r2=1172483&view=diff
==============================================================================
--- 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
 Mon Sep 19 06:44:49 2011
@@ -22,14 +22,14 @@ package org.apache.james.protocols.smtp;
 import java.util.Map;
 
 import org.apache.james.protocols.api.LineHandler;
-import org.apache.james.protocols.api.TLSSupportedSession;
+import org.apache.james.protocols.api.ProtocolSession;
 
 /**
  * All the handlers access this interface to communicate with
  * SMTPHandler object
  */
 
-public interface SMTPSession extends TLSSupportedSession{
+public interface SMTPSession extends ProtocolSession{
 
     // Keys used to store/lookup data in the internal state hash map
     /** Sender's email address */



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org