james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1206583 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ api/src/main/java/org/apache/james/protocols/api/handler/ lmtp/src/main/java/org/apache/james/protocols/lmtp/ smtp/src/main/java/org/apache/james/protoc...
Date Sat, 26 Nov 2011 20:50:18 GMT
Author: norman
Date: Sat Nov 26 20:50:16 2011
New Revision: 1206583

URL: http://svn.apache.org/viewvc?rev=1206583&view=rev
Log:
Make sure its usable with java5

Modified:
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureStreamResponseImpl.java
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java
    james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
    james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
    james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
    james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
    james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
    james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
Sat Nov 26 20:50:16 2011
@@ -20,10 +20,11 @@
 package org.apache.james.protocols.api;
 
 import java.io.InputStream;
-import java.nio.charset.Charset;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+
 import org.apache.james.protocols.api.FutureResponse.ResponseListener;
 
 
@@ -36,7 +37,6 @@ import org.apache.james.protocols.api.Fu
  */
 public abstract class AbstractProtocolTransport implements ProtocolTransport{
     
-    private final static Charset CHARSET =  Charset.forName("US-ASCII");
     private final static String CRLF = "\r\n";
 
     
@@ -142,7 +142,11 @@ public abstract class AbstractProtocolTr
                 builder.append(CRLF);
             }
         }
-        return builder.toString().getBytes(CHARSET);
+        try {
+            return builder.toString().getBytes("US-ASCII");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("No US-ASCII ?");
+        }
     }
     
 

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java
Sat Nov 26 20:50:16 2011
@@ -50,7 +50,10 @@ public class FutureResponseImpl implemen
             }
         }
     }
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.FutureResponse#addListener(org.apache.james.protocols.api.FutureResponse.ResponseListener)
+     */
     public synchronized void addListener(ResponseListener listener) {
         if (isReady()) {
             listener.onResponse(this);
@@ -62,7 +65,10 @@ public class FutureResponseImpl implemen
         }
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.FutureResponse#removeListener(org.apache.james.protocols.api.FutureResponse.ResponseListener)
+     */
     public synchronized void removeListener(ResponseListener listener) {
         if (!isReady()) {
             if (listeners != null) {
@@ -71,26 +77,38 @@ public class FutureResponseImpl implemen
         }
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.FutureResponse#isReady()
+     */
     public synchronized boolean isReady() {
         return response != null;
     }
     
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Response#getLines()
+     */
     public List<CharSequence> getLines() {
         checkReady();
         return response.getLines();
     }
 
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Response#getRetCode()
+     */
     public String getRetCode() {
         checkReady();
         return response.getRetCode();
     }
 
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Response#isEndSession()
+     */
     public boolean isEndSession() {
         checkReady();
         return response.isEndSession();

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureStreamResponseImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureStreamResponseImpl.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureStreamResponseImpl.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureStreamResponseImpl.java
Sat Nov 26 20:50:16 2011
@@ -32,7 +32,10 @@ public class FutureStreamResponseImpl ex
         }
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.StreamResponse#getStream()
+     */
     public InputStream getStream() {
         checkReady();
         return ((StreamResponse) response).getStream();

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
Sat Nov 26 20:50:16 2011
@@ -35,12 +35,18 @@ public class ProtocolImpl implements Pro
         this.chain = chain;
     }
     
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Protocol#getProtocolChain()
+     */
     public ProtocolHandlerChain getProtocolChain() {
         return chain;
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Protocol#newSession(org.apache.james.protocols.api.ProtocolTransport)
+     */
     public ProtocolSession newSession(ProtocolTransport transport) {
         return new ProtocolSessionImpl(logger, transport);
     }

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
Sat Nov 26 20:50:16 2011
@@ -48,12 +48,18 @@ public class ProtocolSessionImpl impleme
 
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.ProtocolSession#getLocalAddress()
+     */
     public InetSocketAddress getLocalAddress() {
         return transport.getLocalAddress();
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.ProtocolSession#getRemoteAddress()
+     */
     public InetSocketAddress getRemoteAddress() {
         return transport.getRemoteAddress();
     }
@@ -142,7 +148,6 @@ public class ProtocolSessionImpl impleme
      * This implementation just returns <code>null</code>. Sub-classes should
      * overwrite this if needed
      */
-    @Override
     public Response newLineTooLongResponse() {
         return null;
     }
@@ -151,7 +156,6 @@ public class ProtocolSessionImpl impleme
      * This implementation just returns <code>null</code>. Sub-classes should
      * overwrite this if needed
      */
-    @Override
     public Response newFatalErrorResponse() {
         return null;
     }
@@ -160,7 +164,6 @@ public class ProtocolSessionImpl impleme
      * This implementation just clears the sessions state. Sub-classes should
      * overwrite this if needed
      */
-    @Override
     public void resetState() {
         sessionState.clear();
     }

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java
Sat Nov 26 20:50:16 2011
@@ -19,7 +19,7 @@
 
 package org.apache.james.protocols.api.handler;
 
-import java.nio.charset.Charset;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -47,9 +47,7 @@ public abstract class AbstractCommandDis
     private HashMap<String, List<CommandHandler<Session>>> commandHandlerMap
= new HashMap<String, List<CommandHandler<Session>>>();
 
     private List<ProtocolHandlerResultHandler<Response, Session>> rHandlers =
new ArrayList<ProtocolHandlerResultHandler<Response, Session>>();
-    
-    private final Charset charset = Charset.forName(getLineDecodingCharset());
-    
+        
     /**
      * Add it to map (key as command name, value is an array list of CommandHandlers)
      *
@@ -131,48 +129,55 @@ public abstract class AbstractCommandDis
     public Response onLine(final Session session, byte[] line) {
         String curCommandName = null;
         String curCommandArgument = null;
-        String cmdString = new String(line, charset).trim(); 
-        int spaceIndex = cmdString.indexOf(" ");
-        if (spaceIndex > 0) {
-            curCommandName = cmdString.substring(0, spaceIndex);
-            curCommandArgument = cmdString.substring(spaceIndex + 1);
-        } else {
-            curCommandName = cmdString;
-        }
-        curCommandName = curCommandName.toUpperCase(Locale.US);
+        String cmdString;
+        try {
+            cmdString = new String(line, getLineDecodingCharset()).trim();
+            int spaceIndex = cmdString.indexOf(" ");
+            if (spaceIndex > 0) {
+                curCommandName = cmdString.substring(0, spaceIndex);
+                curCommandArgument = cmdString.substring(spaceIndex + 1);
+            } else {
+                curCommandName = cmdString;
+            }
+            curCommandName = curCommandName.toUpperCase(Locale.US);
 
-        if (session.getLogger().isDebugEnabled()) {
-            session.getLogger().debug(getClass().getName() + " received: " + cmdString);
-        }
-        List<CommandHandler<Session>> commandHandlers = getCommandHandlers(curCommandName,
session);
-        // fetch the command handlers registered to the command
+            if (session.getLogger().isDebugEnabled()) {
+                session.getLogger().debug(getClass().getName() + " received: " + cmdString);
+            }
+            List<CommandHandler<Session>> commandHandlers = getCommandHandlers(curCommandName,
session);
+            // fetch the command handlers registered to the command
 
-        BaseRequest request = new BaseRequest(curCommandName, curCommandArgument);
-        Iterator<CommandHandler<Session>> handlers = commandHandlers.iterator();
-        
-        while (handlers.hasNext()) {
-            final long start = System.currentTimeMillis();
-            CommandHandler<Session> cHandler = handlers.next();
-            Response response = cHandler.onCommand(session, request);
-            if (response != null) {
-                long executionTime = System.currentTimeMillis() - start;
-
-                // now process the result handlers
-                for (int a = 0; a < rHandlers.size(); a++) {
-                    // Disable till PROTOCOLS-37 is implemented
-                    if (response instanceof FutureResponse) {
-                        session.getLogger().debug("ProtocolHandlerResultHandler are not supported
for FutureResponse yet");
-                        break;
-                    } 
-                    response = rHandlers.get(a).onResponse(session, response, executionTime,
(CommandHandler<Session>) cHandler);
+            BaseRequest request = new BaseRequest(curCommandName, curCommandArgument);
+            Iterator<CommandHandler<Session>> handlers = commandHandlers.iterator();
+            
+            while (handlers.hasNext()) {
+                final long start = System.currentTimeMillis();
+                CommandHandler<Session> cHandler = handlers.next();
+                Response response = cHandler.onCommand(session, request);
+                if (response != null) {
+                    long executionTime = System.currentTimeMillis() - start;
+
+                    // now process the result handlers
+                    for (int a = 0; a < rHandlers.size(); a++) {
+                        // Disable till PROTOCOLS-37 is implemented
+                        if (response instanceof FutureResponse) {
+                            session.getLogger().debug("ProtocolHandlerResultHandler are not
supported for FutureResponse yet");
+                            break;
+                        } 
+                        response = rHandlers.get(a).onResponse(session, response, executionTime,
(CommandHandler<Session>) cHandler);
+                    }
+                }
+                if (response != null) {
+                    return response;
                 }
-            }
-            if (response != null) {
-                return response;
-            }
 
-        }
+            }
+        } catch (UnsupportedEncodingException e) {
+            // Should never happen !
+            e.printStackTrace();
+        } 
         return null;
+
        
     }
 

Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
(original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
Sat Nov 26 20:50:16 2011
@@ -66,37 +66,58 @@ public class ProtocolHandlerChainImpl ex
         return Collections.unmodifiableList(handlers);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#size()
+     */
     public int size() {
         return handlers.size();
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#isEmpty()
+     */
     public boolean isEmpty() {
         return handlers.isEmpty();
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#contains(java.lang.Object)
+     */
     public boolean contains(Object o) {
         return handlers.contains(o);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#iterator()
+     */
     public Iterator<ProtocolHandler> iterator() {
         return new ProtocolHandlerIterator(handlers.listIterator());
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#toArray()
+     */
     public Object[] toArray() {
         return handlers.toArray();
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#toArray(T[])
+     */
     public <T> T[] toArray(T[] a) {
         return handlers.toArray(a);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#remove(java.lang.Object)
+     */
     public boolean remove(Object o) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -104,12 +125,18 @@ public class ProtocolHandlerChainImpl ex
         return handlers.remove(o);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#containsAll(java.util.Collection)
+     */
     public boolean containsAll(Collection<?> c) {
         return handlers.containsAll(c);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#addAll(java.util.Collection)
+     */
     public boolean addAll(Collection<? extends ProtocolHandler> c) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -117,7 +144,10 @@ public class ProtocolHandlerChainImpl ex
         return handlers.addAll(c);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#addAll(int, java.util.Collection)
+     */
     public boolean addAll(int index, Collection<? extends ProtocolHandler> c) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -125,7 +155,10 @@ public class ProtocolHandlerChainImpl ex
         return handlers.addAll(index, c);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#removeAll(java.util.Collection)
+     */
     public boolean removeAll(Collection<?> c) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -133,12 +166,18 @@ public class ProtocolHandlerChainImpl ex
         return handlers.removeAll(c);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#retainAll(java.util.Collection)
+     */
     public boolean retainAll(Collection<?> c) {
         return handlers.retainAll(c);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#clear()
+     */
     public void clear() {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -146,12 +185,18 @@ public class ProtocolHandlerChainImpl ex
         handlers.clear();
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#get(int)
+     */
     public ProtocolHandler get(int index) {
         return (ProtocolHandler) handlers.get(index);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#set(int, java.lang.Object)
+     */
     public ProtocolHandler set(int index, ProtocolHandler element) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -159,7 +204,10 @@ public class ProtocolHandlerChainImpl ex
         return (ProtocolHandler) handlers.set(index, element);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#add(int, java.lang.Object)
+     */
     public void add(int index, ProtocolHandler element) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -167,7 +215,10 @@ public class ProtocolHandlerChainImpl ex
         handlers.add(index, element);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#remove(int)
+     */
     public ProtocolHandler remove(int index) {
         if (readyOnly) {
             throw new UnsupportedOperationException("Ready-only");
@@ -175,27 +226,44 @@ public class ProtocolHandlerChainImpl ex
         return (ProtocolHandler) handlers.remove(index);
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#indexOf(java.lang.Object)
+     */
     public int indexOf(Object o) {
         return handlers.indexOf(o);
     }
 
-    @Override
+
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#lastIndexOf(java.lang.Object)
+     */
     public int lastIndexOf(Object o) {
         return handlers.lastIndexOf(o);
     }
 
-    @Override
+    /*
+     * 
+     * (non-Javadoc)
+     * @see java.util.List#listIterator()
+     */
     public ListIterator<ProtocolHandler> listIterator() {
         return new ProtocolHandlerIterator(handlers.listIterator());
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#listIterator(int)
+     */
     public ListIterator<ProtocolHandler> listIterator(int index) {
         return new ProtocolHandlerIterator(handlers.listIterator(index));
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see java.util.List#subList(int, int)
+     */
     public List<ProtocolHandler> subList(int fromIndex, int toIndex) {
         List<ProtocolHandler> sList = new ArrayList<ProtocolHandler>();
         for (Object handler : handlers.subList(fromIndex, toIndex)) {
@@ -214,37 +282,58 @@ public class ProtocolHandlerChainImpl ex
             this.handlers = handlers;
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#hasNext()
+         */
         public boolean hasNext() {
             return handlers.hasNext();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#next()
+         */
         public ProtocolHandler next() {
             return (ProtocolHandler) handlers.next();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#hasPrevious()
+         */
         public boolean hasPrevious() {
             return handlers.hasPrevious();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#previous()
+         */
         public ProtocolHandler previous() {
             return handlers.previous();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#nextIndex()
+         */
         public int nextIndex() {
             return handlers.nextIndex();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#previousIndex()
+         */
         public int previousIndex() {
             return handlers.previousIndex();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#remove()
+         */
         public void remove() {
             if (readyOnly) {
                 throw new UnsupportedOperationException("Ready-only");
@@ -252,7 +341,10 @@ public class ProtocolHandlerChainImpl ex
             handlers.previousIndex();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#set(java.lang.Object)
+         */
         public void set(ProtocolHandler e) {
             if (readyOnly) {
                 throw new UnsupportedOperationException("Ready-only");
@@ -260,7 +352,10 @@ public class ProtocolHandlerChainImpl ex
             handlers.set(e);
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.ListIterator#add(java.lang.Object)
+         */
         public void add(ProtocolHandler e) {
             if (readyOnly) {
                 throw new UnsupportedOperationException("Ready-only");

Modified: james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
(original)
+++ james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
Sat Nov 26 20:50:16 2011
@@ -22,22 +22,34 @@ import org.apache.james.protocols.smtp.S
 
 public abstract class LMTPConfiguration implements SMTPConfiguration{
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#isRelayingAllowed(java.lang.String)
+     */
     public boolean isRelayingAllowed(String remoteIP) {
         return false;
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#isAuthRequired(java.lang.String)
+     */
     public boolean isAuthRequired(String remoteIP) {
         return false;
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement()
+     */
     public boolean useHeloEhloEnforcement() {
         return false;
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement()
+     */
     public boolean useAddressBracketsEnforcement() {
         return false;
     }

Modified: james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
(original)
+++ james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
Sat Nov 26 20:50:16 2011
@@ -24,7 +24,10 @@ public class LMTPConfigurationImpl exten
     private long maxMessageSize = 0;
     private String greeting = "JAMES Protocols LMTP Server";
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
+     */
     public String getHelloName() {
         return helloName;
     }
@@ -34,7 +37,10 @@ public class LMTPConfigurationImpl exten
     }
     
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
+     */
     public long getMaxMessageSize() {
         return maxMessageSize;
     }
@@ -44,7 +50,10 @@ public class LMTPConfigurationImpl exten
     }
     
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.SMTPConfiguration#getSMTPGreeting()
+     */
     public String getSMTPGreeting() {
         return greeting;
     }

Modified: james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
(original)
+++ james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
Sat Nov 26 20:50:16 2011
@@ -37,12 +37,18 @@ public class LMTPMultiResponse implement
         
     }
     
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Response#getRetCode()
+     */
     public String getRetCode() {
         return responses.get(0).getRetCode();
     }
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Response#getLines()
+     */
     public List<CharSequence> getLines() {
         List<CharSequence> lines = new ArrayList<CharSequence>();
         for (Response response: responses) {
@@ -52,7 +58,10 @@ public class LMTPMultiResponse implement
     }
 
 
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.Response#isEndSession()
+     */
     public boolean isEndSession() {
         for (Response response: responses) {
             if (response.isEndSession()) {

Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
(original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
Sat Nov 26 20:50:16 2011
@@ -106,17 +106,26 @@ public abstract class AbstractHookableCm
                     if ((hRes.getResult() & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT)
{
                         return new Response() {
                             
-                            @Override
+                            /*
+                             * (non-Javadoc)
+                             * @see org.apache.james.protocols.api.Response#isEndSession()
+                             */
                             public boolean isEndSession() {
                                 return true;
                             }
                             
-                            @Override
+                            /*
+                             * (non-Javadoc)
+                             * @see org.apache.james.protocols.api.Response#getRetCode()
+                             */
                             public String getRetCode() {
                                 return response.getRetCode();
                             }
                             
-                            @Override
+                            /*
+                             * (non-Javadoc)
+                             * @see org.apache.james.protocols.api.Response#getLines()
+                             */
                             public List<CharSequence> getLines() {
                                 return response.getLines();
                             }

Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java?rev=1206583&r1=1206582&r2=1206583&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
(original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
Sat Nov 26 20:50:16 2011
@@ -41,7 +41,10 @@ public class MaxUnknownCmdHandler implem
         this.maxUnknown = maxUnknown;
     }
     
-    @Override
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.smtp.hook.UnknownHook#doUnknown(org.apache.james.protocols.smtp.SMTPSession,
java.lang.String)
+     */
     public HookResult doUnknown(SMTPSession session, String command) {
         Integer count = (Integer) session.getState().get(UNKOWN_COMMAND_COUNT);
         if (count == null) {



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


Mime
View raw message