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/09/09 13:52:03 UTC
svn commit: r812906 - in
/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core:
POP3BeforeSMTPHandler.java SetMimeHeaderHandler.java
Author: norman
Date: Wed Sep 9 11:52:03 2009
New Revision: 812906
URL: http://svn.apache.org/viewvc?rev=812906&view=rev
Log:
change the last handlers to use commons configuration (JAMES-918)
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java?rev=812906&r1=812905&r2=812906&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java Wed Sep 9 11:52:03 2009
@@ -20,9 +20,9 @@
package org.apache.james.smtpserver.core;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.smtpserver.Configurable;
import org.apache.james.smtpserver.ConnectHandler;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.util.POP3BeforeSMTPHelper;
@@ -38,20 +38,14 @@
*/
private long expireTime = POP3BeforeSMTPHelper.EXPIRE_TIME;
- /**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
- */
- public void configure(Configuration arg0) throws ConfigurationException {
- Configuration config = arg0.getChild("expireTime", false);
- if (config != null) {
- try {
- setExpireTime(config.getValue(null));
- } catch (NumberFormatException e) {
- throw new ConfigurationException(
- "Please configure a valid expireTime: "
- + e.getMessage());
- }
+ public void configure(Configuration config) throws ConfigurationException {
+ try {
+ setExpireTime(config.getString("expireTime",null));
+ } catch (NumberFormatException e) {
+ throw new ConfigurationException(
+ "Please configure a valid expireTime: "
+ + e.getMessage());
}
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java?rev=812906&r1=812905&r2=812906&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java Wed Sep 9 11:52:03 2009
@@ -23,9 +23,9 @@
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.smtpserver.Configurable;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookReturnCode;
@@ -44,20 +44,10 @@
private String headerName;
private String headerValue;
- /**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
- */
- public void configure(Configuration handlerConfiguration) throws ConfigurationException {
- Configuration configuration = handlerConfiguration.getChild("headername", false);
- if(configuration != null) {
- setHeaderName(configuration.getValue());
- }
-
- configuration = handlerConfiguration.getChild("headervalue", false);
- if(configuration != null) {
- setHeaderValue(configuration.getValue());
- }
+ public void configure(Configuration handlerConfiguration) throws ConfigurationException {
+ setHeaderName(handlerConfiguration.getString("headername"));
+ setHeaderValue(handlerConfiguration.getString("headervalue"));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org