Author: norman
Date: Sun Oct 25 09:36:01 2009
New Revision: 829518
URL: http://svn.apache.org/viewvc?rev=829518&view=rev
Log:
Rename ConfigurationConverter to ConfigurationAdapter
Move some more Test to smtpserver-protocol-library
Added:
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java
- copied, changed from r829396,
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandlerTest.java
- copied, changed from r829399,
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
Removed:
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandlerTest.java
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandlerTest.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java
(from r829396,
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java&p1=james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java&r1=829396&r2=829518&rev=829518&view=diff
==============================================================================
---
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationAdapter.java
Sun Oct 25 09:36:01 2009
@@ -29,11 +29,11 @@
/**
* Bridges commons configuration to Avalon.
*/
-public class ConfigurationConverter extends XMLConfiguration {
+public class ConfigurationAdapter extends XMLConfiguration {
private static final long serialVersionUID = 6920719067623856243L;
- public
ConfigurationConverter(org.apache.avalon.framework.configuration.Configuration
avalonConfig) throws ConfigurationException {
+ public
ConfigurationAdapter(org.apache.avalon.framework.configuration.Configuration
avalonConfig) throws ConfigurationException {
String config = ConfigurationUtil.toString(avalonConfig);
load(new ByteArrayInputStream(config.getBytes()));
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
Sun Oct 25 09:36:01 2009
@@ -34,7 +34,7 @@
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
-import org.apache.james.util.ConfigurationConverter;
+import org.apache.james.util.ConfigurationAdapter;
/**
* <p>Accepts POP3 connections on a server socket and dispatches them to
POP3Handlers.</p>
@@ -131,7 +131,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationAdapter jamesConfiguration = new
ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
if (jamesConfiguration.getString("@coreHandlersPackage") == null)
jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
Sun Oct 25 09:36:01 2009
@@ -37,7 +37,7 @@
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
-import org.apache.james.util.ConfigurationConverter;
+import org.apache.james.util.ConfigurationAdapter;
/**
* Provides a really rude network interface to administer James.
@@ -154,7 +154,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationAdapter jamesConfiguration = new
ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
if (jamesConfiguration.getString("@coreHandlersPackage") == null)
jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
Modified:
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandlerTest.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandlerTest.java
(original)
+++
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandlerTest.java
Sun Oct 25 09:36:01 2009
@@ -121,14 +121,14 @@
*/
private void setupMockedSMTPSession(final MailAddress rcpt) {
mockedSMTPSession = new BaseFakeSMTPSession() {
- HashMap state = new HashMap();
- HashMap connectionState = new HashMap();
+ HashMap<String,Object> state = new HashMap<String,Object>();
+ HashMap<String,Object> connectionState = new
HashMap<String,Object>();
public String getRemoteIPAddress() {
return remoteIp;
}
- public Map getState() {
+ public Map<String,Object> getState() {
return state;
}
@@ -144,7 +144,7 @@
return 0;
}
- public Map getConnectionState() {
+ public Map<String,Object> getConnectionState() {
return connectionState;
}
@@ -249,207 +249,170 @@
rbl.configure(new Configuration() {
public Configuration subset(String prefix) {
- // TODO Auto-generated method stub
return null;
}
public void setProperty(String key, Object
value) {
- // TODO Auto-generated method stub
}
public boolean isEmpty() {
- // TODO Auto-generated method stub
return true;
}
public String[] getStringArray(String key) {
- // TODO Auto-generated method stub
return null;
}
public String getString(String key, String
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public String getString(String key) {
- // TODO Auto-generated method stub
return null;
}
public Short getShort(String key, Short
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public short getShort(String key, short
defaultValue) {
- // TODO Auto-generated method stub
return 0;
}
public short getShort(String key) {
- // TODO Auto-generated method stub
return 0;
}
public Object getProperty(String key) {
- // TODO Auto-generated method stub
return null;
}
public Properties getProperties(String key) {
- // TODO Auto-generated method stub
return null;
}
public Long getLong(String key, Long
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public long getLong(String key, long
defaultValue) {
- // TODO Auto-generated method stub
return 0;
}
public long getLong(String key) {
- // TODO Auto-generated method stub
return 0;
}
- public List getList(String key, List
defaultValue) {
- // TODO Auto-generated method stub
+ @SuppressWarnings("unchecked")
+ public List getList(String key, List defaultValue) {
return null;
}
- public List getList(String key) {
- // TODO Auto-generated method stub
+ @SuppressWarnings("unchecked")
+ public List getList(String key) {
return null;
}
- public Iterator getKeys(String prefix) {
- // TODO Auto-generated method stub
+ @SuppressWarnings("unchecked")
+ public Iterator getKeys(String prefix) {
return null;
}
- public Iterator getKeys() {
- // TODO Auto-generated method stub
+ @SuppressWarnings("unchecked")
+ public Iterator getKeys() {
return null;
}
public Integer getInteger(String key, Integer
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public int getInt(String key, int defaultValue)
{
- // TODO Auto-generated method stub
return 0;
}
public int getInt(String key) {
- // TODO Auto-generated method stub
return 0;
}
public Float getFloat(String key, Float
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public float getFloat(String key, float
defaultValue) {
- // TODO Auto-generated method stub
return 0;
}
public float getFloat(String key) {
- // TODO Auto-generated method stub
return 0;
}
public Double getDouble(String key, Double
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public double getDouble(String key, double
defaultValue) {
- // TODO Auto-generated method stub
return 0;
}
public double getDouble(String key) {
- // TODO Auto-generated method stub
return 0;
}
public Byte getByte(String key, Byte
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public byte getByte(String key, byte
defaultValue) {
- // TODO Auto-generated method stub
return 0;
}
public byte getByte(String key) {
- // TODO Auto-generated method stub
return 0;
}
public Boolean getBoolean(String key, Boolean
defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public boolean getBoolean(String key, boolean
defaultValue) {
- // TODO Auto-generated method stub
return false;
}
public boolean getBoolean(String key) {
- // TODO Auto-generated method stub
return false;
}
public BigInteger getBigInteger(String key,
BigInteger defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public BigInteger getBigInteger(String key) {
- // TODO Auto-generated method stub
return null;
}
public BigDecimal getBigDecimal(String key,
BigDecimal defaultValue) {
- // TODO Auto-generated method stub
return null;
}
public BigDecimal getBigDecimal(String key) {
- // TODO Auto-generated method stub
return null;
}
public boolean containsKey(String key) {
- // TODO Auto-generated method stub
return false;
}
public void clearProperty(String key) {
- // TODO Auto-generated method stub
}
public void clear() {
- // TODO Auto-generated method stub
}
public void addProperty(String key, Object
value) {
- // TODO Auto-generated method stub
}
});
Modified:
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandlerTest.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandlerTest.java
(original)
+++
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandlerTest.java
Sun Oct 25 09:36:01 2009
@@ -50,8 +50,8 @@
SMTPSession session = new BaseFakeSMTPSession() {
- HashMap connectionMap = new HashMap();
- HashMap map = new HashMap();
+ HashMap<String,Object> connectionMap = new
HashMap<String,Object>();
+ HashMap<String,Object> map = new HashMap<String,Object>();
public boolean isAuthSupported() {
return authRequired;
@@ -61,7 +61,7 @@
return user;
}
- public Map getConnectionState() {
+ public Map<String,Object> getConnectionState() {
return connectionMap;
}
@@ -69,7 +69,7 @@
return relaying;
}
- public Map getState() {
+ public Map<String,Object> getState() {
return map;
}
Copied:
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandlerTest.java
(from r829399,
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandlerTest.java?p2=james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandlerTest.java&p1=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java&r1=829399&r2=829518&rev=829518&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
(original)
+++
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandlerTest.java
Sun Oct 25 09:36:01 2009
@@ -18,18 +18,16 @@
****************************************************************/
-package org.apache.james.smtpserver;
+package org.apache.james.smtpserver.protocol.core.fastfail;
import java.util.ArrayList;
import javax.mail.internet.ParseException;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.core.fastfail.SpamTrapHandler;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
@@ -52,11 +50,10 @@
String ip2 = "192.168.100.2";
long blockTime = 2000;
- ArrayList rcpts = new ArrayList();
+ ArrayList<String> rcpts = new ArrayList<String>();
rcpts.add(SPAM_TRAP_RECIP1);
SpamTrapHandler handler = new SpamTrapHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setBlockTime(blockTime);
handler.setSpamTrapRecipients(rcpts);
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Sun Oct 25 09:36:01 2009
@@ -38,7 +38,7 @@
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
-import org.apache.james.util.ConfigurationConverter;
+import org.apache.james.util.ConfigurationAdapter;
import org.apache.mailet.MailetContext;
/**
@@ -243,7 +243,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationAdapter jamesConfiguration = new
ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
if (jamesConfiguration.getString("@coreHandlersPackage") == null)
jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
Sun Oct 25 09:36:01 2009
@@ -45,7 +45,7 @@
import org.apache.james.socket.api.ProtocolHandlerFactory;
import org.apache.james.socket.api.ProtocolServer;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
-import org.apache.james.util.ConfigurationConverter;
+import org.apache.james.util.ConfigurationAdapter;
import org.apache.mailet.MailetContext;
/**
@@ -269,7 +269,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationAdapter jamesConfiguration = new
ConfigurationAdapter(handlerConfiguration.getChild("handlerchain"));
if (jamesConfiguration.getString("@coreHandlersPackage") == null)
jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java?rev=829518&r1=829517&r2=829518&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
Sun Oct 25 09:36:01 2009
@@ -37,7 +37,7 @@
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
-import org.apache.james.util.ConfigurationConverter;
+import org.apache.james.util.ConfigurationAdapter;
import org.apache.mailet.MailetContext;
import org.guiceyfruit.jsr250.Jsr250Module;
@@ -73,7 +73,7 @@
*/
public void configure(Configuration config) throws ConfigurationException {
try {
- this.config = new ConfigurationConverter(config);
+ this.config = new ConfigurationAdapter(config);
} catch (org.apache.commons.configuration.ConfigurationException e) {
throw new ConfigurationException("Unable to convert
configuration", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
