Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-07 19:16:37 +02:00
Code Issues Packages Projects Releases Activity

implementation and use of user and group dao

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-03-15 21:38:47 +01:00
parent 72a00e8371
commit 326612e00a
12 changed files with 702 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -118,6 +118,10 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import sonia.scm.group.GroupDAO;
import sonia.scm.group.xml.XmlGroupDAO;
import sonia.scm.user.UserDAO;
import sonia.scm.user.xml.XmlUserDAO;
/**
*
@@ -251,6 +255,10 @@ public class ScmServletModule extends ServletModule
// bind security cache
bind(CacheManager.class, EhCacheManager.class);
// bind dao
bind(GroupDAO.class, XmlGroupDAO.class);
bind(UserDAO.class, XmlUserDAO.class);
// bind(RepositoryManager.class).annotatedWith(Undecorated.class).to(
// BasicRepositoryManager.class);
bind(RepositoryManager.class, XmlRepositoryManager.class);

4
scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
View File

@@ -64,6 +64,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import sonia.scm.user.xml.XmlUserDAO;
/**
*
@@ -144,7 +145,8 @@ public class ChangePasswordResource
logger.info("password change for user {}", currentUser.getName());
}
if (currentUser.getType().equals(XmlUserManager.TYPE))
// TODO remove dependency to xml implementation
if (currentUser.getType().equals(XmlUserDAO.TYPE))
{
User dbUser = userManager.get(currentUser.getName());

5
scm-webapp/src/test/java/sonia/scm/web/security/XmlAuthenticationHandlerTest.java
View File

@@ -61,6 +61,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.user.xml.XmlUserDAO;
/**
*
@@ -139,9 +140,11 @@ public class XmlAuthenticationHandlerTest extends AbstractTestBase
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
XmlUserDAO userDAO = new XmlUserDAO(storeFactory);
XmlUserManager userManager =
new XmlUserManager(MockUtil.getAdminSecurityContextProvider(),
storeFactory, listenerProvider);
userDAO, listenerProvider);
userManager.init(contextProvider);
userManager.create(slarti);