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 da...@apache.org on 2006/10/27 18:14:51 UTC
svn commit: r468439 [2/2] - in
/james/server/sandbox/mailet-refactorings/src: conf/ java/org/apache/james/
java/org/apache/james/core/ java/org/apache/james/fetchmail/
java/org/apache/james/imapserver/
java/org/apache/james/imapserver/commands/ java/or...
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUser.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUser.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUser.java Fri Oct 27 09:14:47 2006
@@ -22,7 +22,7 @@
package org.apache.james.userrepository;
import org.apache.james.security.DigestUtil;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
@@ -70,14 +70,14 @@
}
/**
- * @see org.apache.james.services.User#getUserName()
+ * @see org.apache.mailet.User#getUserName()
*/
public String getUserName() {
return userName;
}
/**
- * @see org.apache.james.services.User#verifyPassword(java.lang.String)
+ * @see org.apache.mailet.User#verifyPassword(java.lang.String)
*/
public boolean verifyPassword(String pass) {
try {
@@ -89,7 +89,7 @@
}
/**
- * @see org.apache.james.services.User#setPassword(java.lang.String)
+ * @see org.apache.mailet.User#setPassword(java.lang.String)
*/
public boolean setPassword(String newPass) {
try {
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java Fri Oct 27 09:14:47 2006
@@ -21,7 +21,7 @@
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.services.User, java.sql.PreparedStatement)
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.mailet.User, java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
PreparedStatement userInsert)
@@ -68,7 +68,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.services.User, java.sql.PreparedStatement)
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.mailet.User, java.sql.PreparedStatement)
*/
protected void setUserForUpdateStatement(User user,
PreparedStatement userUpdate)
@@ -81,7 +81,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultUser(username, "SHA");
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java Fri Oct 27 09:14:47 2006
@@ -21,8 +21,8 @@
package org.apache.james.userrepository;
-import org.apache.james.services.User;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -72,7 +72,7 @@
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.services.User,
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.mailet.User,
* java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
@@ -81,7 +81,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.services.User,
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.mailet.User,
* java.sql.PreparedStatement)
*/
protected void setUserForUpdateStatement(User user,
@@ -145,7 +145,7 @@
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String,
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String,
* java.lang.String)
*/
public boolean addUser(String username, String password) {
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java Fri Oct 27 09:14:47 2006
@@ -21,7 +21,7 @@
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -56,7 +56,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.services.User, java.sql.PreparedStatement)
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.mailet.User, java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
PreparedStatement userInsert)
@@ -82,7 +82,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultUser(username, "SHA");
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersFileRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersFileRepository.java Fri Oct 27 09:14:47 2006
@@ -31,7 +31,7 @@
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.services.User;
+import org.apache.mailet.User;
import java.util.Iterator;
@@ -137,14 +137,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#list()
+ * @see org.apache.mailet.UsersRepository#list()
*/
public Iterator list() {
return objectRepository.list();
}
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#doAddUser(org.apache.james.services.User)
+ * @see org.apache.james.userrepository.AbstractUsersRepository#doAddUser(org.apache.mailet.User)
*/
protected void doAddUser(User user) {
try {
@@ -155,7 +155,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultJamesUser(username, "SHA");
@@ -164,7 +164,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByName(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getUserByName(java.lang.String)
*/
public synchronized User getUserByName(String name) {
if (ignoreCase) {
@@ -186,7 +186,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
*/
public User getUserByNameCaseInsensitive(String name) {
String realName = getRealName(name, true);
@@ -215,14 +215,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getRealName(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getRealName(java.lang.String)
*/
public String getRealName(String name) {
return getRealName(name, ignoreCase);
}
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#doUpdateUser(org.apache.james.services.User)
+ * @see org.apache.james.userrepository.AbstractUsersRepository#doUpdateUser(org.apache.mailet.User)
*/
public void doUpdateUser(User user) {
try {
@@ -234,14 +234,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#removeUser(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#removeUser(java.lang.String)
*/
public synchronized void removeUser(String name) {
objectRepository.remove(name);
}
/**
- * @see org.apache.james.services.UsersRepository#contains(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#contains(java.lang.String)
*/
public boolean contains(String name) {
if (ignoreCase) {
@@ -252,7 +252,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#containsCaseInsensitive(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
public boolean containsCaseInsensitive(String name) {
Iterator it = list();
@@ -265,7 +265,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String password) {
User user;
@@ -279,7 +279,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#countUsers()
+ * @see org.apache.mailet.UsersRepository#countUsers()
*/
public int countUsers() {
int count = 0;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersLDAPRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersLDAPRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersLDAPRepository.java Fri Oct 27 09:14:47 2006
@@ -28,8 +28,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import javax.naming.AuthenticationException;
import javax.naming.NamingEnumeration;
@@ -251,21 +251,21 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByName(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getUserByName(java.lang.String)
*/
public User getUserByName(String name) {
return new DefaultUser("dummy", "dummy");
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
*/
public User getUserByNameCaseInsensitive(String name) {
return getUserByName(name);
}
/**
- * @see org.apache.james.services.UsersRepository#containsCaseInsensitive(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
public boolean containsCaseInsensitive(String name) {
return contains(name);
@@ -279,7 +279,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#updateUser(org.apache.james.services.User)
+ * @see org.apache.mailet.UsersRepository#updateUser(org.apache.mailet.User)
*/
public boolean updateUser(User user) {
return false;
@@ -351,7 +351,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
if (!contains(username)) {
@@ -433,7 +433,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#removeUser(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#removeUser(java.lang.String)
*/
public synchronized void removeUser(String userName) {
String[] attrIDs = {membersAttr};
@@ -575,7 +575,7 @@
/**
- * @see org.apache.james.services.UsersRepository#contains(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#contains(java.lang.String)
*/
public boolean contains(String name) {
boolean found = false;
@@ -608,7 +608,7 @@
/**
- * @see org.apache.james.services.UsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String testPassword) {
boolean result = false;
@@ -711,7 +711,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#countUsers()
+ * @see org.apache.mailet.UsersRepository#countUsers()
*/
public int countUsers() {
Added: james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/AliasedUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/AliasedUser.java?view=auto&rev=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/AliasedUser.java (added)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/AliasedUser.java Fri Oct 27 09:14:47 2006
@@ -0,0 +1,49 @@
+/*
+ * Created on Oct 27, 2006
+ *
+ * PVCS Workfile Details:
+ * $Workfile$
+ * $Revision$
+ * $Author$
+ * $Date$
+ * $Modtime$
+ */
+
+package org.apache.mailet;
+
+/**
+ * @author angusd
+ * @author $Author$
+ * @version $Revision$
+ */
+public interface AliasedUser {
+
+ /**
+ * Indicate if mail received for this user should be delivered locally to
+ * a different address.
+ */
+ public abstract void setAliasing(boolean alias);
+
+ /**
+ * Return true if emails should be delivered locally to an alias.
+ */
+ public abstract boolean getAliasing();
+
+ /**
+ * Set local address to which email should be delivered.
+ *
+ * @return true if successful
+ */
+ public abstract boolean setAlias(String address);
+
+ /**
+ * Get local address to which mail should be delivered.
+ */
+ public abstract String getAlias();
+}
+/*
+ *
+ * PVCS Log History:
+ * $Log$
+ *
+ */
Added: james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/ForwardingUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/ForwardingUser.java?view=auto&rev=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/ForwardingUser.java (added)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/ForwardingUser.java Fri Oct 27 09:14:47 2006
@@ -0,0 +1,53 @@
+/*
+ * Created on Oct 27, 2006
+ *
+ * PVCS Workfile Details:
+ * $Workfile$
+ * $Revision$
+ * $Author$
+ * $Date$
+ * $Modtime$
+ */
+
+package org.apache.mailet;
+
+
+/**
+ * @author angusd
+ * @author $Author$
+ * @version $Revision$
+ */
+public interface ForwardingUser {
+
+ /**
+ * Indicate if mail for this user should be forwarded to some other mail
+ * server.
+ *
+ * @param forward whether email for this user should be forwarded
+ */
+ public abstract void setForwarding(boolean forward);
+
+ /**
+ * Return true if mail for this user should be forwarded
+ */
+ public abstract boolean getForwarding();
+
+ /**
+ * <p>Set destination for forwading mail</p>
+ * <p>TODO: Should we use a MailAddress?</p>
+ *
+ * @param address the forwarding address for this user
+ */
+ public abstract boolean setForwardingDestination(MailAddress address);
+
+ /**
+ * Return the destination to which email should be forwarded
+ */
+ public abstract MailAddress getForwardingDestination();
+}
+/*
+ *
+ * PVCS Log History:
+ * $Log$
+ *
+ */
Added: james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/User.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/User.java?view=auto&rev=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/User.java (added)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/User.java Fri Oct 27 09:14:47 2006
@@ -0,0 +1,56 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+
+
+package org.apache.mailet;
+
+/**
+ * Interface for objects representing users.
+ *
+ *
+ * @version $Revision: 426007 $
+ */
+
+public interface User {
+
+ /**
+ * Return the user name of this user
+ *
+ * @return the user name for this user
+ */
+ String getUserName();
+
+ /**
+ * Return true if pass matches password of this user.
+ *
+ * @param pass the password to test
+ * @return whether the password being tested is valid
+ */
+ boolean verifyPassword(String pass);
+
+ /**
+ * Sets new password from String. No checks made on guessability of
+ * password.
+ *
+ * @param newPass the String that is the new password.
+ * @return true if newPass successfully added
+ */
+ boolean setPassword(String newPass);
+}
Added: james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/UsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/UsersRepository.java?view=auto&rev=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/UsersRepository.java (added)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/UsersRepository.java Fri Oct 27 09:14:47 2006
@@ -0,0 +1,175 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+
+
+package org.apache.mailet;
+
+import java.util.Iterator;
+
+/**
+ * Interface for a repository of users. A repository represents a logical
+ * grouping of users, typically by common purpose. E.g. the users served by an
+ * email server or the members of a mailing list.
+ *
+ *
+ * @version $Revision: 453598 $
+ */
+public interface UsersRepository {
+
+ /**
+ * The component role used by components implementing this service
+ */
+ String ROLE = "org.apache.mailet.UsersRepository";
+
+ String USER = "USER";
+
+ /**
+ * Adds a user to the repository with the specified User object.
+ *
+ * @param user the user to be added
+ *
+ * @return true if succesful, false otherwise
+ * @since James 1.2.2
+ *
+ * @deprecated James 2.4 user should be added using username/password
+ * because specific implementations of UsersRepository will support specific
+ * implementations of users object.
+ */
+ boolean addUser(User user);
+
+ /**
+ * Adds a user to the repository with the specified attributes. In current
+ * implementations, the Object attributes is generally a String password.
+ *
+ * @param name the name of the user to be added
+ * @param attributes see decription
+ *
+ * @deprecated James 2.4 user is always added using username/password and
+ * eventually modified by retrieving it later.
+ */
+ void addUser(String name, Object attributes);
+
+ /**
+ * Adds a user to the repository with the specified password
+ *
+ * @param username the username of the user to be added
+ * @param password the password of the user to add
+ * @return true if succesful, false otherwise
+ *
+ * @since James 2.3.0
+ */
+ boolean addUser(String username, String password);
+
+ /**
+ * Get the user object with the specified user name. Return null if no
+ * such user.
+ *
+ * @param name the name of the user to retrieve
+ * @return the user being retrieved, null if the user doesn't exist
+ *
+ * @since James 1.2.2
+ */
+ User getUserByName(String name);
+
+ /**
+ * Get the user object with the specified user name. Match user naems on
+ * a case insensitive basis. Return null if no such user.
+ *
+ * @param name the name of the user to retrieve
+ * @return the user being retrieved, null if the user doesn't exist
+ *
+ * @since James 1.2.2
+ * @deprecated James 2.4 now caseSensitive is a property of the repository
+ * implementations and the getUserByName will search according to this property.
+ */
+ User getUserByNameCaseInsensitive(String name);
+
+ /**
+ * Returns the user name of the user matching name on an equalsIgnoreCase
+ * basis. Returns null if no match.
+ *
+ * @param name the name to case-correct
+ * @return the case-correct name of the user, null if the user doesn't exist
+ */
+ String getRealName(String name);
+
+ /**
+ * Update the repository with the specified user object. A user object
+ * with this username must already exist.
+ *
+ * @return true if successful.
+ */
+ boolean updateUser(User user);
+
+ /**
+ * Removes a user from the repository
+ *
+ * @param name the user to remove from the repository
+ */
+ void removeUser(String name);
+
+ /**
+ * Returns whether or not this user is in the repository
+ *
+ * @param name the name to check in the repository
+ * @return whether the user is in the repository
+ */
+ boolean contains(String name);
+
+ /**
+ * Returns whether or not this user is in the repository. Names are
+ * matched on a case insensitive basis.
+ *
+ * @param name the name to check in the repository
+ * @return whether the user is in the repository
+ *
+ * @deprecated James 2.4 now caseSensitive is a property of the repository
+ * implementations and the contains will search according to this property.
+ */
+ boolean containsCaseInsensitive(String name);
+
+ /**
+ * Test if user with name 'name' has password 'password'.
+ *
+ * @param name the name of the user to be tested
+ * @param password the password to be tested
+ *
+ * @return true if the test is successful, false if the user
+ * doesn't exist or if the password is incorrect
+ *
+ * @since James 1.2.2
+ */
+ boolean test(String name, String password);
+
+ /**
+ * Returns a count of the users in the repository.
+ *
+ * @return the number of users in the repository
+ */
+ int countUsers();
+
+ /**
+ * List users in repository.
+ *
+ * @return Iterator over a collection of Strings, each being one user in the repository.
+ */
+ Iterator list();
+
+}
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/JamesTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/JamesTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/JamesTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/JamesTest.java Fri Oct 27 09:14:47 2006
@@ -30,7 +30,6 @@
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.services.MailServerTestAllImplementations;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
@@ -38,6 +37,7 @@
import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.james.test.mock.james.MockUsersStore;
import org.apache.james.userrepository.MockUsersRepository;
+import org.apache.mailet.UsersRepository;
import java.io.File;
import java.io.FileNotFoundException;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java Fri Oct 27 09:14:47 2006
@@ -6,8 +6,8 @@
import org.apache.james.imapserver.ImapRequestHandler;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java Fri Oct 27 09:14:47 2006
@@ -4,7 +4,7 @@
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.mailboxmanager.torque.TorqueMailboxManagerProvider;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
public class MockImapHandlerConfigurationData implements
ImapHandlerConfigurationData
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUser.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUser.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUser.java Fri Oct 27 09:14:47 2006
@@ -1,7 +1,7 @@
package org.apache.james.imapserver.mock;
import org.apache.james.imapserver.TestConstants;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
public class MockUser implements User,TestConstants
{
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUsersRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUsersRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUsersRepository.java Fri Oct 27 09:14:47 2006
@@ -4,8 +4,8 @@
import java.util.Iterator;
import org.apache.james.imapserver.TestConstants;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
public class MockUsersRepository implements UsersRepository, TestConstants
{
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/mock/MockUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/mock/MockUser.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/mock/MockUser.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/mock/MockUser.java Fri Oct 27 09:14:47 2006
@@ -1,6 +1,6 @@
package org.apache.james.mailboxmanager.mock;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
public class MockUser implements User {
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/management/UserManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/management/UserManagementTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/management/UserManagementTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/management/UserManagementTest.java Fri Oct 27 09:14:47 2006
@@ -23,12 +23,12 @@
import junit.framework.TestCase;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.james.MockUsersStore;
import org.apache.james.userrepository.MockUsersRepository;
+import org.apache.mailet.UsersRepository;
import java.util.Arrays;
import java.util.List;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java Fri Oct 27 09:14:47 2006
@@ -30,7 +30,6 @@
import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.avalon.MockSocketManager;
@@ -43,6 +42,7 @@
import org.apache.james.util.connection.SimpleConnectionManager;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailRepository;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import javax.mail.util.SharedByteArrayInputStream;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/remotemanager/RemoteManagerTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/remotemanager/RemoteManagerTest.java Fri Oct 27 09:14:47 2006
@@ -29,7 +29,6 @@
import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
@@ -41,6 +40,7 @@
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.connection.SimpleConnectionManager;
+import org.apache.mailet.UsersRepository;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/SMTPServerTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/SMTPServerTest.java Fri Oct 27 09:14:47 2006
@@ -30,7 +30,6 @@
import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.avalon.MockSocketManager;
@@ -47,6 +46,7 @@
import org.apache.james.util.connection.SimpleConnectionManager;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import javax.mail.Session;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/ValidRcptHandlerTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/ValidRcptHandlerTest.java Fri Oct 27 09:14:47 2006
@@ -29,7 +29,6 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.VirtualUserTable;
import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptHandler;
import org.apache.james.test.mock.avalon.MockLogger;
@@ -37,6 +36,7 @@
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.vut.ErrorMappingException;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import org.apache.oro.text.regex.MalformedPatternException;
import junit.framework.TestCase;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockUsersStore.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockUsersStore.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockUsersStore.java Fri Oct 27 09:14:47 2006
@@ -22,7 +22,7 @@
package org.apache.james.test.mock.james;
import org.apache.james.services.UsersStore;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
import java.util.Iterator;
import java.util.ArrayList;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java Fri Oct 27 09:14:47 2006
@@ -23,7 +23,6 @@
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.james.test.mock.james.MockMailServer;
@@ -37,6 +36,7 @@
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailRepository;
import org.apache.mailet.Mailet;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Fri Oct 27 09:14:47 2006
@@ -24,10 +24,10 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.mock.util.AttrValConfiguration;
import org.apache.james.test.util.Util;
+import org.apache.mailet.UsersRepository;
import java.util.Iterator;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Fri Oct 27 09:14:47 2006
@@ -24,12 +24,12 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.james.services.JamesUser;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.VirtualUserTable;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.mock.util.AttrValConfiguration;
import org.apache.james.test.util.Util;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import java.util.Collection;
import java.util.Iterator;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Fri Oct 27 09:14:47 2006
@@ -23,10 +23,10 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.mock.util.AttrValConfiguration;
import org.apache.james.test.util.Util;
+import org.apache.mailet.UsersRepository;
import java.util.Iterator;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepository.java Fri Oct 27 09:14:47 2006
@@ -20,7 +20,7 @@
package org.apache.james.userrepository;
import org.apache.james.security.DigestUtil;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepositoryTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepositoryTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepositoryTest.java Fri Oct 27 09:14:47 2006
@@ -20,8 +20,8 @@
package org.apache.james.userrepository;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import java.util.ArrayList;
import java.util.Iterator;
Modified: james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java Fri Oct 27 09:14:47 2006
@@ -26,11 +26,11 @@
import org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository;
import org.apache.james.services.FileSystem;
import org.apache.james.services.JamesUser;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.VirtualUserTable;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import java.io.File;
import java.io.FileNotFoundException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org