james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r167868 - /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
Date Tue, 03 May 2005 06:16:20 GMT
Author: noel
Date: Mon May  2 23:16:19 2005
New Revision: 167868

URL: http://svn.apache.org/viewcvs?rev=167868&view=rev
Log:
merge nntpserver from v2 with trunk.  avalon updates

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/nntpserver/NNTPServer.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/nntpserver/NNTPServer.java?rev=167868&r1=167867&r2=167868&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
Mon May  2 23:16:19 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -23,15 +23,12 @@
 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.logger.LogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
 
 import org.apache.james.core.AbstractJamesService;
 import org.apache.james.nntpserver.repository.NNTPRepository;
@@ -48,7 +45,7 @@
  * NNTP Server
  *
  */
-public class NNTPServer extends AbstractJamesService implements Component, NNTPServerMBean
{
+public class NNTPServer extends AbstractJamesService implements NNTPServerMBean {
 
     /**
      * Whether authentication is required to access this NNTP server
@@ -87,15 +84,15 @@
         = new NNTPHandlerConfigurationDataImpl();
 
     /**
-     * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
+     * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
      */
-    public void compose( final ComponentManager componentManager )
-        throws ComponentException {
-        super.compose(componentManager);
+    public void service( final ServiceManager componentManager )
+        throws ServiceException {
+        super.service(componentManager);
         UsersStore usersStore = (UsersStore)componentManager.lookup(UsersStore.ROLE);
         userRepository = usersStore.getRepository("LocalUsers");
         if (userRepository == null) {
-            throw new ComponentException("The user repository could not be found.");
+            throw new ServiceException("","The user repository could not be found.");
         }
 
         repo = (NNTPRepository)componentManager



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