Author: norman
Date: Fri Nov 18 17:49:21 2011
New Revision: 1203767
URL: http://svn.apache.org/viewvc?rev=1203767&view=rev
Log:
Fix compile error in smtp module introduced by refactoring
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?rev=1203767&r1=1203766&r2=1203767&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
Fri Nov 18 17:49:21 2011
@@ -20,8 +20,8 @@ package org.apache.james.protocols.smtp;
import java.util.Collection;
+import org.apache.james.protocols.api.ProtocolSessionImpl;
import org.apache.james.protocols.api.ProtocolTransport;
-import org.apache.james.protocols.api.AbstractSession;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPConfiguration;
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
/**
* {@link SMTPSession} implementation
*/
-public class SMTPSessionImpl extends AbstractSession implements SMTPSession {
+public class SMTPSessionImpl extends ProtocolSessionImpl implements
SMTPSession {
public final static String SMTP_SESSION = "SMTP_SESSION";
private boolean relayingAllowed;
@@ -72,14 +72,14 @@ public class SMTPSessionImpl extends Abs
* @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler()
*/
public void popLineHandler() {
- transport.popLineHandler();
+ getProtocolTransport().popLineHandler();
}
/**
* @see
org.apache.james.protocols.smtp.SMTPSession#pushLineHandler(LineHandler)
*/
public void pushLineHandler(LineHandler<SMTPSession>
overrideCommandHandler) {
- transport.pushLineHandler(overrideCommandHandler, this);
+ getProtocolTransport().pushLineHandler(overrideCommandHandler, this);
}
/**
@@ -122,7 +122,7 @@ public class SMTPSessionImpl extends Abs
* @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported()
*/
public boolean isAuthSupported() {
- return
theConfigData.isAuthRequired(socketAddress.getAddress().getHostAddress());
+ return
theConfigData.isAuthRequired(getRemoteAddress().getAddress().getHostAddress());
}
/**
@@ -151,7 +151,7 @@ public class SMTPSessionImpl extends Abs
* org.apache.james.protocols.smtp.SMTPSession#getPushedLineHandlerCount()
*/
public int getPushedLineHandlerCount() {
- return transport.getPushedLineHandlerCount();
+ return getProtocolTransport().getPushedLineHandlerCount();
}
public Response newLineTooLongResponse() {
Modified:
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1203767&r1=1203766&r2=1203767&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
(original)
+++
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
Fri Nov 18 17:49:21 2011
@@ -22,6 +22,7 @@ package org.apache.james.protocols.smtp;
import java.io.IOException;
import java.io.InputStream;
+import java.net.InetSocketAddress;
import java.util.Map;
import org.apache.james.protocols.api.Response;
@@ -214,4 +215,16 @@ public class BaseFakeSMTPSession impleme
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
+ @Override
+ public InetSocketAddress getRemoteAddress() {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+
+ }
+
+ @Override
+ public InetSocketAddress getLocalAddress() {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+
+ }
+
}
Modified:
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java?rev=1203767&r1=1203766&r2=1203767&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
(original)
+++
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
Fri Nov 18 17:49:21 2011
@@ -20,7 +20,9 @@
package org.apache.james.protocols.smtp.core.fastfail;
+import java.net.Inet4Address;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
@@ -119,6 +121,11 @@ public class DNSRBLHandlerTest extends T
HashMap<String,Object> state = new HashMap<String,Object>();
HashMap<String,Object> connectionState = new
HashMap<String,Object>();
+ @Override
+ public InetSocketAddress getRemoteAddress() {
+ return new InetSocketAddress(getRemoteIPAddress(), 10000);
+ }
+
public String getRemoteIPAddress() {
return remoteIp;
}
Modified:
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java?rev=1203767&r1=1203766&r2=1203767&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
(original)
+++
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
Fri Nov 18 17:49:21 2011
@@ -20,6 +20,7 @@
package org.apache.james.protocols.smtp.core.fastfail;
+import java.net.InetSocketAddress;
import java.util.ArrayList;
import javax.mail.internet.ParseException;
@@ -38,6 +39,11 @@ public class SpamTrapHandlerTest extends
private SMTPSession setUpSMTPSession(final String ip) {
return new BaseFakeSMTPSession() {
+ @Override
+ public InetSocketAddress getRemoteAddress() {
+ return new InetSocketAddress(getRemoteIPAddress(), 10000);
+ }
+
public String getRemoteIPAddress() {
return ip;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
