Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java Mon Dec 10 16:34:46 2012 @@ -29,7 +29,7 @@ import java.util.List; */ public interface UserManager { - + static final String GUEST_USERNAME = "guest"; /** @@ -72,15 +72,19 @@ public interface UserManager * @param fullName the full name for this user. * @param emailAddress the email address for this user. * @return the new user object ready to use. + * @throws UserManagerException */ - User createUser( String username, String fullName, String emailAddress ); + User createUser( String username, String fullName, String emailAddress ) + throws UserManagerException; /** * Factory method to create the guest user. * * @return The guest user + * @throws UserManagerException */ - User createGuestUser(); + User createGuestUser() + throws UserManagerException; /** * Factory method to create {@link UserQuery}s based on provider specific @@ -94,18 +98,23 @@ public interface UserManager * Get the List of {@link User} objects. * * @return the List of {@link User} Objects. + * @throws UserManagerException */ - List<User> getUsers(); + List<User> getUsers() + throws UserManagerException; - List<User> getUsers( boolean orderAscending ); + List<User> getUsers( boolean orderAscending ) + throws UserManagerException; /** * Add a User. * * @param user the user to add. * @return the user that was just added. + * @throws UserManagerException */ - User addUser( User user ); + User addUser( User user ) + throws UserManagerException; /** * Update a User. @@ -115,7 +124,7 @@ public interface UserManager * @throws UserNotFoundException if the user was not found to update. */ User updateUser( User user ) - throws UserNotFoundException; + throws UserNotFoundException, UserManagerException; /** * Find a User using a User name. @@ -125,7 +134,7 @@ public interface UserManager * @throws UserNotFoundException if the user was not found. */ User findUser( String username ) - throws UserNotFoundException; + throws UserNotFoundException, UserManagerException; /** * Get the guest user. @@ -133,13 +142,16 @@ public interface UserManager * @return the guest user. */ User getGuestUser() - throws UserNotFoundException; + throws UserNotFoundException, UserManagerException; - List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ); + List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ) + throws UserManagerException; - List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ); + List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ) + throws UserManagerException; - List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ); + List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ) + throws UserManagerException; /** * Find users matching properties, ordering and range as specified by the @@ -148,7 +160,8 @@ public interface UserManager * @param query the query. * @return a List of {@link User} objects. */ - List<User> findUsersByQuery( UserQuery query ); + List<User> findUsersByQuery( UserQuery query ) + throws UserManagerException; /** * true if the user exists, false if it doesn't @@ -156,7 +169,8 @@ public interface UserManager * @param principal * @return true, if user exists */ - boolean userExists( String principal ); + boolean userExists( String principal ) + throws UserManagerException; /** * Delete a user using the username. @@ -165,7 +179,7 @@ public interface UserManager * @throws UserNotFoundException the user was not found. */ void deleteUser( String username ) - throws UserNotFoundException; + throws UserNotFoundException, UserManagerException; /** * Add a user to the database without checking for consistency or adjusting the password. Should only be used for @@ -173,30 +187,32 @@ public interface UserManager * * @param user the user to add */ - void addUserUnchecked( User user ); + void addUserUnchecked( User user ) + throws UserManagerException; void eraseDatabase(); User updateUser( User user, boolean passwordChangeRequired ) - throws UserNotFoundException; + throws UserNotFoundException, UserManagerException; /** * consumer of user manager can use it to reload various configuration * with the configurable implementation is possible to change dynamically the real implementation used. + * * @since 2.1 */ void initialize(); /** - * @since 2.1 * @return true if this implementation is a final one and not a wrapper (configurable, cached) + * @since 2.1 */ boolean isFinalImplementation(); /** - * @since 2.1 * @return a key to be able to customize label in UI + * @since 2.1 */ String getDescriptionKey(); }
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java Mon Dec 10 16:34:46 2012 @@ -26,7 +26,7 @@ package org.apache.archiva.redback.users * */ public class UserManagerException - extends RuntimeException + extends Exception { public UserManagerException() Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserNotFoundException.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserNotFoundException.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserNotFoundException.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserNotFoundException.java Mon Dec 10 16:34:46 2012 @@ -23,7 +23,7 @@ package org.apache.archiva.redback.users * @author Jason van Zyl */ public class UserNotFoundException - extends Exception + extends UserManagerException { public UserNotFoundException( String string ) { Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java Mon Dec 10 16:34:46 2012 @@ -21,6 +21,7 @@ package org.apache.archiva.redback.users import org.apache.archiva.redback.components.cache.Cache; import org.apache.archiva.redback.users.User; +import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserManagerListener; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserQuery; @@ -37,7 +38,6 @@ import java.util.List; * CachedUserManager * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> - * */ @Service( "userManager#cached" ) public class CachedUserManager @@ -60,11 +60,13 @@ public class CachedUserManager } public User createGuestUser() + throws UserManagerException { return userImpl.createGuestUser(); } public User addUser( User user ) + throws UserManagerException { if ( user != null ) { @@ -79,6 +81,7 @@ public class CachedUserManager } public void addUserUnchecked( User user ) + throws UserManagerException { if ( user != null ) { @@ -88,13 +91,14 @@ public class CachedUserManager } public User createUser( String username, String fullName, String emailAddress ) + throws UserManagerException { usersCache.remove( username ); return this.userImpl.createUser( username, fullName, emailAddress ); } public void deleteUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { usersCache.remove( username ); this.userImpl.deleteUser( username ); @@ -113,7 +117,7 @@ public class CachedUserManager } public User findUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( GUEST_USERNAME.equals( username ) ) { @@ -134,7 +138,7 @@ public class CachedUserManager } public User getGuestUser() - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { Object el = usersCache.get( GUEST_USERNAME ); if ( el != null ) @@ -156,24 +160,28 @@ public class CachedUserManager public List<User> findUsersByQuery( UserQuery query ) + throws UserManagerException { log.debug( "NOT CACHED - .findUsersByQuery(UserQuery)" ); return this.userImpl.findUsersByQuery( query ); } public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ) + throws UserManagerException { log.debug( "NOT CACHED - .findUsersByEmailKey(String, boolean)" ); return this.userImpl.findUsersByEmailKey( emailKey, orderAscending ); } public List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ) + throws UserManagerException { log.debug( "NOT CACHED - .findUsersByFullNameKey(String, boolean)" ); return this.userImpl.findUsersByFullNameKey( fullNameKey, orderAscending ); } public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ) + throws UserManagerException { log.debug( "NOT CACHED - .findUsersByUsernameKey(String, boolean)" ); return this.userImpl.findUsersByUsernameKey( usernameKey, orderAscending ); @@ -185,12 +193,14 @@ public class CachedUserManager } public List<User> getUsers() + throws UserManagerException { log.debug( "NOT CACHED - .getUsers()" ); return this.userImpl.getUsers(); } public List<User> getUsers( boolean orderAscending ) + throws UserManagerException { log.debug( "NOT CACHED - .getUsers(boolean)" ); return this.userImpl.getUsers( orderAscending ); @@ -202,13 +212,13 @@ public class CachedUserManager } public User updateUser( User user ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { return updateUser( user, false ); } public User updateUser( User user, boolean passwordChangeRequired ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( user != null ) { @@ -218,6 +228,7 @@ public class CachedUserManager } public boolean userExists( String userName ) + throws UserManagerException { if ( usersCache.hasKey( userName ) ) { Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java Mon Dec 10 16:34:46 2012 @@ -21,6 +21,7 @@ import org.apache.archiva.redback.config import org.apache.archiva.redback.users.AbstractUserManager; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; +import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserQuery; import org.springframework.context.ApplicationContext; @@ -66,16 +67,19 @@ public class ConfigurableUserManager } public User addUser( User user ) + throws UserManagerException { return userManagerImpl.addUser( user ); } public void addUserUnchecked( User user ) + throws UserManagerException { userManagerImpl.addUserUnchecked( user ); } public User createUser( String username, String fullName, String emailAddress ) + throws UserManagerException { return userManagerImpl.createUser( username, fullName, emailAddress ); } @@ -86,7 +90,7 @@ public class ConfigurableUserManager } public void deleteUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { userManagerImpl.deleteUser( username ); } @@ -97,34 +101,38 @@ public class ConfigurableUserManager } public User findUser( String username ) - throws UserNotFoundException + throws UserManagerException, UserNotFoundException { return userManagerImpl.findUser( username ); } @Override public User getGuestUser() - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { return userManagerImpl.getGuestUser(); } public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ) + throws UserManagerException { return userManagerImpl.findUsersByEmailKey( emailKey, orderAscending ); } public List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ) + throws UserManagerException { return userManagerImpl.findUsersByFullNameKey( fullNameKey, orderAscending ); } public List<User> findUsersByQuery( UserQuery query ) + throws UserManagerException { return userManagerImpl.findUsersByQuery( query ); } public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ) + throws UserManagerException { return userManagerImpl.findUsersByUsernameKey( usernameKey, orderAscending ); } @@ -135,11 +143,13 @@ public class ConfigurableUserManager } public List<User> getUsers() + throws UserManagerException { return userManagerImpl.getUsers(); } public List<User> getUsers( boolean orderAscending ) + throws UserManagerException { return userManagerImpl.getUsers( orderAscending ); } @@ -150,18 +160,19 @@ public class ConfigurableUserManager } public User updateUser( User user ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { return updateUser( user, false ); } public User updateUser( User user, boolean passwordChangeRequired ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { return userManagerImpl.updateUser( user, passwordChangeRequired ); } public boolean userExists( String userName ) + throws UserManagerException { return userManagerImpl.userExists( userName ); } Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java Mon Dec 10 16:34:46 2012 @@ -50,12 +50,12 @@ import java.util.List; * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> */ -@Service ("userManager#jdo") +@Service("userManager#jdo") public class JdoUserManager extends AbstractUserManager { @Inject - @Named (value = "jdoFactory#users") + @Named(value = "jdoFactory#users") private JdoFactory jdoFactory; @Inject @@ -104,7 +104,7 @@ public class JdoUserManager return getAllObjectsDetached( ordering ); } - @SuppressWarnings ("unchecked") + @SuppressWarnings("unchecked") private List<User> getAllObjectsDetached( String ordering ) { return RedbackJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUser.class, ordering, (String) null ); @@ -125,7 +125,7 @@ public class JdoUserManager return findUsers( "email", emailKey, orderAscending ); } - @SuppressWarnings ("unchecked") + @SuppressWarnings("unchecked") public List<User> findUsersByQuery( UserQuery userQuery ) { JdoUserQuery uq = (JdoUserQuery) userQuery; @@ -169,7 +169,7 @@ public class JdoUserManager } } - @SuppressWarnings ("unchecked") + @SuppressWarnings("unchecked") private List<User> findUsers( String searchField, String searchKey, boolean ascendingUsername ) { PersistenceManager pm = getPersistenceManager(); @@ -209,6 +209,7 @@ public class JdoUserManager } public User addUser( User user ) + throws UserManagerException { if ( !( user instanceof JdoUser ) ) { @@ -243,6 +244,7 @@ public class JdoUserManager } public void deleteUser( String username ) + throws UserManagerException { try { @@ -264,6 +266,7 @@ public class JdoUserManager } public void addUserUnchecked( User user ) + throws UserManagerException { if ( !( user instanceof JdoUser ) ) { @@ -287,7 +290,7 @@ public class JdoUserManager } public User findUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( StringUtils.isEmpty( username ) ) { @@ -298,6 +301,7 @@ public class JdoUserManager } public boolean userExists( String principal ) + throws UserManagerException { try { @@ -311,13 +315,13 @@ public class JdoUserManager } public User updateUser( User user ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { return updateUser( user, false ); } public User updateUser( User user, boolean passwordChangeRequired ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( !( user instanceof JdoUser ) ) { @@ -385,6 +389,7 @@ public class JdoUserManager } private Object removeObject( Object o ) + throws UserManagerException { if ( o == null ) { Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java Mon Dec 10 16:34:46 2012 @@ -21,6 +21,7 @@ package org.apache.archiva.redback.users import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory; import org.apache.archiva.redback.common.jdo.test.StoreManagerDebug; +import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.provider.test.AbstractUserManagerTestCase; import org.jpox.AbstractPersistenceManagerFactory; import org.jpox.SchemaTool; @@ -38,17 +39,16 @@ import java.util.Properties; * JdoUserManagerTest * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> - * */ public class JdoUserManagerTest extends AbstractUserManagerTestCase { @Inject - @Named( value = "jdoFactory#users" ) + @Named(value = "jdoFactory#users") DefaultConfigurableJdoFactory jdoFactory; @Inject - @Named( value = "userManager#jdo" ) + @Named(value = "userManager#jdo") JdoUserManager jdoUserManager; private StoreManagerDebug storeManager; @@ -106,12 +106,10 @@ public class JdoUserManagerTest } protected void assertCleanUserManager() + throws UserManagerException { // database cleanup - ( (JdoUserManager) getUserManager()).eraseDatabase(); - - - + ( (JdoUserManager) getUserManager() ).eraseDatabase(); super.assertCleanUserManager(); } Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java Mon Dec 10 16:34:46 2012 @@ -74,6 +74,7 @@ public class LdapUserManager } public User addUser( User user ) + throws UserManagerException { try { @@ -86,6 +87,7 @@ public class LdapUserManager } public void addUserUnchecked( User user ) + throws UserManagerException { try { @@ -144,7 +146,7 @@ public class LdapUserManager public void deleteUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( username != null ) { @@ -177,7 +179,7 @@ public class LdapUserManager } public User findUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( username == null ) { @@ -248,6 +250,7 @@ public class LdapUserManager } public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ) + throws UserManagerException { LdapUserQuery query = new LdapUserQuery(); query.setEmail( emailKey ); @@ -257,6 +260,7 @@ public class LdapUserManager } public List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ) + throws UserManagerException { LdapUserQuery query = new LdapUserQuery(); query.setFullName( fullNameKey ); @@ -266,6 +270,7 @@ public class LdapUserManager } public List<User> findUsersByQuery( UserQuery query ) + throws UserManagerException { if ( query == null ) { @@ -304,6 +309,7 @@ public class LdapUserManager * @see org.apache.archiva.redback.users.UserManager#findUsersByUsernameKey(java.lang.String, boolean) */ public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ) + throws UserManagerException { LdapUserQuery query = new LdapUserQuery(); query.setUsername( usernameKey ); @@ -365,13 +371,13 @@ public class LdapUserManager } public User updateUser( User user ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { return updateUser( user, false ); } public User updateUser( User user, boolean passwordChangeRequired ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { if ( user != null ) { @@ -406,6 +412,7 @@ public class LdapUserManager } public boolean userExists( String principal ) + throws UserManagerException { if ( principal == null ) { Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java Mon Dec 10 16:34:46 2012 @@ -24,6 +24,7 @@ import org.apache.archiva.redback.users. import org.apache.archiva.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.users.AbstractUserManager; import org.apache.archiva.redback.users.PermanentUserException; +import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserQuery; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.memory.util.UserSorter; @@ -163,7 +164,7 @@ public class MemoryUserManager } public void deleteUser( String username ) - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { User user = findUser( username ); Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java?rev=1419568&r1=1419567&r2=1419568&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java (original) +++ archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java Mon Dec 10 16:34:46 2012 @@ -24,6 +24,7 @@ import org.apache.archiva.redback.policy import org.apache.archiva.redback.users.PermanentUserException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; +import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserQuery; import org.junit.Test; @@ -40,9 +41,9 @@ import java.util.List; * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> */ -@RunWith ( SpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } ) -@DirtiesContext ( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD ) +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" }) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class AbstractUserManagerTestCase extends TestCase { @@ -93,6 +94,7 @@ public class AbstractUserManagerTestCase } protected void assertCleanUserManager() + throws UserManagerException { getUserManager().eraseDatabase(); @@ -105,6 +107,7 @@ public class AbstractUserManagerTestCase @Test public void testFindUserByNullPrincipal() + throws UserManagerException { try { @@ -120,6 +123,7 @@ public class AbstractUserManagerTestCase @Test public void testFindUserByEmptyUsername() + throws UserManagerException { try { @@ -157,7 +161,7 @@ public class AbstractUserManagerTestCase @Test public void testAddFindUserByPrincipal() - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { assertCleanUserManager(); securityPolicy.setEnabled( false ); @@ -187,7 +191,7 @@ public class AbstractUserManagerTestCase @Test public void testAddFindUserLockedStatus() - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { assertCleanUserManager(); securityPolicy.setEnabled( false ); @@ -197,7 +201,7 @@ public class AbstractUserManagerTestCase smcqueen.setLocked( true ); /* - * Keep a reference to the object that was added. Since it has the + * Keep a reference to the object that was added. Since it has the * actual principal that was managed by jpox/jdo. */ User added = userManager.addUser( smcqueen ); @@ -224,7 +228,7 @@ public class AbstractUserManagerTestCase @Test public void testAddFindUserByUsername() - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { assertCleanUserManager(); securityPolicy.setEnabled( false ); @@ -396,6 +400,7 @@ public class AbstractUserManagerTestCase @Test public void testFindUsersByQuery() + throws UserManagerException { assertCleanUserManager(); securityPolicy.setEnabled( false ); @@ -572,7 +577,7 @@ public class AbstractUserManagerTestCase @Test public void testDeletePermanentUser() - throws UserNotFoundException + throws UserNotFoundException, UserManagerException { assertCleanUserManager(); securityPolicy.setEnabled( false );
