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 2006/10/20 16:11:28 UTC
svn commit: r466117 - in /james/server/trunk/src:
java/org/apache/james/core/ java/org/apache/james/dnsserver/
java/org/apache/james/domain/ java/org/apache/james/fetchmail/
java/org/apache/james/services/ test/org/apache/james/domain/
test/org/apache/...
Author: norman
Date: Fri Oct 20 07:11:23 2006
New Revision: 466117
URL: http://svn.apache.org/viewvc?view=rev&rev=466117
Log:
Wrap InetAddress.getLocalHost() in DNSServer to allow better controll about dns usage for mocking etc.
Modified:
james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
james/server/trunk/src/java/org/apache/james/core/LocalUsersRepository.java
james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
james/server/trunk/src/java/org/apache/james/domain/XMLDomainList.java
james/server/trunk/src/java/org/apache/james/fetchmail/MessageProcessor.java
james/server/trunk/src/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/src/java/org/apache/james/services/DNSServer.java
james/server/trunk/src/test/org/apache/james/domain/XMLDomainListTest.java
james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
Modified: james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java (original)
+++ james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java Fri Oct 20 07:11:23 2006
@@ -316,7 +316,7 @@
StringBuffer infoBuffer;
String hostName = null;
try {
- hostName = dnsServer.getHostName(InetAddress.getLocalHost());
+ hostName = dnsServer.getHostName(dnsServer.getLocalHost());
} catch (UnknownHostException ue) {
hostName = "localhost";
}
Modified: james/server/trunk/src/java/org/apache/james/core/LocalUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/core/LocalUsersRepository.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/LocalUsersRepository.java (original)
+++ james/server/trunk/src/java/org/apache/james/core/LocalUsersRepository.java Fri Oct 20 07:11:23 2006
@@ -43,12 +43,18 @@
this.usersStore = usersStore;
}
+ /**
+ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
public void service(ServiceManager serviceManager) throws ServiceException {
UsersStore usersStore =
(UsersStore) serviceManager.lookup(UsersStore.ROLE);
setUsersStore(usersStore);
}
+ /**
+ * @see org.apache.avalon.framework.activity.Initializable#initialize()
+ */
public void initialize() throws Exception {
users = usersStore.getRepository("LocalUsers");
if (users == null) {
@@ -56,54 +62,93 @@
}
}
+ /**
+ * @see org.apache.james.services.UsersRepository#addUser(org.apache.james.services.User)
+ */
public boolean addUser(User user) {
return users.addUser(user);
}
-
+
+ /**
+ * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.Object)
+ */
public void addUser(String name, Object attributes) {
users.addUser(name,attributes);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ */
public boolean addUser(String username, String password) {
return users.addUser(username, password);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#getUserByName(java.lang.String)
+ */
public User getUserByName(String name) {
return users.getUserByName(name);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ */
public User getUserByNameCaseInsensitive(String name) {
return users.getUserByNameCaseInsensitive(name);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#getRealName(java.lang.String)
+ */
public String getRealName(String name) {
return users.getRealName(name);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#updateUser(org.apache.james.services.User)
+ */
public boolean updateUser(User user) {
return users.updateUser(user);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#removeUser(java.lang.String)
+ */
public void removeUser(String name) {
users.removeUser(name);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#contains(java.lang.String)
+ */
public boolean contains(String name) {
return users.contains(name);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#containsCaseInsensitive(java.lang.String)
+ */
public boolean containsCaseInsensitive(String name) {
return users.containsCaseInsensitive(name);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#test(java.lang.String, java.lang.String)
+ */
public boolean test(String name, String password) {
return users.test(name,password);
}
+ /**
+ * @see org.apache.james.services.UsersRepository#countUsers()
+ */
public int countUsers() {
return users.countUsers();
}
+ /**
+ * @see org.apache.james.services.UsersRepository#list()
+ */
public Iterator list() {
return users.list();
}
Modified: james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java Fri Oct 20 07:11:23 2006
@@ -536,11 +536,18 @@
* @see org.apache.james.services.DNSServer#getHostName(java.net.InetAddress)
*/
public String getHostName(InetAddress addr){
- try {
+ try {
return org.xbill.DNS.Address.getHostName(addr);
- } catch (UnknownHostException e) {
- return addr.getHostAddress();
+ } catch (UnknownHostException e) {
+ return addr.getHostAddress();
+ }
}
+
+ /**
+ * @see org.apache.james.services.DNSServer#getLocalHost()
+ */
+ public InetAddress getLocalHost() throws UnknownHostException {
+ return InetAddress.getLocalHost();
}
}
Modified: james/server/trunk/src/java/org/apache/james/domain/XMLDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/domain/XMLDomainList.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/domain/XMLDomainList.java (original)
+++ james/server/trunk/src/java/org/apache/james/domain/XMLDomainList.java Fri Oct 20 07:11:23 2006
@@ -48,7 +48,7 @@
String hostName = null;
try {
- hostName = getDNSServer().getHostName(InetAddress.getLocalHost());
+ hostName = getDNSServer().getHostName(getDNSServer().getLocalHost());
} catch (UnknownHostException ue) {
hostName = "localhost";
}
Modified: james/server/trunk/src/java/org/apache/james/fetchmail/MessageProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/fetchmail/MessageProcessor.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/fetchmail/MessageProcessor.java (original)
+++ james/server/trunk/src/java/org/apache/james/fetchmail/MessageProcessor.java Fri Oct 20 07:11:23 2006
@@ -799,7 +799,7 @@
{
try
{
- domainBuffer.append(java.net.InetAddress.getLocalHost().getCanonicalHostName());
+ domainBuffer.append(getDNSServer().getLocalHost().getCanonicalHostName());
}
catch (UnknownHostException ue)
{
Modified: james/server/trunk/src/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/fetchmail/ParsedConfiguration.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/src/java/org/apache/james/fetchmail/ParsedConfiguration.java Fri Oct 20 07:11:23 2006
@@ -894,7 +894,7 @@
String hostName = null;
try
{
- hostName = java.net.InetAddress.getLocalHost().getCanonicalHostName();
+ hostName = getDNSServer().getLocalHost().getCanonicalHostName();
}
catch (UnknownHostException ue)
{
Modified: james/server/trunk/src/java/org/apache/james/services/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/services/DNSServer.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/java/org/apache/james/services/DNSServer.java (original)
+++ james/server/trunk/src/java/org/apache/james/services/DNSServer.java Fri Oct 20 07:11:23 2006
@@ -95,4 +95,9 @@
* @see org.xbill.DNS.Address#getHostName(InetAddress)
*/
public String getHostName(InetAddress addr);
+
+ /**
+ * @see java.net.InetAddress.getLocalHost();
+ */
+ public InetAddress getLocalHost() throws UnknownHostException;
}
Modified: james/server/trunk/src/test/org/apache/james/domain/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/domain/XMLDomainListTest.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/test/org/apache/james/domain/XMLDomainListTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/domain/XMLDomainListTest.java Fri Oct 20 07:11:23 2006
@@ -66,6 +66,10 @@
public InetAddress[] getAllByName(String name) throws UnknownHostException {
return new InetAddress[] { InetAddress.getByName("127.0.0.1")};
}
+
+ public InetAddress getLocalHost() throws UnknownHostException {
+ return InetAddress.getLocalHost();
+ }
};
return dns;
}
Modified: james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java Fri Oct 20 07:11:23 2006
@@ -50,6 +50,7 @@
import java.io.InputStream;
import java.io.Reader;
import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import junit.framework.TestCase;
@@ -110,12 +111,17 @@
}
private DNSServer setUpDNSServer() {
- DNSServer dns = new AbstractDNSServer() {
- public String getHostName(InetAddress addr) {
- return "localhost";
- }
- };
- return dns;
+ DNSServer dns = new AbstractDNSServer() {
+ public String getHostName(InetAddress addr) {
+ return "localhost";
+ }
+
+ public InetAddress getLocalHost() throws UnknownHostException {
+ return InetAddress.getLocalHost();
+ }
+
+ };
+ return dns;
}
protected void tearDown() throws Exception {
if (m_pop3Protocol != null) {
Modified: james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java Fri Oct 20 07:11:23 2006
@@ -48,6 +48,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -172,13 +173,17 @@
}
private DNSServer setUpDNSServer() {
- DNSServer dns = new AbstractDNSServer() {
- public String getHostName(InetAddress addr) {
- return "localhost";
- }
- };
+ DNSServer dns = new AbstractDNSServer() {
+ public String getHostName(InetAddress addr) {
+ return "localhost";
+ }
+
+ public InetAddress getLocalHost() throws UnknownHostException {
+ return InetAddress.getLocalHost();
+ }
+ };
- return dns;
+ return dns;
}
public void testLogin() throws IOException {
Modified: james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java (original)
+++ james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java Fri Oct 20 07:11:23 2006
@@ -73,4 +73,11 @@
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
+ /**
+ * @see org.apache.james.services.DNSServer#getLocalHost()
+ */
+ public InetAddress getLocalHost() throws UnknownHostException {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+ }
+
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java?view=diff&rev=466117&r1=466116&r2=466117
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java Fri Oct 20 07:11:23 2006
@@ -146,6 +146,10 @@
public String getHostName(InetAddress addr) {
return addr.getHostName();
}
+
+ public InetAddress getLocalHost() throws UnknownHostException {
+ return InetAddress.getLocalHost();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org