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 ba...@apache.org on 2009/10/18 15:04:08 UTC
svn commit: r826427 [2/2] - in /james/server/trunk:
pop3server-function/src/main/java/org/apache/james/pop3server/
pop3server-function/src/main/java/org/apache/james/pop3server/core/
remotemanager-function/src/main/java/org/apache/james/remotemanager/ ...
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java Sun Oct 18 13:04:04 2009
@@ -21,11 +21,11 @@
package org.apache.james.smtpserver.protocol.core;
+import org.apache.james.api.protocol.HandlersPackage;
import org.apache.james.smtpserver.protocol.core.esmtp.AuthCmdHandler;
import org.apache.james.smtpserver.protocol.core.esmtp.EhloCmdHandler;
import org.apache.james.smtpserver.protocol.core.esmtp.MailSizeEsmtpExtension;
import org.apache.james.smtpserver.protocol.core.esmtp.StartTlsCmdHandler;
-import org.apache.james.socket.shared.HandlersPackage;
import java.util.LinkedList;
import java.util.List;
@@ -91,7 +91,7 @@
commands.add(SENDMAILHANDLER);
}
/**
- * @see org.apache.james.socket.shared.HandlersPackage#getHandlers()
+ * @see org.apache.james.api.protocol.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return commands;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java Sun Oct 18 13:04:04 2009
@@ -31,6 +31,8 @@
import javax.mail.MessagingException;
import org.apache.james.Constants;
+import org.apache.james.api.protocol.ExtensibleHandler;
+import org.apache.james.api.protocol.WiringException;
import org.apache.james.core.MailHeaders;
import org.apache.james.core.MimeMessageInputStreamSource;
import org.apache.james.dsn.DSNStatus;
@@ -41,8 +43,6 @@
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.socket.shared.ExtensibleHandler;
-import org.apache.james.socket.shared.WiringException;
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
@@ -305,7 +305,7 @@
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.api.protocol.ExtensibleHandler#getMarkerInterfaces()
*/
public List getMarkerInterfaces() {
List classes = new LinkedList();
@@ -315,7 +315,7 @@
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
if (DataLineFilter.class.equals(interfaceName)) {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java Sun Oct 18 13:04:04 2009
@@ -32,6 +32,9 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.api.protocol.ExtensibleHandler;
+import org.apache.james.api.protocol.LogEnabled;
+import org.apache.james.api.protocol.WiringException;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
@@ -44,9 +47,6 @@
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookResultHook;
import org.apache.james.smtpserver.protocol.hook.MessageHook;
-import org.apache.james.socket.shared.ExtensibleHandler;
-import org.apache.james.socket.shared.LogEnabled;
-import org.apache.james.socket.shared.WiringException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -185,7 +185,7 @@
}
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
if (MessageHook.class.equals(interfaceName)) {
@@ -203,7 +203,7 @@
}
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.api.protocol.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = new LinkedList<Class<?>>();
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/POP3BeforeSMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/POP3BeforeSMTPHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/POP3BeforeSMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/POP3BeforeSMTPHandler.java Sun Oct 18 13:04:04 2009
@@ -39,7 +39,7 @@
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration config) throws ConfigurationException {
try {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java Sun Oct 18 13:04:04 2009
@@ -27,14 +27,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.api.protocol.AbstractCommandDispatcher;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.smtpserver.protocol.CommandHandler;
import org.apache.james.smtpserver.protocol.LineHandler;
import org.apache.james.smtpserver.protocol.SMTPRequest;
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.socket.shared.AbstractCommandDispatcher;
-import org.apache.james.socket.shared.LogEnabled;
public class SMTPCommandDispatcherLineHandler extends AbstractCommandDispatcher<CommandHandler> implements LogEnabled, LineHandler {
@@ -109,7 +109,7 @@
}
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.api.protocol.ExtensibleHandler#getMarkerInterfaces()
*/
@SuppressWarnings("unchecked")
public List getMarkerInterfaces() {
@@ -119,7 +119,7 @@
}
/**
- * @see org.apache.james.socket.shared.AbstractCommandDispatcher#getLog()
+ * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getLog()
*/
protected Log getLog() {
return serviceLog;
@@ -127,28 +127,28 @@
/**
- * @see org.apache.james.socket.shared.AbstractCommandDispatcher#getUnknownCommandHandlerIdentifier()
+ * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getUnknownCommandHandlerIdentifier()
*/
protected String getUnknownCommandHandlerIdentifier() {
return UnknownCmdHandler.UNKNOWN_COMMAND;
}
/**
- * @see org.apache.james.socket.shared.AbstractCommandDispatcher#getMandatoryCommands()
+ * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getMandatoryCommands()
*/
protected List<String> getMandatoryCommands() {
return Arrays.asList(mandatoryCommands);
}
/**
- * @see org.apache.james.socket.shared.AbstractCommandDispatcher#getUnknownCommandHandler()
+ * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getUnknownCommandHandler()
*/
protected CommandHandler getUnknownCommandHandler() {
return unknownHandler;
}
/**
- * @see org.apache.james.socket.shared.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see org.apache.james.api.protocol.LogEnabled#setLog(org.apache.commons.logging.Log)
*/
public void setLog(Log log) {
this.serviceLog = log;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SetMimeHeaderHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SetMimeHeaderHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SetMimeHeaderHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/SetMimeHeaderHandler.java Sun Oct 18 13:04:04 2009
@@ -45,7 +45,7 @@
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration) throws ConfigurationException {
setHeaderName(handlerConfiguration.getString("headername"));
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/AuthCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/AuthCmdHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/AuthCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/AuthCmdHandler.java Sun Oct 18 13:04:04 2009
@@ -29,6 +29,8 @@
import java.util.Locale;
import java.util.StringTokenizer;
+import org.apache.james.api.protocol.ExtensibleHandler;
+import org.apache.james.api.protocol.WiringException;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.protocol.CommandHandler;
import org.apache.james.smtpserver.protocol.LineHandler;
@@ -41,8 +43,6 @@
import org.apache.james.smtpserver.protocol.hook.HookResultHook;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.smtpserver.protocol.hook.MailParametersHook;
-import org.apache.james.socket.shared.ExtensibleHandler;
-import org.apache.james.socket.shared.WiringException;
import org.apache.james.util.codec.Base64;
@@ -420,7 +420,7 @@
}
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.api.protocol.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = new ArrayList<Class<?>>(1);
@@ -430,7 +430,7 @@
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
if (AuthHook.class.equals(interfaceName)) {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/EhloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/EhloCmdHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/EhloCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/EhloCmdHandler.java Sun Oct 18 13:04:04 2009
@@ -87,7 +87,7 @@
}
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.api.protocol.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = super.getMarkerInterfaces();
@@ -96,7 +96,7 @@
}
/**
- * @see org.apache.james.socket.shared.ExtensibleHandler#wireExtensions(java.lang.Class,
+ * @see org.apache.james.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class,
* java.util.List)
*/
public void wireExtensions(Class interfaceName, List extension) {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java Sun Oct 18 13:04:04 2009
@@ -33,14 +33,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.protocol.ConnectHandler;
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.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java Sun Oct 18 13:04:04 2009
@@ -43,6 +43,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.services.FileSystem;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
@@ -50,8 +52,6 @@
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.james.util.TimeConverter;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java Sun Oct 18 13:04:04 2009
@@ -24,13 +24,13 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.api.protocol.Configurable;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
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.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
import org.apache.mailet.MailAddress;
public class MaxRcptHandler implements RcptHook, Configurable {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java Sun Oct 18 13:04:04 2009
@@ -26,6 +26,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.api.protocol.Configurable;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
@@ -33,7 +34,6 @@
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
import org.apache.mailet.MailAddress;
@@ -68,7 +68,7 @@
/**
* (non-Javadoc)
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration)
throws ConfigurationException {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java Sun Oct 18 13:04:04 2009
@@ -25,6 +25,8 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.jspf.core.DNSService;
import org.apache.james.jspf.core.exceptions.SPFErrorConstants;
@@ -38,8 +40,6 @@
import org.apache.james.smtpserver.protocol.hook.MailHook;
import org.apache.james.smtpserver.protocol.hook.MessageHook;
import org.apache.james.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -95,7 +95,7 @@
}
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration)
throws ConfigurationException {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java Sun Oct 18 13:04:04 2009
@@ -27,12 +27,12 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.api.protocol.Configurable;
import org.apache.james.dsn.DSNStatus;
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.smtpserver.protocol.hook.MessageHook;
-import org.apache.james.socket.configuration.Configurable;
import org.apache.james.util.scanner.SpamAssassinInvoker;
import org.apache.mailet.Mail;
@@ -72,7 +72,7 @@
private boolean checkAuthNetworks = false;
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration config) throws ConfigurationException {
setSpamdHost(config.getString("spamdHost","localhost"));
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java Sun Oct 18 13:04:04 2009
@@ -28,11 +28,11 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.api.protocol.Configurable;
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.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java Sun Oct 18 13:04:04 2009
@@ -24,11 +24,11 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.api.protocol.Configurable;
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.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java Sun Oct 18 13:04:04 2009
@@ -41,13 +41,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.dsn.DSNStatus;
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.smtpserver.protocol.hook.MessageHook;
-import org.apache.james.socket.configuration.Configurable;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.mailet.Mail;
/**
@@ -102,7 +102,7 @@
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration config) throws ConfigurationException {
String[] servers = config.getStringArray("uriRblServers/server");
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java Sun Oct 18 13:04:04 2009
@@ -32,6 +32,8 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
@@ -43,8 +45,6 @@
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.mailet.MailAddress;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java Sun Oct 18 13:04:04 2009
@@ -34,14 +34,14 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.LogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
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.smtpserver.protocol.hook.RcptHook;
-import org.apache.james.socket.configuration.Configurable;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.mailet.MailAddress;
/**
@@ -90,7 +90,7 @@
}
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
@SuppressWarnings("unchecked")
public void configure(Configuration config) throws ConfigurationException {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java Sun Oct 18 13:04:04 2009
@@ -26,13 +26,13 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
+import org.apache.james.api.protocol.Configurable;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
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.smtpserver.protocol.hook.MailHook;
-import org.apache.james.socket.configuration.Configurable;
import org.apache.mailet.MailAddress;
/**
@@ -63,7 +63,7 @@
/**
- * @see org.apache.james.socket.configuration.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration) throws ConfigurationException {
setCheckAuthNetworks(handlerConfiguration.getBoolean("checkAuthNetworks",false));
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java Sun Oct 18 13:04:04 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import java.util.ArrayList;
import java.util.Collection;
@@ -79,7 +79,7 @@
/**
* @throws WiringException
- * @see org.apache.james.socket.shared.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
@SuppressWarnings("unchecked")
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/CommonCommandHandler.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CommonCommandHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/CommonCommandHandler.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/CommonCommandHandler.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CommonCommandHandler.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CommonCommandHandler.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/CommonCommandHandler.java Sun Oct 18 13:04:04 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import java.util.Collection;
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/Configurable.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/Configurable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/Configurable.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/Configurable.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/Configurable.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/Configurable.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/Configurable.java Sun Oct 18 13:04:04 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket.configuration;
+package org.apache.james.api.protocol;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java Sun Oct 18 13:04:04 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import java.util.List;
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/HandlersPackage.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/HandlersPackage.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/HandlersPackage.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/HandlersPackage.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/HandlersPackage.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/HandlersPackage.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/HandlersPackage.java Sun Oct 18 13:04:04 2009
@@ -19,7 +19,7 @@
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import java.util.List;
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabled.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/LogEnabled.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabled.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabled.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/LogEnabled.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/LogEnabled.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabled.java Sun Oct 18 13:04:04 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import org.apache.commons.logging.Log;
Propchange: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabled.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabledSession.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/LogEnabledSession.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabledSession.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabledSession.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/LogEnabledSession.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/LogEnabledSession.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/LogEnabledSession.java Sun Oct 18 13:04:04 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import org.apache.commons.logging.Log;
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java (from r826425, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java&r1=826425&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java Sun Oct 18 13:04:04 2009
@@ -1,4 +1,4 @@
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import java.util.LinkedList;
Propchange: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/TLSSupportedSession.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/TLSSupportedSession.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/TLSSupportedSession.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/TLSSupportedSession.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/TLSSupportedSession.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/TLSSupportedSession.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/TLSSupportedSession.java Sun Oct 18 13:04:04 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
import java.io.IOException;
Copied: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/WiringException.java (from r826398, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/WiringException.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/WiringException.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java&r1=826398&r2=826427&rev=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/protocol/WiringException.java Sun Oct 18 13:04:04 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.api.protocol;
/**
* Indicates an issue prevent the successful wiring of the components
Modified: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandler.java Sun Oct 18 13:04:04 2009
@@ -24,6 +24,7 @@
import java.io.IOException;
import org.apache.commons.logging.Log;
+import org.apache.james.api.protocol.TLSSupportedSession;
import org.apache.james.socket.api.ProtocolContext;
import org.apache.james.socket.api.ProtocolHandler;
@@ -54,42 +55,42 @@
}
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#getRemoteHost()
+ * @see org.apache.james.api.protocol.TLSSupportedSession#getRemoteHost()
*/
public String getRemoteHost() {
return context.getRemoteHost();
}
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#getRemoteIPAddress()
+ * @see org.apache.james.api.protocol.TLSSupportedSession#getRemoteIPAddress()
*/
public String getRemoteIPAddress() {
return context.getRemoteIP();
}
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#getUser()
+ * @see org.apache.james.api.protocol.TLSSupportedSession#getUser()
*/
public String getUser() {
return user;
}
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#isTLSStarted()
+ * @see org.apache.james.api.protocol.TLSSupportedSession#isTLSStarted()
*/
public boolean isTLSStarted() {
return context.isSecure();
}
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#setUser(java.lang.String)
+ * @see org.apache.james.api.protocol.TLSSupportedSession#setUser(java.lang.String)
*/
public void setUser(String user) {
this.user = user;
}
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#startTLS()
+ * @see org.apache.james.api.protocol.TLSSupportedSession#startTLS()
*/
public void startTLS() throws IOException {
context.secure();
@@ -97,7 +98,7 @@
/**
- * @see org.apache.james.socket.shared.TLSSupportedSession#getLogger()
+ * @see org.apache.james.api.protocol.TLSSupportedSession#getLogger()
*/
public Log getLogger() {
return context.getLogger();
Modified: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java?rev=826427&r1=826426&r2=826427&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java Sun Oct 18 13:04:04 2009
@@ -33,7 +33,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.kernel.LoaderService;
-import org.apache.james.socket.configuration.Configurable;
+import org.apache.james.api.protocol.Configurable;
+import org.apache.james.api.protocol.ExtensibleHandler;
+import org.apache.james.api.protocol.HandlersPackage;
+import org.apache.james.api.protocol.LogEnabled;
+import org.apache.james.api.protocol.ProtocolHandlerChain;
+import org.apache.james.api.protocol.WiringException;
/**
* Abstract class which HandlerChains should extend
@@ -130,8 +135,8 @@
}
// configure the handler
- if (handler instanceof org.apache.james.socket.configuration.Configurable) {
- org.apache.james.socket.configuration.Configurable configurableHandler = (org.apache.james.socket.configuration.Configurable) handler;
+ if (handler instanceof org.apache.james.api.protocol.Configurable) {
+ org.apache.james.api.protocol.Configurable configurableHandler = (org.apache.james.api.protocol.Configurable) handler;
configurableHandler.configure(config);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org