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 vi...@apache.org on 2005/05/03 17:34:46 UTC

svn commit: r167922 - in /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james: core/AvalonMailStore.java transport/JamesSpoolManager.java userrepository/AbstractJdbcUsersRepository.java

Author: vincenzo
Date: Tue May  3 08:34:45 2005
New Revision: 167922

URL: http://svn.apache.org/viewcvs?rev=167922&view=rev
Log:
Some fixes to get it compiled

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonMailStore.java
    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/userrepository/AbstractJdbcUsersRepository.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonMailStore.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonMailStore.java?rev=167922&r1=167921&r2=167922&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonMailStore.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonMailStore.java Tue May  3 08:34:45 2005
@@ -75,7 +75,7 @@
     /**
      * The Avalon component manager used by the instance
      */
-    protected ServiceManager       m_Manager;
+    protected ServiceManager       m_manager;
 
     private SpoolRepository inboundSpool;
 
@@ -292,7 +292,7 @@
                         ((Contextualizable) reply).contextualize(context);
                     }
                     if (reply instanceof Serviceable) {
-                        ((Serviceable) reply).service( m_Manager );
+                        ((Serviceable) reply).service( m_manager );
                     }
                     if (reply instanceof Composable) {
                         final String error = "no implementation in place to support Coposable";

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=167922&r1=167921&r2=167922&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 Tue May  3 08:34:45 2005
@@ -99,7 +99,7 @@
     /**
      * The ThreadManager from which the thread pool is obtained.
      */
-    // private ThreadManager threadManager;
+    private ThreadManager threadManager;
 
     /**
      * Number of active threads

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=167922&r1=167921&r2=167922&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Tue May  3 08:34:45 2005
@@ -17,7 +17,7 @@
 
 package org.apache.james.userrepository;
 
-import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
 import org.apache.avalon.excalibur.datasource.DataSourceComponent;
 import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.activity.Initializable;



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