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 2009/12/22 13:14:52 UTC
svn commit: r893152 - in /james/server/trunk: core-api/
core-api/src/main/java/org/apache/james/lifecycle/
pop3server-function/src/main/java/org/apache/james/pop3server/core/
remotemanager-function/src/main/java/org/apache/james/remotemanager/core/
smt...
Author: norman
Date: Tue Dec 22 12:14:50 2009
New Revision: 893152
URL: http://svn.apache.org/viewvc?rev=893152&view=rev
Log:
move LogEnabled and Configurable to core-api. I will fix the new dependency in smtp-protocol-library later ( not so important atm)
Added:
james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/
james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java
- copied, changed from r885351, james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/Configurable.java
james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LogEnabled.java
- copied, changed from r885351, james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/LogEnabled.java
Removed:
james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/Configurable.java
james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/LogEnabled.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/
Modified:
james/server/trunk/core-api/pom.xml
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java
james/server/trunk/smtp-protocol-library/pom.xml
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SpamAssassinHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java
Modified: james/server/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Tue Dec 22 12:14:50 2009
@@ -52,5 +52,14 @@
<artifactId>avalon-framework-impl</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Copied: james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java (from r885351, james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/Configurable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java&p1=james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/Configurable.java&r1=885351&r2=893152&rev=893152&view=diff
==============================================================================
--- james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/Configurable.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Configurable.java Tue Dec 22 12:14:50 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.api.protocol;
+package org.apache.james.lifecycle;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
Copied: james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LogEnabled.java (from r885351, james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/LogEnabled.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LogEnabled.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LogEnabled.java&p1=james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/LogEnabled.java&r1=885351&r2=893152&rev=893152&view=diff
==============================================================================
--- james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/LogEnabled.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LogEnabled.java Tue Dec 22 12:14:50 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.api.protocol;
+package org.apache.james.lifecycle;
import org.apache.commons.logging.Log;
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java Tue Dec 22 12:14:50 2009
@@ -27,7 +27,7 @@
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.lifecycle.LogEnabled;
import org.apache.james.pop3server.CommandHandler;
import org.apache.james.pop3server.LineHandler;
import org.apache.james.pop3server.POP3Response;
@@ -139,7 +139,7 @@
}
/**
- * @see org.apache.james.api.protocol.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log)
*/
public void setLog(Log log) {
this.serviceLog = log;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java Tue Dec 22 12:14:50 2009
@@ -26,7 +26,7 @@
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.lifecycle.LogEnabled;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.LineHandler;
import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -84,7 +84,7 @@
return mList;
}
/**
- * @see org.apache.james.api.protocol.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log)
*/
public void setLog(Log log) {
this.serviceLog = log;
Modified: james/server/trunk/smtp-protocol-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/pom.xml?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/pom.xml (original)
+++ james/server/trunk/smtp-protocol-library/pom.xml Tue Dec 22 12:14:50 2009
@@ -32,6 +32,10 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-socket-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java Tue Dec 22 12:14:50 2009
@@ -29,9 +29,9 @@
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.dsn.DSNStatus;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.smtpserver.protocol.LineHandler;
import org.apache.james.smtpserver.protocol.MailEnvelopeImpl;
import org.apache.james.smtpserver.protocol.SMTPResponse;
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/SMTPCommandDispatcherLineHandler.java Tue Dec 22 12:14:50 2009
@@ -28,7 +28,7 @@
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.lifecycle.LogEnabled;
import org.apache.james.smtpserver.protocol.CommandHandler;
import org.apache.james.smtpserver.protocol.LineHandler;
import org.apache.james.smtpserver.protocol.SMTPRequest;
@@ -148,7 +148,7 @@
}
/**
- * @see org.apache.james.api.protocol.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log)
*/
public void setLog(Log log) {
this.serviceLog = log;
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java Tue Dec 22 12:14:50 2009
@@ -24,8 +24,8 @@
import javax.annotation.Resource;
-import org.apache.james.api.protocol.Configurable;
import org.apache.james.dsn.DSNStatus;
+import org.apache.james.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java Tue Dec 22 12:14:50 2009
@@ -33,8 +33,8 @@
import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.api.protocol.Configurable;
import org.apache.james.dsn.DSNStatus;
+import org.apache.james.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.ConnectHandler;
import org.apache.james.smtpserver.protocol.DNSService;
import org.apache.james.smtpserver.protocol.SMTPSession;
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java Tue Dec 22 12:14:50 2009
@@ -24,8 +24,8 @@
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.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
@@ -38,7 +38,7 @@
private int maxRcpt = 0;
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration)
throws ConfigurationException {
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java Tue Dec 22 12:14:50 2009
@@ -25,8 +25,8 @@
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.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.DNSService;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
@@ -67,7 +67,7 @@
/**
* (non-Javadoc)
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration)
throws ConfigurationException {
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java Tue Dec 22 12:14:50 2009
@@ -25,14 +25,14 @@
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;
import org.apache.james.jspf.executor.SPFResult;
import org.apache.james.jspf.impl.DefaultSPF;
import org.apache.james.jspf.impl.SPF;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
@@ -93,7 +93,7 @@
}
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration)
throws ConfigurationException {
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java Tue Dec 22 12:14:50 2009
@@ -28,7 +28,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.api.protocol.Configurable;
+import org.apache.james.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
@@ -50,7 +50,7 @@
private long blockTime = 4320000;
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
@SuppressWarnings("unchecked")
public void configure(Configuration config) throws ConfigurationException {
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java Tue Dec 22 12:14:50 2009
@@ -24,7 +24,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.api.protocol.Configurable;
+import org.apache.james.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
@@ -42,7 +42,7 @@
private long tarpitSleepTime = 5000;
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration)
throws ConfigurationException {
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java Tue Dec 22 12:14:50 2009
@@ -24,8 +24,8 @@
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.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.DNSService;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
@@ -63,7 +63,7 @@
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration) throws ConfigurationException {
setCheckAuthNetworks(handlerConfiguration.getBoolean("checkAuthNetworks",false));
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java Tue Dec 22 12:14:50 2009
@@ -35,12 +35,12 @@
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;
import org.apache.james.dsn.DSNStatus;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.protocol.LineHandler;
import org.apache.james.smtpserver.protocol.MailEnvelope;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java Tue Dec 22 12:14:50 2009
@@ -44,7 +44,7 @@
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.LogEnabled;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.FileSystem;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.core.fastfail.AbstractGreylistHandler;
@@ -535,7 +535,7 @@
}
/**
- * @see org.apache.james.api.protocol.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see org.apache.james.lifecycle.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/integration/POP3BeforeSMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java Tue Dec 22 12:14:50 2009
@@ -39,7 +39,7 @@
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.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/integration/SetMimeHeaderHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java Tue Dec 22 12:14:50 2009
@@ -44,7 +44,7 @@
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.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/integration/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SpamAssassinHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SpamAssassinHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SpamAssassinHandler.java Tue Dec 22 12:14:50 2009
@@ -27,8 +27,8 @@
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.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
@@ -71,7 +71,7 @@
private boolean checkAuthNetworks = false;
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.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/integration/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java Tue Dec 22 12:14:50 2009
@@ -41,9 +41,9 @@
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.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
@@ -102,7 +102,7 @@
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.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/integration/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java Tue Dec 22 12:14:50 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.api.user.UsersRepository;
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.lifecycle.Configurable;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.core.fastfail.AbstractValidRcptHandler;
import org.apache.mailet.MailAddress;
@@ -104,7 +104,7 @@
}
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.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/integration/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java?rev=893152&r1=893151&r2=893152&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java Tue Dec 22 12:14:50 2009
@@ -34,9 +34,9 @@
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.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
@@ -90,7 +90,7 @@
}
/**
- * @see org.apache.james.api.protocol.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
@SuppressWarnings("unchecked")
public void configure(Configuration config) throws ConfigurationException {
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=893152&r1=893151&r2=893152&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 Tue Dec 22 12:14:50 2009
@@ -33,12 +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.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;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
/**
* Abstract class which HandlerChains should extend
@@ -135,8 +135,8 @@
}
// configure the handler
- if (handler instanceof org.apache.james.api.protocol.Configurable) {
- org.apache.james.api.protocol.Configurable configurableHandler = (org.apache.james.api.protocol.Configurable) handler;
+ if (handler instanceof org.apache.james.lifecycle.Configurable) {
+ org.apache.james.lifecycle.Configurable configurableHandler = (org.apache.james.lifecycle.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