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 rd...@apache.org on 2009/09/17 16:36:18 UTC

svn commit: r816214 - in /james/server/trunk: smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java

Author: rdonkin
Date: Thu Sep 17 14:36:18 2009
New Revision: 816214

URL: http://svn.apache.org/viewvc?rev=816214&view=rev
Log:
JAMES-923 Servicable interface no longer needed https://issues.apache.org/jira/browse/JAMES-923

Modified:
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
    james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java?rev=816214&r1=816213&r2=816214&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java Thu Sep 17 14:36:18 2009
@@ -50,7 +50,7 @@
   * The SMTPHandlerChain is per service object providing access
   * ConnectHandlers, Commandhandlers and message handlers
   */
-public class SMTPHandlerChain implements Configurable, Serviceable {
+public class SMTPHandlerChain implements Configurable {
 
     /** This log is the fall back shared by all instances */
     private static final Log FALLBACK_LOG = LogFactory.getLog(DataLineMessageHookHandler.class);
@@ -63,8 +63,6 @@
     private JamesConfiguration commonsConf;
     
     private List<Object> handlers = new LinkedList<Object>();
-
-    private ServiceManager serviceManager;
     
     /** Loads instances */
     private LoaderService loader;
@@ -96,13 +94,6 @@
     }
     
     /**
-     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
-     */
-    public void service(ServiceManager arg0) throws ServiceException {
-        serviceManager = arg0;
-    }
-
-    /**
      * ExtensibleHandler wiring
      * 
      * @throws WiringException 
@@ -225,9 +216,6 @@
             ((LogEnabled) handler).setLog(log);
         }
 
-        // servicing the handler
-        ContainerUtil.service(handler, serviceManager);
-
         // configure the handler
         if (handler instanceof org.apache.james.smtpserver.Configurable) {
         	// Inject only the configuration part which is necessary for the handler

Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java?rev=816214&r1=816213&r2=816214&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java Thu Sep 17 14:36:18 2009
@@ -26,7 +26,7 @@
 
 import org.apache.james.api.vut.VirtualUserTable;
 
-public interface VirtualUserTableManagement extends VirtualUserTable{
+public interface VirtualUserTableManagement extends VirtualUserTable {
     
     /**
      * The component role used by components implementing this service



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