james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r167869 - in /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport: JamesSpoolManager.java Loader.java Resources.java
Date Tue, 03 May 2005 06:29:01 GMT
Author: noel
Date: Mon May  2 23:29:00 2005
New Revision: 167869

URL: http://svn.apache.org/viewcvs?rev=167869&view=rev
Log:
merge transport (just this level, not subdirectories).  avalon updates

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Loader.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Resources.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
Mon May  2 23:29:00 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 *
@@ -21,17 +21,16 @@
 //import org.apache.avalon.excalibur.thread.ThreadPool;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-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.component.DefaultComponentManager;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.service.DefaultServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.MailStore;
 import org.apache.james.services.SpoolRepository;
@@ -53,8 +52,7 @@
  */
 public class JamesSpoolManager
     extends AbstractLogEnabled
-    implements Composable, Configurable, Initializable,
-               Runnable, Disposable, Component, Contextualizable {
+    implements Serviceable, Configurable, Initializable, Runnable, Disposable, Contextualizable
{
 
     private Context context;
     /**
@@ -65,7 +63,7 @@
     /**
      * System component manager
      */
-    private DefaultComponentManager compMgr;
+    private DefaultServiceManager compMgr;
 
     /**
      * The configuration object used by this spool manager.
@@ -119,12 +117,11 @@
     private Collection spoolThreads;
 
     /**
-     * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
+     * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
      */
-    public void compose(ComponentManager comp)
-        throws ComponentException {
-        // threadManager = (ThreadManager)comp.lookup( ThreadManager.ROLE );
-        compMgr = new DefaultComponentManager(comp);
+    public void service(ServiceManager comp) throws ServiceException {
+        threadManager = (ThreadManager) comp.lookup(ThreadManager.ROLE);
+        compMgr = new DefaultServiceManager(comp);
     }
 
     /**

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Loader.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Loader.java?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Loader.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Loader.java
Mon May  2 23:29:00 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 *
@@ -28,13 +28,12 @@
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.component.Component;
 
 /**
  *
  * $Id$
  */
-public class Loader implements Contextualizable, Component {
+public class Loader implements Contextualizable {
     protected ClassLoader mailetClassLoader = null;
     protected String baseDirectory = null;
     protected Logger logger;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Resources.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Resources.java?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Resources.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/Resources.java
Mon May  2 23:29:00 2005
@@ -28,7 +28,7 @@
     //public static final String SERVER_NAMES = "SERVER_NAMES";
 
     /**
-     * Don't know what this is supposed to be. 
+     * Don't know what this is supposed to be.
      *
      * @deprecated this is unused
      */
@@ -38,21 +38,21 @@
     //public static final String POSTMASTER = "POSTMASTER";
 
     /**
-     * Don't know what this is supposed to be. 
+     * Don't know what this is supposed to be.
      *
      * @deprecated this is unused
      */
     public static final String MAIL_SERVER = "MAIL_SERVER";
 
     /**
-     * Don't know what this is supposed to be. 
+     * Don't know what this is supposed to be.
      *
      * @deprecated this is unused
      */
     public static final String TRANSPORT = "TRANSPORT";
 
     /**
-     * Don't know what this is supposed to be. 
+     * Don't know what this is supposed to be.
      *
      * @deprecated this is unused
      */



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