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 ba...@apache.org on 2008/08/11 18:18:39 UTC

svn commit: r684792 - in /james/server/trunk: avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/ core-library/src/main/java/org/apache/james/management/ core-library/src/test/java/org/apache/james/test/util/ domai...

Author: bago
Date: Mon Aug 11 09:18:23 2008
New Revision: 684792

URL: http://svn.apache.org/viewvc?rev=684792&view=rev
Log:
Fixed a number of "ROLE" strings.
Make sure we use Interface.ROLE instead of the string when we lookup, or Interface.class.getName() so to 
better show dependencies and simplify refactoring.

Modified:
    james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java
    james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java
    james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/ManageableDomainList.java
    james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepository.java
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
    james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
    james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/Loader.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java

Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java Mon Aug 11 09:18:23 2008
@@ -21,7 +21,7 @@
 /**
  * content of a "provide" XML element from an assembly file.
  * occurs within a block element like this:
- *     <provide name="domainlist" role="org.apache.james.services.DomainList"/>
+ *     <provide name="domainlist" role="org.apache.james.api.domainlist.DomainList"/>
  *
  */
 public class AvalonServiceReference {

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java Mon Aug 11 09:18:23 2008
@@ -63,7 +63,7 @@
      * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
      */
     public void service(ServiceManager serviceManager) throws ServiceException {
-        Store mailStore = (Store)serviceManager.lookup("org.apache.avalon.cornerstone.services.store.Store" );
+        Store mailStore = (Store)serviceManager.lookup(Store.ROLE);
         setStore(mailStore);
     }
 

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java Mon Aug 11 09:18:23 2008
@@ -28,7 +28,7 @@
 import java.util.List;
 
 public interface SpoolManagementService {
-    String ROLE = "org.apache.james.services.SpoolManagementService";
+    String ROLE = "org.apache.james.management.SpoolManagementService";
 
     /**
      * Move all mails from the given repository to another repository matching the given filter criteria

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java Mon Aug 11 09:18:23 2008
@@ -22,6 +22,7 @@
 import org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.derby.jdbc.EmbeddedDriver;
 import org.apache.james.test.mock.avalon.MockLogger;
 import org.apache.james.test.mock.util.AttrValConfiguration;
 
@@ -97,9 +98,9 @@
         DefaultConfiguration dc = new DefaultConfiguration("database-connections");
         DefaultConfiguration ds = new DefaultConfiguration("data-source");
         ds.setAttribute("name","maildb");
-        ds.setAttribute("class","org.apache.james.util.dbcp.JdbcDataSource");
+        ds.setAttribute("class",org.apache.james.util.dbcp.JdbcDataSource.class.getName());
         
-        ds.addChild(new AttrValConfiguration("driver","org.apache.derby.jdbc.EmbeddedDriver"));
+        ds.addChild(new AttrValConfiguration("driver",EmbeddedDriver.class.getName()));
         ds.addChild(new AttrValConfiguration("dburl","jdbc:derby:target/testdb;create=true"));
         ds.addChild(new AttrValConfiguration("user","james"));
         ds.addChild(new AttrValConfiguration("password","james"));

Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/ManageableDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/ManageableDomainList.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/ManageableDomainList.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/ManageableDomainList.java Mon Aug 11 09:18:23 2008
@@ -27,7 +27,7 @@
  */
 public interface ManageableDomainList extends DomainList {
 
-    public final static String ROLE = "org.apache.james.services.ManageableDomainList";
+    public final static String ROLE = "org.apache.james.api.domainlist.ManageableDomainList";
     
     /**
      * Add domain to the service

Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java Mon Aug 11 09:18:23 2008
@@ -70,7 +70,7 @@
         UsersRepository usersRepository = ( UsersRepository ) serviceManager.
                 lookup( UsersRepository.ROLE );
         setUserRepository(usersRepository);
-        MailboxManagerProvider mailboxManagerProvider =(MailboxManagerProvider) serviceManager.lookup("org.apache.james.mailboxmanager.manager.MailboxManagerProvider");
+        MailboxManagerProvider mailboxManagerProvider =(MailboxManagerProvider) serviceManager.lookup(MailboxManagerProvider.ROLE);
         getLogger().debug("MailboxManagerMailRepository uses service "+mailboxManagerProvider);
         setMailboxManagerProvider(mailboxManagerProvider);
         setMailServer((MailServer) serviceManager.lookup(MailServer.ROLE));

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Mon Aug 11 09:18:23 2008
@@ -1228,8 +1228,7 @@
         if (isBindUsed) {
             // undocumented JavaMail 1.2 feature, smtp transport will use
             // our socket factory, which will also set the local address
-            props.put("mail.smtp.socketFactory.class",
-                      "org.apache.james.transport.mailets.RemoteDeliverySocketFactory");
+            props.put("mail.smtp.socketFactory.class", RemoteDeliverySocketFactory.class.getClass());
             // Don't fallback to the standard socket factory on error, do throw an exception
             props.put("mail.smtp.socketFactory.fallback", "false");
         }

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java Mon Aug 11 09:18:23 2008
@@ -19,6 +19,7 @@
 
 package org.apache.james.transport.remotedeliverytester;
 
+import org.apache.avalon.cornerstone.services.store.Store;
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.avalon.MockStore;
 import org.apache.james.test.mock.james.InMemorySpoolRepository;
@@ -107,7 +108,7 @@
         outgoingSpool = new InMemorySpoolRepository();
         // new AvalonSpoolRepository();
         mockStore.add("outgoing", outgoingSpool);
-        serviceManager.put("org.apache.avalon.cornerstone.services.store.Store", mockStore);
+        serviceManager.put(Store.ROLE, mockStore);
     }
     
     protected Properties getStandardParameters() {

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java Mon Aug 11 09:18:23 2008
@@ -123,7 +123,7 @@
         }
 
         public Object lookup(String arg0) throws ServiceException {
-            if (arg0.equals("org.apache.avalon.cornerstone.services.store.Store")) {
+            if (arg0.equals(Store.ROLE)) {
                 if (wrappedStore == null) wrappedStore = new StoreWrapper(owner, (Store) wrapped.lookup("org.apache.avalon.cornerstone.services.store.Store"));
                 return wrappedStore;
             }

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java Mon Aug 11 09:18:23 2008
@@ -91,7 +91,7 @@
         setUserRepository(userRepository);
 
         NNTPRepository repo = (NNTPRepository)componentManager
-            .lookup("org.apache.james.nntpserver.repository.NNTPRepository");
+            .lookup(NNTPRepository.ROLE);
         setRepository(repo);
         
         setMailServer((MailServer) componentManager.lookup(MailServer.ROLE));

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepository.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepository.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepository.java Mon Aug 11 09:18:23 2008
@@ -29,6 +29,8 @@
  * Abstraction of entire NNTP Repository.
  */
 public interface NNTPRepository {
+    
+    public final String ROLE = "org.apache.james.nttpserver.repository.NNTPRepository"; 
 
     /**
      * Gets the group with the specified name from within the repository.

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java Mon Aug 11 09:18:23 2008
@@ -466,7 +466,7 @@
      */
     private NNTPSpooler createSpooler() 
             throws ConfigurationException {
-        String className = "org.apache.james.nntpserver.repository.NNTPSpooler";
+        String className = NNTPSpooler.class.getName();
         Configuration spoolerConfiguration = configuration.getChild("spool");
         try {
             // Must be a subclass of org.apache.james.nntpserver.repository.NNTPSpooler

Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java Mon Aug 11 09:18:23 2008
@@ -44,6 +44,7 @@
 import org.apache.james.util.connection.SimpleConnectionManager;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetContext;
 
 import javax.mail.MessagingException;
 import javax.mail.Session;
@@ -198,7 +199,7 @@
         SimpleConnectionManager connectionManager = new SimpleConnectionManager();
         ContainerUtil.enableLogging(connectionManager, new MockLogger());
         m_serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
-        m_serviceManager.put("org.apache.mailet.MailetContext", new MockMailContext());
+        m_serviceManager.put(MailetContext.class.getName(), new MockMailContext());
         m_mailServer = new MockMailServer(new MockUsersRepository());
         m_serviceManager.put(MailServer.ROLE, m_mailServer);
         m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);

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=684792&r1=684791&r2=684792&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 Mon Aug 11 09:18:23 2008
@@ -200,7 +200,7 @@
         MailServer mailServer = (MailServer)componentManager.lookup(MailServer.ROLE );
         setMailServer(mailServer);
         Store store = (Store)componentManager.
-            lookup( "org.apache.avalon.cornerstone.services.store.Store" );
+            lookup( Store.ROLE );
         setStore(store);
         UsersStore usersStore = (UsersStore)componentManager. lookup(UsersStore.ROLE );
         setUsersStore(usersStore);

Modified: james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java (original)
+++ james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java Mon Aug 11 09:18:23 2008
@@ -30,7 +30,7 @@
     private Integer m_connectionLimit = null;
     private String m_loginName = "testLogin";
     private String m_loginPassword = "testPassword";
-    private String commandClassName = "org.apache.james.remotemanager.EchoCommand";
+    private String commandClassName = EchoCommand.class.getName();
     
     public RemoteManagerTestConfiguration(int smtpListenerPort) {
         super("smptserver");

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=684792&r1=684791&r2=684792&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 Mon Aug 11 09:18:23 2008
@@ -137,7 +137,7 @@
     public void service( final ServiceManager manager ) throws ServiceException {
         super.service( manager );
         serviceManager = manager;
-        mailetcontext = (MailetContext) manager.lookup("org.apache.mailet.MailetContext");
+        mailetcontext = (MailetContext) manager.lookup(MailetContext.class.getName());
         mailServer = (MailServer) manager.lookup(MailServer.ROLE);
         users = (UsersRepository) manager.lookup(UsersRepository.ROLE);
         dnsServer = (DNSService) manager.lookup(DNSService.ROLE); 

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=684792&r1=684791&r2=684792&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 Mon Aug 11 09:18:23 2008
@@ -42,6 +42,7 @@
 import org.apache.james.util.connection.SimpleConnectionManager;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetContext;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
@@ -199,7 +200,7 @@
         SimpleConnectionManager connectionManager = new SimpleConnectionManager();
         ContainerUtil.enableLogging(connectionManager, new MockLogger());
         m_serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
-        m_serviceManager.put("org.apache.mailet.MailetContext", new MockMailContext());
+        m_serviceManager.put(MailetContext.class.getName(), new MockMailContext());
         m_mailServer = new MockMailServer(new MockUsersRepository());
         m_serviceManager.put(MailServer.ROLE, m_mailServer);
         m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/Loader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/Loader.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/Loader.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/Loader.java Mon Aug 11 09:18:23 2008
@@ -109,7 +109,7 @@
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
     public void initialize() throws Exception {
-        setMailetContext((MailetContext) serviceManager.lookup("org.apache.mailet.MailetContext"));
+        setMailetContext((MailetContext) serviceManager.lookup(MailetContext.class.getName()));
     }
         
     /**

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java Mon Aug 11 09:18:23 2008
@@ -31,7 +31,7 @@
     /**
      * The component role used by components implementing this service
      */
-    String ROLE = "org.apache.james.services.MailetLoader";
+    String ROLE = "org.apache.james.transport.MailetLoader";
 
     /**
      * Get a new Mailet with the specified name acting

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java?rev=684792&r1=684791&r2=684792&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java Mon Aug 11 09:18:23 2008
@@ -30,7 +30,7 @@
     /**
      * The component role used by components implementing this service
      */
-    String ROLE = "org.apache.james.services.MatcherLoader";
+    String ROLE = "org.apache.james.transport.MatcherLoader";
 
     /**
      * Get a new Matcher with the specified name acting



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