Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Sun Aug 10 08:11:55 2008 @@ -25,7 +25,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.CommandHandler; import org.apache.james.smtpserver.SMTPSession; import org.apache.james.util.junkscore.JunkScore; @@ -48,7 +48,7 @@ private boolean checkAuthUsers = false; - protected DNSServer dnsServer = null; + protected DNSService dnsServer = null; /** * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration) @@ -74,7 +74,7 @@ * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager) */ public void service(ServiceManager serviceMan) throws ServiceException { - setDnsServer((DNSServer) serviceMan.lookup(DNSServer.ROLE)); + setDnsServer((DNSService) serviceMan.lookup(DNSService.ROLE)); } /** @@ -98,12 +98,12 @@ } /** - * Set the DNSServer + * Set the DNSService * * @param dnsServer - * The DNSServer + * The DNSService */ - public void setDnsServer(DNSServer dnsServer) { + public void setDnsServer(DNSService dnsServer) { this.dnsServer = dnsServer; }
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java Sun Aug 10 08:11:55 2008 @@ -41,7 +41,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.MessageHandler; import org.apache.james.smtpserver.SMTPSession; import org.apache.james.util.mail.dsn.DSNStatus; @@ -53,7 +53,7 @@ public class URIRBLHandler extends AbstractJunkHandler implements MessageHandler, Serviceable { - private DNSServer dnsServer; + private DNSService dnsServer; private Collection uriRbl; @@ -69,7 +69,7 @@ * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager) */ public void service(ServiceManager serviceMan) throws ServiceException { - setDnsServer((DNSServer) serviceMan.lookup(DNSServer.ROLE)); + setDnsServer((DNSService) serviceMan.lookup(DNSService.ROLE)); } /** @@ -138,12 +138,12 @@ } /** - * Set the DNSServer + * Set the DNSService * * @param dnsServer - * The DNSServer + * The DNSService */ - public void setDnsServer(DNSServer dnsServer) { + public void setDnsServer(DNSService dnsServer) { this.dnsServer = dnsServer; } Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java Sun Aug 10 08:11:55 2008 @@ -30,7 +30,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.smtpserver.CommandHandler; import org.apache.james.smtpserver.SMTPSession; @@ -45,7 +45,7 @@ public class ValidRcptMX extends AbstractJunkHandler implements CommandHandler, Serviceable { - private DNSServer dnsServer = null; + private DNSService dnsServer = null; private static final String LOCALHOST = "localhost"; @@ -86,9 +86,9 @@ * Set the banned networks * * @param networks Collection of networks - * @param dnsServer The DNSServer + * @param dnsServer The DNSService */ - public void setBannedNetworks(Collection networks, DNSServer dnsServer) { + public void setBannedNetworks(Collection networks, DNSService dnsServer) { bNetwork = new NetMatcher(networks, dnsServer) { protected void log(String s) { getLogger().debug(s); @@ -101,7 +101,7 @@ * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager) */ public void service(ServiceManager arg0) throws ServiceException { - setDNSServer((DNSServer) arg0.lookup(DNSServer.ROLE)); + setDNSServer((DNSService) arg0.lookup(DNSService.ROLE)); } /** @@ -121,12 +121,12 @@ } /** - * Set the DNSServer + * Set the DNSService * * @param dnsServer * The dnsServer */ - public void setDNSServer(DNSServer dnsServer) { + public void setDNSServer(DNSService dnsServer) { this.dnsServer = dnsServer; } Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java Sun Aug 10 08:11:55 2008 @@ -30,7 +30,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.smtpserver.CommandHandler; import org.apache.james.smtpserver.SMTPSession; @@ -43,7 +43,7 @@ private boolean checkAuthClients = false; - private DNSServer dnsServer = null; + private DNSService dnsServer = null; /** @@ -63,7 +63,7 @@ * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager) */ public void service(ServiceManager serviceMan) throws ServiceException { - setDnsServer((DNSServer) serviceMan.lookup(DNSServer.ROLE)); + setDnsServer((DNSService) serviceMan.lookup(DNSService.ROLE)); } /** @@ -71,7 +71,7 @@ * * @param dnsServer The DnsServer */ - public void setDnsServer(DNSServer dnsServer) { + public void setDnsServer(DNSService dnsServer) { this.dnsServer = dnsServer; } Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java Sun Aug 10 08:11:55 2008 @@ -34,7 +34,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.services.AbstractDNSServer; import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler; import org.apache.james.test.mock.avalon.MockLogger; @@ -46,7 +46,7 @@ public class DNSRBLHandlerTest extends TestCase { - private DNSServer mockedDnsServer; + private DNSService mockedDnsServer; private SMTPSession mockedSMTPSession; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java Sun Aug 10 08:11:55 2008 @@ -31,7 +31,7 @@ import junit.framework.TestCase; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.services.AbstractDNSServer; import org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler; import org.apache.james.test.mock.avalon.MockLogger; @@ -122,8 +122,8 @@ return session; } - private DNSServer setupMockDNSServer() { - DNSServer dns = new AbstractDNSServer(){ + private DNSService setupMockDNSServer() { + DNSService dns = new AbstractDNSServer(){ public InetAddress getByName(String host) throws UnknownHostException { if (host.equals(INVALID_HOST)) throw new UnknownHostException(); Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Sun Aug 10 08:11:55 2008 @@ -25,7 +25,7 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.user.UsersRepository; import org.apache.james.services.JamesConnectionManager; import org.apache.james.services.MailServer; @@ -67,7 +67,7 @@ */ public class SMTPServerTest extends TestCase { - private final class AlterableDNSServer implements DNSServer { + private final class AlterableDNSServer implements DNSService { private InetAddress localhostByName = null; @@ -206,7 +206,7 @@ m_serviceManager.put(SocketManager.ROLE, new MockSocketManager(m_smtpListenerPort)); m_serviceManager.put(ThreadManager.ROLE, new MockThreadManager()); m_dnsServer = new AlterableDNSServer(); - m_serviceManager.put(DNSServer.ROLE, m_dnsServer); + m_serviceManager.put(DNSService.ROLE, m_dnsServer); m_serviceManager.put(Store.ROLE, new MockStore()); return m_serviceManager; } Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Sun Aug 10 08:11:55 2008 @@ -39,7 +39,7 @@ import junit.framework.TestCase; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.services.AbstractDNSServer; import org.apache.james.smtpserver.core.filter.fastfail.URIRBLHandler; import org.apache.james.test.mock.avalon.MockLogger; @@ -162,8 +162,8 @@ * Setup the mocked dnsserver * */ - private DNSServer setupMockedDnsServer() { - DNSServer mockedDnsServer = new AbstractDNSServer() { + private DNSService setupMockedDnsServer() { + DNSService mockedDnsServer = new AbstractDNSServer() { public Collection findTXTRecords(String hostname) { List res = new ArrayList(); Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Sun Aug 10 08:11:55 2008 @@ -29,7 +29,7 @@ import javax.mail.internet.ParseException; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.services.AbstractDNSServer; import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptMX; import org.apache.james.test.mock.avalon.MockLogger; @@ -80,8 +80,8 @@ return session; } - private DNSServer setupMockedDNSServer() { - DNSServer dns = new AbstractDNSServer() { + private DNSService setupMockedDNSServer() { + DNSService dns = new AbstractDNSServer() { public Collection findMXRecords(String hostname) { Collection mx = new ArrayList(); @@ -110,7 +110,7 @@ Collection bNetworks = new ArrayList(); bNetworks.add("127.0.0.1"); - DNSServer dns = setupMockedDNSServer(); + DNSService dns = setupMockedDNSServer(); ValidRcptMX handler = new ValidRcptMX(); ContainerUtil.enableLogging(handler, new MockLogger()); @@ -130,7 +130,7 @@ SMTPSession session = setupMockedSMTPSession(new MailAddress("test@" + INVALID_HOST)); session.getState().put(JunkScore.JUNK_SCORE, new JunkScoreImpl()); - DNSServer dns = setupMockedDNSServer(); + DNSService dns = setupMockedDNSServer(); ValidRcptMX handler = new ValidRcptMX(); handler.setScore(20); handler.setAction("junkScore"); Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Sun Aug 10 08:11:55 2008 @@ -27,7 +27,7 @@ import javax.mail.internet.ParseException; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.services.AbstractDNSServer; import org.apache.james.smtpserver.core.filter.fastfail.ValidSenderDomainHandler; import org.apache.james.test.mock.avalon.MockLogger; @@ -45,8 +45,8 @@ response = null; } - private DNSServer setupDNSServer() { - DNSServer dns = new AbstractDNSServer(){ + private DNSService setupDNSServer() { + DNSService dns = new AbstractDNSServer(){ public Collection findMXRecords(String hostname) { Collection mx = new ArrayList(); Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java Sun Aug 10 08:11:55 2008 @@ -36,7 +36,7 @@ import org.apache.avalon.framework.service.Serviceable; import org.apache.commons.collections.map.ReferenceMap; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.api.domainlist.DomainList; import org.apache.james.api.user.UsersRepository; @@ -915,7 +915,7 @@ * found for domainName, the Iterator returned will be empty and the * first call to hasNext() will return false. * - * @see org.apache.james.api.dnsservice.DNSServer#getSMTPHostAddresses(String) + * @see org.apache.james.api.dnsservice.DNSService#getSMTPHostAddresses(String) * @since Mailet API v2.2.0a16-unstable * @param domainName - the domain for which to find mail servers * @return an Iterator over HostAddress instances, sorted by priority @@ -929,10 +929,10 @@ } } - protected DNSServer lookupDNSServer() { - DNSServer dnsServer; + protected DNSService lookupDNSServer() { + DNSService dnsServer; try { - dnsServer = (DNSServer) compMgr.lookup( DNSServer.ROLE ); + dnsServer = (DNSService) compMgr.lookup( DNSService.ROLE ); } catch ( final ServiceException cme ) { getLogger().error("Fatal configuration error - DNS Servers lost!", cme ); throw new RuntimeException("Fatal configuration error - DNS Servers lost!"); Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.xinfo URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.xinfo?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.xinfo (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.xinfo Sun Aug 10 08:11:55 2008 @@ -33,7 +33,7 @@ <dependencies> <dependency> - <service name="org.apache.james.api.dnsservice.DNSServer" version="1.0"/> + <service name="org.apache.james.api.dnsservice.DNSService" version="1.0"/> </dependency> <dependency> <service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/> Modified: james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml Sun Aug 10 08:11:55 2008 @@ -41,7 +41,7 @@ <!-- Specify which components will provide the services required by this block. The roles are specified in the code and the .xinfo file. The names here must match the names specified for a Block in this xml file. --> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/> <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> @@ -112,7 +112,7 @@ role="org.apache.james.services.SpoolManagementService"/> <provide name="bayesiananalyzermanagement" role="org.apache.james.services.BayesianAnalyzerManagementService"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="processormanagement" role="org.apache.james.services.ProcessorManagementService"/> <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/> <provide name="domainlistmanagement" role="org.apache.james.services.DomainListManagementService"/> @@ -142,7 +142,7 @@ role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> <provide name="mailboxmanager" role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" /> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- POP3 Server --> @@ -155,14 +155,14 @@ <provide name="James" role="org.apache.james.services.MailServer"/> <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- SMTP Server --> <block name="smtpserver" class="org.apache.james.smtpserver.SMTPServer" > <provide name="James" role="org.apache.mailet.MailetContext"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> <provide name="connections" @@ -188,7 +188,7 @@ role="org.apache.james.nntpserver.repository.NNTPRepository"/> <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="James" role="org.apache.james.services.MailServer"/> </block> @@ -203,7 +203,7 @@ role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> <provide name="James" role="org.apache.james.services.MailServer"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- JMS Service @@ -262,7 +262,7 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <block name="defaultvirtualusertable" class="org.apache.james.impl.vut.DefaultVirtualUserTable"> @@ -274,7 +274,7 @@ <!-- ######################################################################## --> <!-- The context domainlist implementation --> <block name="domainlist" class="org.apache.james.domain.XMLDomainList"> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- JDBC implementation of the domainlist service--> @@ -283,7 +283,7 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> @@ -293,14 +293,14 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> <!-- XML VirtualUserTable implementation of the domainlist service --> <!-- <block name="domainlist" class="org.apache.james.vut.XMLVirtualUserTable"> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> <!-- #################################################################### --> Modified: james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml (original) +++ james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml Sun Aug 10 08:11:55 2008 @@ -50,7 +50,7 @@ <!-- Specify which components will provide the services required by this block. The roles are specified in the code and the .xinfo file. The names here must match the names specified for a Block in this xml file. --> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/> <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> @@ -127,7 +127,7 @@ role="org.apache.james.services.SpoolManagementService"/> <provide name="bayesiananalyzermanagement" role="org.apache.james.services.BayesianAnalyzerManagementService"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="processormanagement" role="org.apache.james.services.ProcessorManagementService"/> <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/> <provide name="domainlistmanagement" role="org.apache.james.services.DomainListManagementService"/> @@ -157,7 +157,7 @@ role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> <provide name="mailboxmanager" role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" /> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- POP3 Server --> @@ -170,14 +170,14 @@ <provide name="James" role="org.apache.james.services.MailServer"/> <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- SMTP Server --> <block name="smtpserver" class="org.apache.james.smtpserver.SMTPServer" > <provide name="James" role="org.apache.mailet.MailetContext"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> <provide name="connections" @@ -203,7 +203,7 @@ role="org.apache.james.nntpserver.repository.NNTPRepository"/> <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="James" role="org.apache.james.services.MailServer"/> </block> @@ -218,7 +218,7 @@ role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> <provide name="James" role="org.apache.james.services.MailServer"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- The High Level Storage block --> @@ -272,7 +272,7 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <block name="defaultvirtualusertable" class="org.apache.james.impl.vut.DefaultVirtualUserTable"> @@ -284,7 +284,7 @@ <!-- ######################################################################## --> <!-- The context domainlist implementation --> <block name="domainlist" class="org.apache.james.domain.XMLDomainList"> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> <!-- JDBC implementation of the domainlist service--> @@ -293,7 +293,7 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> @@ -303,14 +303,14 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> <!-- XML VirtualUserTable implementation of the domainlist service --> <!-- <block name="domainlist" class="org.apache.james.vut.XMLVirtualUserTable"> - <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSServer"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> <!-- #################################################################### --> Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java Sun Aug 10 08:11:55 2008 @@ -38,7 +38,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.domainlist.DomainList; import org.apache.james.api.domainlist.DomainListUtil; import org.apache.james.api.vut.ErrorMappingException; @@ -57,7 +57,7 @@ private boolean autoDetect = true; private boolean autoDetectIP = true; - private DNSServer dns; + private DNSService dns; // The maximum mappings which will process before throwing exception private int mappingLimit = 10; @@ -69,7 +69,7 @@ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager) */ public void service(ServiceManager arg0) throws ServiceException { - dns = (DNSServer)arg0.lookup(DNSServer.ROLE); + dns = (DNSService)arg0.lookup(DNSService.ROLE); } Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=684517&r1=684516&r2=684517&view=diff ============================================================================== --- james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java (original) +++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java Sun Aug 10 08:11:55 2008 @@ -28,7 +28,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.service.ServiceException; -import org.apache.james.api.dnsservice.DNSServer; +import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.api.vut.ErrorMappingException; import org.apache.james.api.vut.VirtualUserTable; @@ -95,8 +95,8 @@ protected abstract boolean removeMapping(String user, String domain, String mapping, int type) throws InvalidMappingException; - protected DNSServer setUpDNSServer() { - DNSServer dns = new DNSServer() { + protected DNSService setUpDNSServer() { + DNSService dns = new DNSService() { public String getHostName(InetAddress inet) { return "test"; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
