Author: bago
Date: Sun Oct 18 10:39:33 2009
New Revision: 826405
URL: http://svn.apache.org/viewvc?rev=826405&view=rev
Log:
Moved SMTPServerComposed to "smtpserver" main package as it is not socket
implementation independent.
Added:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
(contents, props changed)
- copied, changed from r826398,
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPServerComposed.java
Removed:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPServerComposed.java
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java
Copied:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
(from r826398,
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPServerComposed.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPServerComposed.java&r1=826398&r2=826405&rev=826405&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPServerComposed.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
Sun Oct 18 10:39:33 2009
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.protocol;
+package org.apache.james.smtpserver;
import javax.annotation.Resource;
@@ -38,7 +38,8 @@
import org.apache.james.api.dnsservice.util.NetMatcher;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
-import org.apache.james.smtpserver.SMTPHandler;
+import org.apache.james.smtpserver.protocol.SMTPConfiguration;
+import org.apache.james.smtpserver.protocol.SMTPHandlerChain;
import org.apache.james.socket.AvalonProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.api.ProtocolHandlerFactory;
Propchange:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java?rev=826405&r1=826404&r2=826405&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java
Sun Oct 18 10:39:33 2009
@@ -20,7 +20,6 @@
package org.apache.james.smtpserver;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.james.smtpserver.protocol.SMTPServerComposed;
import org.apache.james.test.mock.avalon.MockLogger;
public class SMTPServerComposedTest extends SMTPServerTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
