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 no...@apache.org on 2005/05/03 19:14:49 UTC
svn commit: r167939 -
/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
Author: noel
Date: Tue May 3 10:14:48 2005
New Revision: 167939
URL: http://svn.apache.org/viewcvs?rev=167939&view=rev
Log:
merge avalon updates from trunk, remove deprecation.
Modified:
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java?rev=167939&r1=167938&r2=167939&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java Tue May 3 10:14:48 2005
@@ -20,17 +20,16 @@
import org.apache.avalon.cornerstone.services.store.ObjectRepository;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.activity.Initializable;
-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.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.Serviceable;
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.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import java.io.File;
import java.util.Iterator;
@@ -39,9 +38,9 @@
* Implementation of a Repository to store users on the File System.
*
* Requires a configuration element in the .conf.xml file of the form:
- * <repository destinationURL="file://path-to-root-dir-for-repository"
+ * <repository destinationURL="file://path-to-root-dir-for-repository"
* type="USERS"
- * model="SYNCHRONOUS"/>
+ * model="SYNCHRONOUS"/>
* Requires a logger called UsersRepository.
*
*
@@ -50,7 +49,7 @@
*/
public class UsersFileRepository
extends AbstractLogEnabled
- implements UsersRepository, Component, Configurable, Composable, Initializable {
+ implements UsersRepository, Configurable, Serviceable, Initializable {
/**
* Whether 'deep debugging' is turned on.
@@ -69,10 +68,10 @@
private String destination;
/**
- * @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 {
+ public void service( final ServiceManager componentManager )
+ throws ServiceException {
try {
store = (Store)componentManager.
@@ -80,7 +79,7 @@
} catch (Exception e) {
final String message = "Failed to retrieve Store component:" + e.getMessage();
getLogger().error( message, e );
- throw new ComponentException( message, e );
+ throw new ServiceException ("", message, e );
}
}
@@ -167,7 +166,7 @@
addUser(newbie);
}
else {
- throw new RuntimeException("Improper use of deprecated method"
+ throw new RuntimeException("Improper use of deprecated method"
+ " - use addUser(User user)");
}
}
@@ -239,6 +238,8 @@
return false;
}
+ /**
+ */
public boolean test(String name, Object attributes) {
try {
return attributes.equals(or.get(name));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org