james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1001738 - in /james/server/trunk: core-library/src/test/java/org/apache/james/services/ dnsservice-dnsjava/src/main/resources/ dnsservice-dnsjava/src/main/resources/META-INF/spring/ domain-library/src/main/java/org/apache/james/domain/ fet...
Date Mon, 27 Sep 2010 13:47:22 GMT
Author: eric
Date: Mon Sep 27 13:47:21 2010
New Revision: 1001738

URL: http://svn.apache.org/viewvc?rev=1001738&view=rev
Log:
dnssever bean is now dnsservice (JAMES-1050)

Added:
    james/server/trunk/dnsservice-dnsjava/src/main/resources/dnsservice.xml
      - copied unchanged from r1001721, james/server/trunk/dnsservice-dnsjava/src/main/resources/dnsserver.xml
    james/server/trunk/spring-deployment/src/main/config/james/dnsservice.xml
      - copied unchanged from r1001721, james/server/trunk/spring-deployment/src/main/config/james/dnsserver.xml
Removed:
    james/server/trunk/dnsservice-dnsjava/src/main/resources/dnsserver.xml
    james/server/trunk/spring-deployment/src/main/config/james/dnsserver.xml
Modified:
    james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java
    james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
    james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
    james/server/trunk/domain-library/src/main/java/org/apache/james/domain/AbstractDomainList.java
    james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
    james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
    james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
    james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailServer.java
    james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
    james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
    james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java
(original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java
Mon Sep 27 13:47:21 2010
@@ -34,7 +34,7 @@ public class FakeJSR250Loader extends Ab
         
         mappings.put("James", "org.apache.james.services.MailServer");
         mappings.put("filesystem", "org.apache.james.services.FileSystem");
-        mappings.put("dnsserver", "org.apache.james.api.dnsservice.DNSService");
+        mappings.put("dnsservice", "org.apache.james.api.dnsservice.DNSService");
         mappings.put("mailstore", "org.apache.avalon.cornerstone.services.store.Store");
         mappings.put("users-store", "org.apache.james.api.user.UsersStore");
         mappings.put("localusersrepository", "org.apache.james.api.user.UsersRepository");

Modified: james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
(original)
+++ james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
Mon Sep 27 13:47:21 2010
@@ -38,6 +38,6 @@
         <property name="order" value="3" />
     </bean>
     
-    <bean id="dnsserver" class="org.apache.james.dnsservice.dnsjava.DNSJavaServer" />
+    <bean id="dnsservice" class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
 
 </beans>

Modified: james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
(original)
+++ james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
Mon Sep 27 13:47:21 2010
@@ -9,7 +9,7 @@
        http://www.springframework.org/schema/beans/spring-beans.xsd">                
  
 
     <!--  export the dnsserver as osgi service -->
-    <service id="dnsserver" ref="dnsserver"                                 
+    <service id="dnsservice" ref="dnsservice"                                 
        interface="org.apache.james.dnsservice.api.DNSService" />
        
 </beans:beans>

Modified: james/server/trunk/domain-library/src/main/java/org/apache/james/domain/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-library/src/main/java/org/apache/james/domain/AbstractDomainList.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/domain-library/src/main/java/org/apache/james/domain/AbstractDomainList.java
(original)
+++ james/server/trunk/domain-library/src/main/java/org/apache/james/domain/AbstractDomainList.java
Mon Sep 27 13:47:21 2010
@@ -44,7 +44,7 @@ public abstract class AbstractDomainList
     private boolean autoDetectIP = true;
     private Log logger;
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java Mon
Sep 27 13:47:21 2010
@@ -657,7 +657,7 @@ public class FetchMail implements Runnab
     }
     
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dnsServer = dns;
     }

Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
(original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
Mon Sep 27 13:47:21 2010
@@ -84,7 +84,7 @@ public class FetchScheduler implements F
     }
 
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
(original)
+++ james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
Mon Sep 27 13:47:21 2010
@@ -85,7 +85,7 @@ public class JamesMailetContext implemen
         this.mailServer = mailServer;
     }
 
-    @Resource(name = "dnsserver")
+    @Resource(name = "dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
Mon Sep 27 13:47:21 2010
@@ -245,7 +245,7 @@ public abstract class AbstractRedirect e
     }
     
 
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
Mon Sep 27 13:47:21 2010
@@ -62,7 +62,7 @@ public abstract class AbstractVirtualUse
         this.mailServer = mailServer;
     }
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Mon Sep 27 13:47:21 2010
@@ -198,7 +198,7 @@ public class RemoteDelivery extends Gene
         this.queueFactory = queueFactory;
     }
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dnsService) {
         this.dnsServer = dnsService;
     }

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
Mon Sep 27 13:47:21 2010
@@ -92,7 +92,7 @@ public abstract class AbstractNetworkMat
      * 
      * @param dnsService
      */
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dnsService) {
         this.dnsServer = dnsService;
     }

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
Mon Sep 27 13:47:21 2010
@@ -55,7 +55,7 @@ public class InSpammerBlacklist extends 
 
   
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dnsService) {
         this.dnsServer = dnsService;
     }

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
Mon Sep 27 13:47:21 2010
@@ -53,7 +53,7 @@ public class NetworkIsInWhitelist extend
      * 
      * @param dnsService
      */
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
(original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
Mon Sep 27 13:47:21 2010
@@ -93,7 +93,7 @@ public abstract class AbstractConfigurab
     
     private SSLContext context;
 
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public final void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailServer.java?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailServer.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailServer.java Mon
Sep 27 13:47:21 2010
@@ -95,7 +95,7 @@ public class JamesMailServer
         this.domains = domains;
     }
     
-    @Resource(name="dnsserver")
+    @Resource(name="dnsservice")
     public void setDNSService(DNSService dns) {
         this.dns = dns;
     }

Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Mon Sep 27
13:47:21 2010
@@ -38,7 +38,7 @@
                 <prop key="fetchmail"> bean:name=fetchmail</prop> 
                 <prop key="smtpserver">bean:name=smtpserver</prop> 
                 <prop key="James" >bean:name=James</prop>
-                <prop key="dnsserver" >bean:name=dnsserver</prop> 
+                <prop key="dnsservice" >bean:name=dnsservice</prop> 
                 <prop key="remotemanager" >bean:name=remotemanager</prop> 
                 <prop key="pop3server" >bean:name=pop3server</prop> 
                 <prop key="virtualusertablemanagement">bean:name=virtualusertablemanagement</prop>

@@ -169,7 +169,7 @@
 
     <bean id="mailetpackages" class="org.apache.james.mailetcontainer.JamesMailetLoader"
/>
 
-    <bean id="dnsserver" class="org.apache.james.dnsservice.dnsjava.DNSJavaServer" />
+    <bean id="dnsservice" class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
 
     <!-- The Spool Management 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=1001738&r1=1001737&r2=1001738&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
Mon Sep 27 13:47:21 2010
@@ -50,7 +50,7 @@ It might become outdated. Check for prod
     <!-- 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.DNSService"/>
+    <provide name="dnsservice" role="org.apache.james.dnsservice.api.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"/>
@@ -95,7 +95,7 @@ It might become outdated. Check for prod
     <provide name="filesystem" role="org.apache.james.services.FileSystem" />
   </block>
 
-  <block name="dnsserver" class="org.apache.james.dnsserver.DNSServer" />
+  <block name="dnsservice" class="org.apache.james.dnsserver.DNSServer" />
 
   <!-- The Spool Management block  -->
   <block name="spoolmanagement" class="org.apache.james.management.impl.SpoolManagement"
>
@@ -127,7 +127,7 @@ It might become outdated. Check for prod
              role="org.apache.james.management.SpoolManagementService"/>
     <provide name="bayesiananalyzermanagement"
              role="org.apache.james.management.BayesianAnalyzerManagementService"/>
-    <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/>
+    <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
     <provide name="processormanagement" role="org.apache.james.management.ProcessorManagementService"/>
     <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/>
     <provide name="domainlistmanagement" role="org.apache.james.management.DomainListManagementService"/>
@@ -157,7 +157,7 @@ It might become outdated. Check for prod
              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.DNSService"/> 
  
+    <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
   
   </block>      
     
   <!-- POP3 Server -->
@@ -170,14 +170,14 @@ It might become outdated. Check for prod
     <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.DNSService"/>
+    <provide name="dnsservice" 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.DNSService"/>
+    <provide name="dnsservice" 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 @@ It might become outdated. Check for prod
              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.DNSService"/>
+    <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
   </block>
 
@@ -218,7 +218,7 @@ It might become outdated. Check for prod
              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.DNSService"/>
+    <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
   </block>
 
   <!-- The High Level Storage block -->
@@ -272,7 +272,7 @@ It might become outdated. Check for prod
     <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.DNSService"/>
+    <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
   </block>
   
   <block name="defaultvirtualusertable" class="org.apache.james.impl.vut.DefaultVirtualUserTable">
@@ -284,7 +284,7 @@ It might become outdated. Check for prod
   <!-- ######################################################################## -->
   <!-- The context domainlist implementation -->
   <block name="domainlist" class="org.apache.james.domain.XMLDomainList">
-      <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/>
+      <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
   </block>
   
   <!--  JDBC implementation of the domainlist service-->
@@ -293,7 +293,7 @@ It might become outdated. Check for prod
       <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.DNSService"/>
+      <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
   </block>
   -->
   
@@ -303,14 +303,14 @@ It might become outdated. Check for prod
     <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.DNSService"/>
+    <provide name="dnsservice" 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.DNSService"/>
+      <provide name="dnsservice" role="org.apache.james.api.dnsservice.DNSService"/>
   </block>
   -->
   <!-- #################################################################### -->

Modified: james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml?rev=1001738&r1=1001737&r2=1001738&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml
Mon Sep 27 13:47:21 2010
@@ -57,7 +57,7 @@
             <prop key="fetchmail" >bean:name=fetchmail</prop>
             <prop key="smtpserver" >bean:name=smtpserver</prop>
             <prop key="James" >bean:name=James</prop>
-            <prop key="dnsserver" >bean:name=dnsserver</prop>
+            <prop key="dnsservice" >bean:name=dnsservice</prop>
             <prop key="remotemanager" >bean:name=remotemanager</prop>
             <prop key="pop3server" >bean:name=pop3server</prop>
             <prop key="nntpserver" >bean:name=nntpserver</prop>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message