james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r167866 - /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Handler.java /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Server.java
Date Tue, 03 May 2005 05:58:14 GMT
Author: noel
Date: Mon May  2 22:58:13 2005
New Revision: 167866

URL: http://svn.apache.org/viewcvs?rev=167866&view=rev
Log:
merge pop3server from v2 and trunk.  avalon updates

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Handler.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Server.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Handler.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Handler.java?rev=167866&r1=167865&r2=167866&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Handler.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Handler.java
Mon May  2 22:58:13 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 1999-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Server.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Server.java?rev=167866&r1=167865&r2=167866&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Server.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/pop3server/POP3Server.java
Mon May  2 22:58:13 2005
@@ -23,14 +23,11 @@
 import org.apache.avalon.excalibur.pool.ObjectFactory;
 import org.apache.avalon.excalibur.pool.Pool;
 import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.logger.LogEnabled;
 
 import org.apache.james.core.AbstractJamesService;
@@ -50,7 +47,7 @@
  *
  * @version 1.0.0, 24/04/1999
  */
-public class POP3Server extends AbstractJamesService implements Component, POP3ServerMBean
{
+public class POP3Server extends AbstractJamesService implements POP3ServerMBean {
 
     /**
      * The internal mail server service
@@ -91,18 +88,18 @@
         = new POP3HandlerConfigurationDataImpl();
 
     /**
-     * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
+     * @see org.apache.avalon.framework.service.Serviceable#compose(ServiceManager)
      */
-    public void compose( final ComponentManager componentManager )
-        throws ComponentException {
-        super.compose(componentManager);
+    public void service( final ServiceManager componentManager )
+        throws ServiceException {
+        super.service(componentManager);
         mailServer = (MailServer)componentManager.
             lookup( "org.apache.james.services.MailServer" );
         UsersStore usersStore = (UsersStore)componentManager.
             lookup( "org.apache.james.services.UsersStore" );
         users = usersStore.getRepository("LocalUsers");
         if (users == null) {
-            throw new ComponentException("The user repository could not be found.");
+            throw new ServiceException("","The user repository could not be found.");
         }
     }
 



---------------------------------------------------------------------
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