Author: norman
Date: Mon Jun 21 17:29:19 2010
New Revision: 956648
URL: http://svn.apache.org/viewvc?rev=956648&view=rev
Log:
Rename UserRepositoryException to UsersRepositoryException to be more inline
with the UsersRepository interface
Added:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java
- copied, changed from r955326,
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserRepositoryException.java
Removed:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserRepositoryException.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
james/server/trunk/imapserver/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserMetaDataRespository.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java?rev=956648&r1=956647&r2=956648&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
Mon Jun 21 17:29:19 2010
@@ -29,7 +29,7 @@ import javax.annotation.Resource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.user.UserMetaDataRespository;
-import org.apache.james.api.user.UserRepositoryException;
+import org.apache.james.api.user.UsersRepositoryException;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
@@ -65,7 +65,7 @@ public class UserMetaDataRepositorySubsc
try {
final UserSubscription subscription =
getUserSubscription(session.getUser().getUserName());
subscription.subscribe(mailbox);
- } catch (UserRepositoryException e) {
+ } catch (UsersRepositoryException e) {
throw new
SubscriptionException(HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE, e);
}
}
@@ -82,7 +82,7 @@ public class UserMetaDataRepositorySubsc
final UserSubscription subscription =
getUserSubscription(session.getUser().getUserName());
final Collection<String> results = (Collection)
subscription.subscriptions().clone();
return results;
- } catch (UserRepositoryException e) {
+ } catch (UsersRepositoryException e) {
throw new
SubscriptionException(HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE, e);
}
}
@@ -95,7 +95,7 @@ public class UserMetaDataRepositorySubsc
try {
final UserSubscription subscription =
getUserSubscription(session.getUser().getUserName());
subscription.unsubscribe(mailbox);
- } catch (UserRepositoryException e) {
+ } catch (UsersRepositoryException e) {
throw new
SubscriptionException(HumanReadableText.GENERIC_UNSUBSCRIPTION_FAILURE, e);
}
}
@@ -124,7 +124,7 @@ public class UserMetaDataRepositorySubsc
this.repository = repository;
}
- public synchronized void subscribe(String mailbox) throws
UserRepositoryException {
+ public synchronized void subscribe(String mailbox) throws
UsersRepositoryException {
final HashSet<String> existingSubscriptions = subscriptions();
if (!existingSubscriptions.contains(mailbox)) {
final HashSet<String> newSubscriptions;
@@ -138,7 +138,7 @@ public class UserMetaDataRepositorySubsc
}
}
- public synchronized void unsubscribe(String mailbox) throws
UserRepositoryException {
+ public synchronized void unsubscribe(String mailbox) throws
UsersRepositoryException {
final HashSet<String> subscriptions = subscriptions();
if (subscriptions.remove(mailbox)) {
repository.setAttribute(user, subscriptions, META_DATA_KEY);
@@ -146,7 +146,7 @@ public class UserMetaDataRepositorySubsc
}
@SuppressWarnings("unchecked")
- public HashSet<String> subscriptions() throws UserRepositoryException {
+ public HashSet<String> subscriptions() throws UsersRepositoryException
{
try {
final HashSet<String> storedSubscriptions = (HashSet<String>)
repository.getAttribute(user, META_DATA_KEY);
final HashSet<String> results;
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java?rev=956648&r1=956647&r2=956648&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java
Mon Jun 21 17:29:19 2010
@@ -35,7 +35,7 @@ import javax.annotation.Resource;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.james.api.user.UserMetaDataRespository;
-import org.apache.james.api.user.UserRepositoryException;
+import org.apache.james.api.user.UsersRepositoryException;
import org.apache.james.services.FileSystem;
/**
@@ -90,12 +90,12 @@ public class FileUserMetaDataRepository
* (non-Javadoc)
* @see
org.apache.james.api.user.UserMetaDataRespository#clear(java.lang.String)
*/
- public void clear(String username) throws UserRepositoryException {
+ public void clear(String username) throws UsersRepositoryException {
final File userDir = userDirectory(username);
try {
FileUtils.deleteDirectory(userDir);
} catch (IOException e) {
- throw new UserRepositoryException("Cannot delete " +
userDir.getAbsolutePath(), e);
+ throw new UsersRepositoryException("Cannot delete " +
userDir.getAbsolutePath(), e);
}
}
@@ -104,7 +104,7 @@ public class FileUserMetaDataRepository
* @see
org.apache.james.api.user.UserMetaDataRespository#getAttribute(java.lang.String,
java.lang.String)
*/
public Serializable getAttribute(String username, String key)
- throws UserRepositoryException {
+ throws UsersRepositoryException {
final File valueFile = valueFile(username, key);
final Serializable result;
if (valueFile.exists()) {
@@ -113,9 +113,9 @@ public class FileUserMetaDataRepository
in = new ObjectInputStream(new BufferedInputStream(new
FileInputStream(valueFile)));
result = (Serializable) in.readObject();
} catch (IOException e) {
- throw new UserRepositoryException(e);
+ throw new UsersRepositoryException(e);
} catch (ClassNotFoundException e) {
- throw new UserRepositoryException(e);
+ throw new UsersRepositoryException(e);
} finally {
IOUtils.closeQuietly(in);
}
@@ -131,7 +131,7 @@ public class FileUserMetaDataRepository
* @see
org.apache.james.api.user.UserMetaDataRespository#setAttribute(java.lang.String,
java.io.Serializable, java.lang.String)
*/
public void setAttribute(String username, Serializable value, String key)
- throws UserRepositoryException {
+ throws UsersRepositoryException {
final File valueFile = valueFile(username, key);
ObjectOutputStream out = null;
@@ -141,13 +141,13 @@ public class FileUserMetaDataRepository
out.writeObject(value);
} catch (IOException e) {
- throw new UserRepositoryException(e);
+ throw new UsersRepositoryException(e);
} finally {
IOUtils.closeQuietly(out);
}
}
- private File valueFile(String username, String key) throws
UserRepositoryException {
+ private File valueFile(String username, String key) throws
UsersRepositoryException {
final File userDir = userDirectory(username);
final String valueFileName = fileSystemSafeName(key,
SERIALIZED_FILE_TYPE_NAME);
@@ -155,12 +155,12 @@ public class FileUserMetaDataRepository
return valueFile;
}
- private File userDirectory(String username) throws UserRepositoryException
{
+ private File userDirectory(String username) throws
UsersRepositoryException {
final String userDirectoryName = fileSystemSafeName(username);
final File userDir = new File(baseDirectory, userDirectoryName);
if (!userDir.exists()) {
if (!userDir.mkdir()) {
- throw new UserRepositoryException("Cannot create directory: "
+ userDir.getAbsolutePath());
+ throw new UsersRepositoryException("Cannot create directory: "
+ userDir.getAbsolutePath());
}
}
return userDir;
Modified:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserMetaDataRespository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserMetaDataRespository.java?rev=956648&r1=956647&r2=956648&view=diff
==============================================================================
---
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserMetaDataRespository.java
(original)
+++
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserMetaDataRespository.java
Mon Jun 21 17:29:19 2010
@@ -43,7 +43,7 @@ public interface UserMetaDataRespository
* @return value, or null if the keyed attribute has
* no associated value.
*/
- public Serializable getAttribute(String username, String key) throws
UserRepositoryException;
+ public Serializable getAttribute(String username, String key) throws
UsersRepositoryException;
/**
* Sets the attribute keyed to the given value.
@@ -51,12 +51,12 @@ public interface UserMetaDataRespository
* @param value <code>Serializable</code> value, possibly null
* @param key conventionally an URI, not null
*/
- public void setAttribute(String username, Serializable value, String key)
throws UserRepositoryException;
+ public void setAttribute(String username, Serializable value, String key)
throws UsersRepositoryException;
/**
* Clears all attributes for the given user.
* @param username the name of the user who meta data is to be cleared,
not null
- * @throws UserRepositoryException
+ * @throws UsersRepositoryException
*/
- public void clear(String username) throws UserRepositoryException;
+ public void clear(String username) throws UsersRepositoryException;
}
Copied:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java
(from r955326,
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserRepositoryException.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserRepositoryException.java&r1=955326&r2=956648&rev=956648&view=diff
==============================================================================
---
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UserRepositoryException.java
(original)
+++
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java
Mon Jun 21 17:29:19 2010
@@ -22,23 +22,23 @@ package org.apache.james.api.user;
/**
* Basic user repository exception.
*/
-public class UserRepositoryException extends Exception {
+public class UsersRepositoryException extends Exception {
private static final long serialVersionUID = 6758478375823762715L;
- public UserRepositoryException() {
+ public UsersRepositoryException() {
super();
}
- public UserRepositoryException(String message, Throwable cause) {
+ public UsersRepositoryException(String message, Throwable cause) {
super(message, cause);
}
- public UserRepositoryException(String message) {
+ public UsersRepositoryException(String message) {
super(message);
}
- public UserRepositoryException(Throwable cause) {
+ public UsersRepositoryException(Throwable cause) {
super(cause);
}
}
Modified:
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java?rev=956648&r1=956647&r2=956648&view=diff
==============================================================================
---
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
Mon Jun 21 17:29:19 2010
@@ -39,12 +39,6 @@ import javax.annotation.PostConstruct;
public class ListUsersJdbcRepository extends AbstractJdbcUsersRepository
{
- // REMOVE ME!
- @PostConstruct
- @Override
- public void init() throws Exception {
- super.init();
- }
/**
* @see
org.apache.james.impl.jamesuser.AbstractUsersRepository#test(java.lang.String,
java.lang.String)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
