Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return updated user and un comment tested code 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1412794 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-11-23 09:29:18 +00:00
parent daeecfa8a0
commit 781c294599
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
View File

@ -71,7 +71,7 @@ public class LockedAdminEnvironmentCheck
*/
public void validateEnvironment( List<String> violations )
{
if ( !checked ) //&& !userManager.isReadOnly() )
if ( !checked && !userManager.isReadOnly() )
{
List<String> roles = new ArrayList<String>();
roles.add( RedbackRoleConstants.SYSTEM_ADMINISTRATOR_ROLE );

17
redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
View File

@ -21,6 +21,8 @@ package org.apache.archiva.redback.users.jdo;
import org.apache.archiva.redback.components.jdo.JdoFactory;
import org.apache.archiva.redback.components.jdo.PlexusJdoUtils;
import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
import org.apache.archiva.redback.components.jdo.PlexusStoreException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.PermanentUserException;
@ -28,8 +30,6 @@ import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.UserQuery;
import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
import org.apache.archiva.redback.components.jdo.PlexusStoreException;
import org.codehaus.plexus.util.StringUtils;
import org.jpox.JDOClassLoaderResolver;
import org.springframework.stereotype.Service;
@ -49,14 +49,13 @@ import java.util.List;
* JdoUserManager
*
* @author <a href="mailto:joakim@erdfelt.com">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
@ -105,7 +104,7 @@ public class JdoUserManager
return getAllObjectsDetached( ordering );
}
@SuppressWarnings( "unchecked" )
@SuppressWarnings ("unchecked")
private List<User> getAllObjectsDetached( String ordering )
{
return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUser.class, ordering, (String) null );
@ -126,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;
@ -170,7 +169,7 @@ public class JdoUserManager
}
}
@SuppressWarnings( "unchecked" )
@SuppressWarnings ("unchecked")
private List<User> findUsers( String searchField, String searchKey, boolean ascendingUsername )
{
PersistenceManager pm = getPersistenceManager();
@ -377,7 +376,7 @@ public class JdoUserManager
userSecurityPolicy.extensionChangePassword( user, passwordChangeRequired );
}
updateObject( user );
user = (User) updateObject( user );
fireUserManagerUserUpdated( user );