james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r453599 - in /james/server/trunk/src/java/org/apache/james: core/AvalonMailStore.java core/AvalonUsersStore.java userrepository/AbstractUsersRepository.java
Date Fri, 06 Oct 2006 13:53:43 GMT
Author: bago
Date: Fri Oct  6 06:53:42 2006
New Revision: 453599

URL: http://svn.apache.org/viewvc?view=rev&rev=453599
Log:
Removed the last remaining Component/Composable references (JAMES-653)

Modified:
    james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java
    james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java
    james/server/trunk/src/java/org/apache/james/userrepository/AbstractUsersRepository.java

Modified: james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java?view=diff&rev=453599&r1=453598&r2=453599
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java (original)
+++ james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java Fri Oct  6 06:53:42
2006
@@ -23,7 +23,6 @@
 
 import org.apache.avalon.cornerstone.services.store.Store;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.service.DefaultServiceManager;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceException;
@@ -280,12 +279,6 @@
                     ContainerUtil.contextualize(reply,context);
                     ContainerUtil.service(reply,m_manager);
 
-                    if (reply instanceof Composable) {
-                        final String error = "no implementation in place to support Composable";
-                        getLogger().error( error );
-                        throw new IllegalArgumentException( error );
-                    }
-                    
                     ContainerUtil.configure(reply,config);
                     ContainerUtil.initialize(reply);
 

Modified: james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java?view=diff&rev=453599&r1=453598&r2=453599
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java (original)
+++ james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java Fri Oct  6 06:53:42
2006
@@ -22,7 +22,6 @@
 package org.apache.james.core;
 
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -124,11 +123,7 @@
 
             ContainerUtil.contextualize(rep,context);
             ContainerUtil.service(rep,manager);
-            if (rep instanceof Composable) {
-                final String error = "no implementation in place to support Composable";
-                getLogger().error( error );
-                throw new IllegalArgumentException( error );
-            }
+
             ContainerUtil.configure(rep,repConf);
             ContainerUtil.initialize(rep);
             

Modified: james/server/trunk/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/userrepository/AbstractUsersRepository.java?view=diff&rev=453599&r1=453598&r2=453599
==============================================================================
--- james/server/trunk/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
(original)
+++ james/server/trunk/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
Fri Oct  6 06:53:42 2006
@@ -21,7 +21,6 @@
 
 package org.apache.james.userrepository;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.james.services.User;
 import org.apache.james.services.UsersRepository;
@@ -38,7 +37,7 @@
  */
 public abstract class AbstractUsersRepository
     extends AbstractLogEnabled
-    implements UsersRepository, Component {
+    implements UsersRepository {
 
     //
     // Core Abstract methods - override these for a functional UserRepository.



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