Author: norman
Date: Thu Jun 23 09:14:24 2011
New Revision: 1138783
URL: http://svn.apache.org/viewvc?rev=1138783&view=rev
Log:
AbstractConfigurableAsyncServer should not depend on DNSService. See JAMES-1278
Modified:
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/protocols-library/pom.xml
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Modified: james/server/trunk/lmtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1138783&r1=1138782&r2=1138783&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Thu Jun 23 09:14:24 2011
@@ -31,7 +31,14 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-smtpserver</artifactId>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1138783&r1=1138782&r2=1138783&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Thu Jun 23 09:14:24 2011
@@ -38,10 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
@@ -115,12 +111,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1138783&r1=1138782&r2=1138783&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Thu Jun 23 09:14:24 2011
@@ -22,8 +22,6 @@ package org.apache.james.pop3server;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Reader;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -35,8 +33,6 @@ import junit.framework.TestCase;
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
-import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.mock.MockDNSService;
import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxException;
@@ -62,7 +58,6 @@ public class POP3ServerTest extends Test
private POP3TestConfiguration m_testConfiguration;
private MockUsersRepository m_usersRepository = new MockUsersRepository();
private POP3Client m_pop3Protocol = null;
- protected DNSService dnsservice;
protected MockFileSystem fSystem;
protected MockProtocolHandlerLoader chain;
private InMemoryMailboxManager manager;
@@ -89,7 +84,6 @@ public class POP3ServerTest extends Test
protected void setUpPOP3Server() throws Exception {
m_pop3Server = createPOP3Server();
- m_pop3Server.setDNSService(dnsservice);
m_pop3Server.setFileSystem(fSystem);
m_pop3Server.setProtocolHandlerLoader(chain);
@@ -133,27 +127,11 @@ public class POP3ServerTest extends Test
chain.put("mailboxmanager", manager);
- dnsservice = setUpDNSServer();
- chain.put("dnsservice", setUpDNSServer());
fSystem = new MockFileSystem();
chain.put("filesystem", fSystem);
}
- private DNSService setUpDNSServer() {
- DNSService dns = new MockDNSService() {
- public String getHostName(InetAddress addr) {
- return "localhost";
- }
-
- public InetAddress getLocalHost() throws UnknownHostException {
- return InetAddress.getLocalHost();
- }
-
- };
- return dns;
- }
-
protected void tearDown() throws Exception {
try {
if (m_pop3Protocol != null) {
Modified: james/server/trunk/protocols-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/pom.xml?rev=1138783&r1=1138782&r2=1138783&view=diff
==============================================================================
--- james/server/trunk/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols-library/pom.xml Thu Jun 23 09:14:24 2011
@@ -84,10 +84,6 @@ Parent pom build failure prevents inheri
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1138783&r1=1138782&r2=1138783&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Thu Jun 23 09:14:24 2011
@@ -36,7 +36,6 @@ import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.LogEnabled;
@@ -84,8 +83,6 @@ public abstract class AbstractConfigurab
private Logger logger;
- private DNSService dns;
-
private boolean enabled;
protected int connPerIP;
@@ -113,12 +110,6 @@ public abstract class AbstractConfigurab
private int maxExecutorThreads;
-
- @Resource(name = "dnsservice")
- public final void setDNSService(DNSService dns) {
- this.dns = dns;
- }
-
@Resource(name = "filesystem")
public final void setFileSystem(FileSystem filesystem) {
this.fileSystem = filesystem;
@@ -293,15 +284,7 @@ public abstract class AbstractConfigurab
// override me
}
- /**
- * Return the DNSService
- *
- * @return dns
- */
- protected DNSService getDNSService() {
- return dns;
- }
-
+
/**
* Return the FileSystem
*
@@ -321,7 +304,7 @@ public abstract class AbstractConfigurab
StringBuilder infoBuffer;
String hostName = null;
try {
- hostName = dns.getHostName(dns.getLocalHost());
+ hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException ue) {
hostName = "localhost";
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1138783&r1=1138782&r2=1138783&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Thu Jun 23 09:14:24 2011
@@ -22,6 +22,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.protocols.api.ProtocolHandlerLoader;
import org.apache.james.protocols.lib.ProtocolHandlerChainImpl;
@@ -93,11 +94,18 @@ public class SMTPServer extends Abstract
private HierarchicalConfiguration configuration;
+ private DNSService dns;
+
@Resource(name = "protocolhandlerloader")
public void setProtocolHandlerLoader(ProtocolHandlerLoader loader) {
this.loader = loader;
}
+ @Resource(name = "dnsservice")
+ public void setDNSService(DNSService dns) {
+ this.dns = dns;
+ }
+
public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
if (isEnabled()) {
String authRequiredString =
configuration.getString("authRequired", "false").trim().toLowerCase();
@@ -138,7 +146,7 @@ public class SMTPServer extends Abstract
String addr = st.nextToken();
networks.add(addr);
}
- authorizedNetworks = new NetMatcher(networks, getDNSService());
+ authorizedNetworks = new NetMatcher(networks, dns);
}
if (authorizedNetworks != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
