You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2006/12/27 10:00:19 UTC
svn commit: r490468 - in /james/server/sandbox/handlerapi-experiment/src:
java/org/apache/james/smtpserver/
java/org/apache/james/smtpserver/core/filter/fastfail/
test/org/apache/james/smtpserver/
Author: norman
Date: Wed Dec 27 01:00:19 2006
New Revision: 490468
URL: http://svn.apache.org/viewvc?view=rev&rev=490468
Log:
Move the sleep(long) method from TarpitHandler to SMTPSession. This is needed to get nothing will breaking when moving to MINA. See JAMES-750
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java?view=diff&rev=490468&r1=490467&r2=490468
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java Wed Dec 27 01:00:19 2006
@@ -461,5 +461,16 @@
}
lineHandlers.addLast(lineHandler);
}
+
+ /**
+ * @see org.apache.james.smtpserver.SMTPSession#sleep(long)
+ */
+ public void sleep(long ms) {
+ try {
+ Thread.sleep(ms);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java?view=diff&rev=490468&r1=490467&r2=490468
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java Wed Dec 27 01:00:19 2006
@@ -62,6 +62,9 @@
private final static String[] mandatoryCommands = { "MAIL" , "RCPT", "DATA"};
+ /**
+ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
public void service(ServiceManager arg0) throws ServiceException {
serviceManager = arg0;
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java?view=diff&rev=490468&r1=490467&r2=490468
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java Wed Dec 27 01:00:19 2006
@@ -161,5 +161,12 @@
* Write an SMTPResponse to the client
*/
void writeSMTPResponse(SMTPResponse response);
+
+ /**
+ * Sleep for the given ms
+ *
+ * @param ms the time to sleep in milliseconds
+ */
+ void sleep(long ms);
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java?view=diff&rev=490468&r1=490467&r2=490468
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java Wed Dec 27 01:00:19 2006
@@ -89,20 +89,7 @@
public void setTarpitSleepTime(long tarpitSleepTime) {
this.tarpitSleepTime = tarpitSleepTime;
}
-
- /**
- * Add a sleep for the given milliseconds
- *
- * @param timeInMillis
- * Time in ms
- * @throws InterruptedException
- *
- * TODO: Remember to add an sleep method to our IO implementation
- */
- private void sleep(float timeInMillis) throws InterruptedException {
- Thread.sleep((long) timeInMillis);
- }
-
+
/**
* @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
@@ -113,11 +100,7 @@
rcptCount++;
if (rcptCount > tarpitRcptCount) {
- try {
- sleep(tarpitSleepTime);
- } catch (InterruptedException e) {
- // ignore
- }
+ session.sleep(tarpitSleepTime);
}
return null;
Modified: james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java?view=diff&rev=490468&r1=490467&r2=490468
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java Wed Dec 27 01:00:19 2006
@@ -29,40 +29,6 @@
*/
public class AbstractSMTPSession implements SMTPSession {
- /**
- * @see org.apache.james.smtpserver.SMTPSession#abortMessage()
- */
- public void abortMessage() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
- * @see org.apache.james.smtpserver.SMTPSession#clearResponseBuffer()
- */
- public String clearResponseBuffer() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
- * @see org.apache.james.smtpserver.SMTPSession#endSession()
- */
- public void endSession() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
- * @see org.apache.james.smtpserver.SMTPSession#getCommandArgument()
- */
- public String getCommandArgument() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
- * @see org.apache.james.smtpserver.SMTPSession#getCommandName()
- */
- public String getCommandName() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
/**
* @see org.apache.james.smtpserver.SMTPSession#getConfigurationData()
@@ -107,13 +73,6 @@
}
/**
- * @see org.apache.james.smtpserver.SMTPSession#getResponseBuffer()
- */
- public StringBuffer getResponseBuffer() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
* @see org.apache.james.smtpserver.SMTPSession#getSessionID()
*/
public String getSessionID() {
@@ -128,13 +87,6 @@
}
/**
- * @see org.apache.james.smtpserver.SMTPSession#getStopHandlerProcessing()
- */
- public boolean getStopHandlerProcessing() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
* @see org.apache.james.smtpserver.SMTPSession#getUser()
*/
public String getUser() {
@@ -177,32 +129,12 @@
}
/**
- * @see org.apache.james.smtpserver.SMTPSession#setStopHandlerProcessing(boolean)
- */
- public void setStopHandlerProcessing(boolean b) {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
* @see org.apache.james.smtpserver.SMTPSession#setUser(java.lang.String)
*/
public void setUser(String user) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
- /**
- * @see org.apache.james.smtpserver.SMTPSession#useHeloEhloEnforcement()
- */
- public boolean useHeloEhloEnforcement() {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
-
- /**
- * @see org.apache.james.smtpserver.SMTPSession#writeResponse(java.lang.String)
- */
- public void writeResponse(String respString) {
- throw new UnsupportedOperationException("Unimplemented Stub Method");
- }
/**
* @see org.apache.james.smtpserver.SMTPSession#popLineHandler()
@@ -222,6 +154,13 @@
* @see org.apache.james.smtpserver.SMTPSession#writeSMTPResponse(org.apache.james.smtpserver.SMTPResponse)
*/
public void writeSMTPResponse(SMTPResponse response) {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+ }
+
+ /**
+ * @see org.apache.james.smtpserver.SMTPSession#sleep(long)
+ */
+ public void sleep(long ms) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
Modified: james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java?view=diff&rev=490468&r1=490467&r2=490468
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java Wed Dec 27 01:00:19 2006
@@ -34,6 +34,11 @@
public int getRcptCount() {
return rcptCount;
}
+
+ public void sleep(long ms) {
+ // use the real code
+ (new SMTPHandler()).sleep(ms);
+ }
};
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org