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 2010/02/01 14:27:04 UTC
svn commit: r905276 [3/3] - in /james/server/trunk: ./ imapserver/ mailets/
mailets/src/main/java/org/apache/james/transport/mailets/ mina-socket/
mina-socket/src/main/java/org/apache/james/socket/
mina-socket/src/main/java/org/apache/james/socket/mina...
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPIoHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPIoHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPIoHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPIoHandler.java Mon Feb 1 13:26:59 2010
@@ -20,12 +20,13 @@
package org.apache.james.smtpserver.mina;
import org.apache.commons.logging.Log;
-import org.apache.james.api.protocol.ProtocolSession;
-import org.apache.james.api.protocol.ProtocolHandlerChain;
-import org.apache.james.smtpserver.protocol.SMTPConfiguration;
-import org.apache.james.smtpserver.protocol.SMTPResponse;
-import org.apache.james.smtpserver.protocol.SMTPRetCode;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+
+import org.apache.james.protocols.api.ProtocolHandlerChain;
+import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.smtp.SMTPConfiguration;
+import org.apache.james.protocols.smtp.SMTPResponse;
+import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.socket.mina.AbstractIoHandler;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.ssl.SslContextFactory;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java Mon Feb 1 13:26:59 2010
@@ -27,11 +27,11 @@
import javax.net.ssl.SSLContext;
import org.apache.commons.logging.Log;
-import org.apache.james.api.protocol.LineHandler;
+import org.apache.james.protocols.api.LineHandler;
+import org.apache.james.protocols.smtp.SMTPConfiguration;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.mina.filter.SMTPResponseFilter;
import org.apache.james.smtpserver.mina.filter.TarpitFilter;
-import org.apache.james.smtpserver.protocol.SMTPConfiguration;
-import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.socket.mina.AbstractMINASession;
import org.apache.james.socket.mina.filter.FilterLineHandlerAdapter;
import org.apache.mina.core.session.IoSession;
@@ -66,21 +66,21 @@
this(theConfigData, logger, session, null);
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getConnectionState()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getConnectionState()
*/
public Map<String, Object> getConnectionState() {
return connectionState;
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getSessionID()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getSessionID()
*/
public String getSessionID() {
return smtpID;
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getState()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getState()
*/
@SuppressWarnings("unchecked")
public Map<String, Object> getState() {
@@ -94,14 +94,14 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#isRelayingAllowed()
+ * @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed()
*/
public boolean isRelayingAllowed() {
return relayingAllowed;
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#resetState()
+ * @see org.apache.james.protocols.smtp.SMTPSession#resetState()
*/
public void resetState() {
// remember the ehlo mode between resets
@@ -116,7 +116,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#popLineHandler()
+ * @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler()
*/
public void popLineHandler() {
getIoSession().getFilterChain()
@@ -125,7 +125,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#pushLineHandler(org.apache.james.smtpserver.protocol.LineHandler)
+ * @see org.apache.james.protocols.smtp.SMTPSession#pushLineHandler(org.apache.james.smtpserver.protocol.LineHandler)
*/
public void pushLineHandler(LineHandler<SMTPSession> overrideCommandHandler) {
lineHandlerCount++;
@@ -137,7 +137,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getHelloName()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getHelloName()
*/
public String getHelloName() {
return theConfigData.getHelloName();
@@ -145,7 +145,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getMaxMessageSize()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getMaxMessageSize()
*/
public long getMaxMessageSize() {
return theConfigData.getMaxMessageSize();
@@ -153,7 +153,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getRcptCount()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getRcptCount()
*/
@SuppressWarnings("unchecked")
public int getRcptCount() {
@@ -168,7 +168,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getSMTPGreeting()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getSMTPGreeting()
*/
public String getSMTPGreeting() {
return theConfigData.getSMTPGreeting();
@@ -176,7 +176,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#isAuthSupported()
+ * @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported()
*/
public boolean isAuthSupported() {
return theConfigData.isAuthRequired(socketAddress.getAddress().getHostAddress());
@@ -184,7 +184,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#setRelayingAllowed(boolean)
+ * @see org.apache.james.protocols.smtp.SMTPSession#setRelayingAllowed(boolean)
*/
public void setRelayingAllowed(boolean relayingAllowed) {
this.relayingAllowed = relayingAllowed;
@@ -192,7 +192,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#sleep(long)
+ * @see org.apache.james.protocols.smtp.SMTPSession#sleep(long)
*/
public void sleep(long ms) {
session.getFilterChain().addAfter("connectionFilter", "tarpitFilter",new TarpitFilter(ms));
@@ -200,14 +200,14 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#useAddressBracketsEnforcement()
+ * @see org.apache.james.protocols.smtp.SMTPSession#useAddressBracketsEnforcement()
*/
public boolean useAddressBracketsEnforcement() {
return theConfigData.useAddressBracketsEnforcement();
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#useHeloEhloEnforcement()
+ * @see org.apache.james.protocols.smtp.SMTPSession#useHeloEhloEnforcement()
*/
public boolean useHeloEhloEnforcement() {
return theConfigData.useHeloEhloEnforcement();
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/filter/SMTPResponseFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/filter/SMTPResponseFilter.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/filter/SMTPResponseFilter.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/filter/SMTPResponseFilter.java Mon Feb 1 13:26:59 2010
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.smtpserver.mina.filter;
-import org.apache.james.api.protocol.Response;
-import org.apache.james.smtpserver.protocol.SMTPResponse;
+import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.socket.mina.filter.AbstractResponseFilter;
import org.apache.mina.core.session.IoSession;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java Mon Feb 1 13:26:59 2010
@@ -20,9 +20,9 @@
package org.apache.james.smtpserver;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.integration.POP3BeforeSMTPHandler;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.util.POP3BeforeSMTPHelper;
import junit.framework.TestCase;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Mon Feb 1 13:26:59 2010
@@ -28,10 +28,10 @@
import org.apache.james.jspf.core.DNSRequest;
import org.apache.james.jspf.core.DNSService;
import org.apache.james.jspf.core.exceptions.TimeoutException;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.smtpserver.integration.fastfail.SPFHandler;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Mon Feb 1 13:26:59 2010
@@ -21,9 +21,10 @@
package org.apache.james.smtpserver;
import junit.framework.TestCase;
+
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.integration.SetMimeHeaderHandler;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Mon Feb 1 13:26:59 2010
@@ -29,11 +29,11 @@
import junit.framework.TestCase;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.smtpserver.integration.fastfail.SpamAssassinHandler;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.hook.HookResult;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.test.mock.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.util.MockSpamd;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Mon Feb 1 13:26:59 2010
@@ -40,11 +40,11 @@
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.smtpserver.integration.fastfail.URIRBLHandler;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.hook.HookResult;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.test.mock.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.mailet.Mail;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Mon Feb 1 13:26:59 2010
@@ -37,13 +37,13 @@
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPConfiguration;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.integration.fastfail.ValidRcptHandler;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPConfiguration;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.test.mock.james.MockVirtualUserTableStore;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Mon Feb 1 13:26:59 2010
@@ -30,10 +30,10 @@
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.smtpserver.integration.fastfail.ValidRcptMX;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Mon Feb 1 13:26:59 2010
@@ -255,11 +255,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-api</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
<scope>runtime</scope>
</dependency>
@@ -277,12 +272,7 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-smtp-protocol</artifactId>
- <scope>runtime</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-function</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org