Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 22:15:45 +01:00
Code Issues Packages Projects Releases Activity

rename manager classes from xml to default

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-03-16 18:50:32 +01:00
parent fa4fe33082
commit cb37aec93a
7 changed files with 34 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,10 +51,10 @@ import sonia.scm.filter.AdminSecurityFilter;
import sonia.scm.filter.BaseUrlFilter; import sonia.scm.filter.BaseUrlFilter;
import sonia.scm.filter.GZipFilter; import sonia.scm.filter.GZipFilter;
import sonia.scm.filter.SecurityFilter; import sonia.scm.filter.SecurityFilter;
import sonia.scm.group.DefaultGroupManager;
import sonia.scm.group.GroupDAO; import sonia.scm.group.GroupDAO;
import sonia.scm.group.GroupManager; import sonia.scm.group.GroupManager;
import sonia.scm.group.xml.XmlGroupDAO; import sonia.scm.group.xml.XmlGroupDAO;
import sonia.scm.group.xml.XmlGroupManager;
import sonia.scm.io.DefaultFileSystem; import sonia.scm.io.DefaultFileSystem;
import sonia.scm.io.FileSystem; import sonia.scm.io.FileSystem;
import sonia.scm.net.HttpClient; import sonia.scm.net.HttpClient;
@@ -64,6 +64,7 @@ import sonia.scm.plugin.Plugin;
import sonia.scm.plugin.PluginLoader; import sonia.scm.plugin.PluginLoader;
import sonia.scm.plugin.PluginManager; import sonia.scm.plugin.PluginManager;
import sonia.scm.repository.ChangesetViewerUtil; import sonia.scm.repository.ChangesetViewerUtil;
import sonia.scm.repository.DefaultRepositoryManager;
import sonia.scm.repository.DefaultRepositoryProvider; import sonia.scm.repository.DefaultRepositoryProvider;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryBrowserUtil; import sonia.scm.repository.RepositoryBrowserUtil;
@@ -71,7 +72,6 @@ import sonia.scm.repository.RepositoryDAO;
import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryProvider; import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.xml.XmlRepositoryDAO; import sonia.scm.repository.xml.XmlRepositoryDAO;
import sonia.scm.repository.xml.XmlRepositoryManager;
import sonia.scm.resources.DefaultResourceManager; import sonia.scm.resources.DefaultResourceManager;
import sonia.scm.resources.DevelopmentResourceManager; import sonia.scm.resources.DevelopmentResourceManager;
import sonia.scm.resources.ResourceManager; import sonia.scm.resources.ResourceManager;
@@ -92,10 +92,10 @@ import sonia.scm.url.RestXmlUrlProvider;
import sonia.scm.url.UrlProvider; import sonia.scm.url.UrlProvider;
import sonia.scm.url.UrlProviderFactory; import sonia.scm.url.UrlProviderFactory;
import sonia.scm.url.WebUIUrlProvider; import sonia.scm.url.WebUIUrlProvider;
import sonia.scm.user.DefaultUserManager;
import sonia.scm.user.UserDAO; import sonia.scm.user.UserDAO;
import sonia.scm.user.UserManager; import sonia.scm.user.UserManager;
import sonia.scm.user.xml.XmlUserDAO; import sonia.scm.user.xml.XmlUserDAO;
import sonia.scm.user.xml.XmlUserManager;
import sonia.scm.util.DebugServlet; import sonia.scm.util.DebugServlet;
import sonia.scm.util.ScmConfigurationUtil; import sonia.scm.util.ScmConfigurationUtil;
import sonia.scm.web.cgi.CGIExecutorFactory; import sonia.scm.web.cgi.CGIExecutorFactory;
@@ -264,9 +264,9 @@ public class ScmServletModule extends ServletModule
// bind(RepositoryManager.class).annotatedWith(Undecorated.class).to( // bind(RepositoryManager.class).annotatedWith(Undecorated.class).to(
// BasicRepositoryManager.class); // BasicRepositoryManager.class);
bind(RepositoryManager.class, XmlRepositoryManager.class); bind(RepositoryManager.class, DefaultRepositoryManager.class);
bind(UserManager.class, XmlUserManager.class); bind(UserManager.class, DefaultUserManager.class);
bind(GroupManager.class, XmlGroupManager.class); bind(GroupManager.class, DefaultGroupManager.class);
bind(CGIExecutorFactory.class, DefaultCGIExecutorFactory.class); bind(CGIExecutorFactory.class, DefaultCGIExecutorFactory.class);
bind(ChangesetViewerUtil.class); bind(ChangesetViewerUtil.class);
bind(RepositoryBrowserUtil.class); bind(RepositoryBrowserUtil.class);

18
scm-backend-xml/src/main/java/sonia/scm/group/xml/XmlGroupManager.java → scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
View File

@@ -31,7 +31,7 @@
package sonia.scm.group.xml; package sonia.scm.group;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -45,12 +45,6 @@ import org.slf4j.LoggerFactory;
import sonia.scm.HandlerEvent; import sonia.scm.HandlerEvent;
import sonia.scm.SCMContextProvider; import sonia.scm.SCMContextProvider;
import sonia.scm.TransformFilter; import sonia.scm.TransformFilter;
import sonia.scm.group.AbstractGroupManager;
import sonia.scm.group.Group;
import sonia.scm.group.GroupAllreadyExistExeption;
import sonia.scm.group.GroupDAO;
import sonia.scm.group.GroupException;
import sonia.scm.group.GroupListener;
import sonia.scm.search.SearchRequest; import sonia.scm.search.SearchRequest;
import sonia.scm.search.SearchUtil; import sonia.scm.search.SearchUtil;
import sonia.scm.security.SecurityContext; import sonia.scm.security.SecurityContext;
@@ -75,12 +69,12 @@ import java.util.Set;
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
@Singleton @Singleton
public class XmlGroupManager extends AbstractGroupManager public class DefaultGroupManager extends AbstractGroupManager
{ {
/** the logger for XmlGroupManager */ /** the logger for XmlGroupManager */
private static final Logger logger = private static final Logger logger =
LoggerFactory.getLogger(XmlGroupManager.class); LoggerFactory.getLogger(DefaultGroupManager.class);
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
@@ -93,9 +87,9 @@ public class XmlGroupManager extends AbstractGroupManager
* @param groupListenerProvider * @param groupListenerProvider
*/ */
@Inject @Inject
public XmlGroupManager(Provider<SecurityContext> securityContextProvider, public DefaultGroupManager(Provider<SecurityContext> securityContextProvider,
GroupDAO groupDAO, GroupDAO groupDAO,
Provider<Set<GroupListener>> groupListenerProvider) Provider<Set<GroupListener>> groupListenerProvider)
{ {
this.securityContextProvider = securityContextProvider; this.securityContextProvider = securityContextProvider;
this.groupDAO = groupDAO; this.groupDAO = groupDAO;

26
scm-backend-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java → scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
View File

@@ -31,7 +31,7 @@
package sonia.scm.repository.xml; package sonia.scm.repository;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -46,24 +46,6 @@ import sonia.scm.ConfigurationException;
import sonia.scm.HandlerEvent; import sonia.scm.HandlerEvent;
import sonia.scm.SCMContextProvider; import sonia.scm.SCMContextProvider;
import sonia.scm.Type; import sonia.scm.Type;
import sonia.scm.repository.AbstractRepositoryManager;
import sonia.scm.repository.BlameViewer;
import sonia.scm.repository.ChangesetViewer;
import sonia.scm.repository.DiffViewer;
import sonia.scm.repository.PermissionType;
import sonia.scm.repository.PermissionUtil;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryAllreadyExistExeption;
import sonia.scm.repository.RepositoryBrowser;
import sonia.scm.repository.RepositoryDAO;
import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryHandlerNotFoundException;
import sonia.scm.repository.RepositoryHook;
import sonia.scm.repository.RepositoryHookEvent;
import sonia.scm.repository.RepositoryHookTask;
import sonia.scm.repository.RepositoryListener;
import sonia.scm.repository.RepositoryNotFoundException;
import sonia.scm.security.ScmSecurityException; import sonia.scm.security.ScmSecurityException;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.CollectionAppender; import sonia.scm.util.CollectionAppender;
@@ -95,12 +77,12 @@ import javax.servlet.http.HttpServletRequest;
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
@Singleton @Singleton
public class XmlRepositoryManager extends AbstractRepositoryManager public class DefaultRepositoryManager extends AbstractRepositoryManager
{ {
/** Field description */ /** Field description */
private static final Logger logger = private static final Logger logger =
LoggerFactory.getLogger(XmlRepositoryManager.class); LoggerFactory.getLogger(DefaultRepositoryManager.class);
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
@@ -118,7 +100,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
* @param repositoryHooksProvider * @param repositoryHooksProvider
*/ */
@Inject @Inject
public XmlRepositoryManager( public DefaultRepositoryManager(
SCMContextProvider contextProvider, SCMContextProvider contextProvider,
Provider<WebSecurityContext> securityContextProvider, Provider<WebSecurityContext> securityContextProvider,
RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet, RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,

20
scm-backend-xml/src/main/java/sonia/scm/user/xml/XmlUserManager.java → scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
View File

@@ -31,7 +31,7 @@
package sonia.scm.user.xml; package sonia.scm.user;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -48,12 +48,6 @@ import sonia.scm.TransformFilter;
import sonia.scm.search.SearchRequest; import sonia.scm.search.SearchRequest;
import sonia.scm.search.SearchUtil; import sonia.scm.search.SearchUtil;
import sonia.scm.security.ScmSecurityException; import sonia.scm.security.ScmSecurityException;
import sonia.scm.user.AbstractUserManager;
import sonia.scm.user.User;
import sonia.scm.user.UserAllreadyExistException;
import sonia.scm.user.UserDAO;
import sonia.scm.user.UserException;
import sonia.scm.user.UserListener;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.CollectionAppender; import sonia.scm.util.CollectionAppender;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
@@ -82,7 +76,7 @@ import javax.xml.bind.Unmarshaller;
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
@Singleton @Singleton
public class XmlUserManager extends AbstractUserManager public class DefaultUserManager extends AbstractUserManager
{ {
/** Field description */ /** Field description */
@@ -97,7 +91,7 @@ public class XmlUserManager extends AbstractUserManager
/** the logger for XmlUserManager */ /** the logger for XmlUserManager */
private static final Logger logger = private static final Logger logger =
LoggerFactory.getLogger(XmlUserManager.class); LoggerFactory.getLogger(DefaultUserManager.class);
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
@@ -110,9 +104,9 @@ public class XmlUserManager extends AbstractUserManager
* @param userListenerProvider * @param userListenerProvider
*/ */
@Inject @Inject
public XmlUserManager(Provider<WebSecurityContext> scurityContextProvider, public DefaultUserManager(
UserDAO userDAO, Provider<WebSecurityContext> scurityContextProvider, UserDAO userDAO,
Provider<Set<UserListener>> userListenerProvider) Provider<Set<UserListener>> userListenerProvider)
{ {
this.scurityContextProvider = scurityContextProvider; this.scurityContextProvider = scurityContextProvider;
this.userDAO = userDAO; this.userDAO = userDAO;
@@ -492,7 +486,7 @@ public class XmlUserManager extends AbstractUserManager
*/ */
private void createDefaultAccount(Unmarshaller unmarshaller, String path) private void createDefaultAccount(Unmarshaller unmarshaller, String path)
{ {
InputStream input = XmlUserManager.class.getResourceAsStream(path); InputStream input = DefaultUserManager.class.getResourceAsStream(path);
try try
{ {

12
scm-backend-xml/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java → scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
View File

@@ -41,7 +41,6 @@ import org.junit.Test;
import sonia.scm.Type; import sonia.scm.Type;
import sonia.scm.repository.xml.XmlRepositoryDAO; import sonia.scm.repository.xml.XmlRepositoryDAO;
import sonia.scm.repository.xml.XmlRepositoryManager;
import sonia.scm.store.JAXBStoreFactory; import sonia.scm.store.JAXBStoreFactory;
import sonia.scm.store.StoreFactory; import sonia.scm.store.StoreFactory;
import sonia.scm.util.MockUtil; import sonia.scm.util.MockUtil;
@@ -61,7 +60,7 @@ import java.util.Set;
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
public class XmlRepositoryManagerTest extends RepositoryManagerTestBase public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
{ {
/** /**
@@ -101,7 +100,7 @@ public class XmlRepositoryManagerTest extends RepositoryManagerTestBase
* @return * @return
*/ */
@Override @Override
protected XmlRepositoryManager createManager() protected DefaultRepositoryManager createManager()
{ {
Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>(); Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>();
StoreFactory factory = new JAXBStoreFactory(); StoreFactory factory = new JAXBStoreFactory();
@@ -135,10 +134,9 @@ public class XmlRepositoryManagerTest extends RepositoryManagerTestBase
XmlRepositoryDAO repositoryDAO = new XmlRepositoryDAO(factory); XmlRepositoryDAO repositoryDAO = new XmlRepositoryDAO(factory);
return new XmlRepositoryManager(contextProvider, return new DefaultRepositoryManager(contextProvider,
MockUtil.getAdminSecurityContextProvider(), MockUtil.getAdminSecurityContextProvider(), repositoryDAO,
repositoryDAO, handlerSet, handlerSet, listenerProvider, hookProvider);
listenerProvider, hookProvider);
} }
/** /**

7
scm-backend-xml/src/test/java/sonia/scm/user/XmlUserManagerTest.java → scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
View File

@@ -40,7 +40,6 @@ import com.google.inject.Provider;
import sonia.scm.store.JAXBStoreFactory; import sonia.scm.store.JAXBStoreFactory;
import sonia.scm.store.StoreFactory; import sonia.scm.store.StoreFactory;
import sonia.scm.user.xml.XmlUserDAO; import sonia.scm.user.xml.XmlUserDAO;
import sonia.scm.user.xml.XmlUserManager;
import sonia.scm.util.MockUtil; import sonia.scm.util.MockUtil;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
@@ -54,7 +53,7 @@ import java.util.Set;
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
public class XmlUserManagerTest extends UserManagerTestBase public class DefaultUserManagerTest extends UserManagerTestBase
{ {
/** /**
@@ -76,7 +75,7 @@ public class XmlUserManagerTest extends UserManagerTestBase
XmlUserDAO userDAO = new XmlUserDAO(factory); XmlUserDAO userDAO = new XmlUserDAO(factory);
return new XmlUserManager(MockUtil.getAdminSecurityContextProvider(), return new DefaultUserManager(MockUtil.getAdminSecurityContextProvider(),
userDAO, listenerProvider); userDAO, listenerProvider);
} }
} }

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

@@ -47,7 +47,7 @@ import sonia.scm.store.StoreFactory;
import sonia.scm.user.User; import sonia.scm.user.User;
import sonia.scm.user.UserListener; import sonia.scm.user.UserListener;
import sonia.scm.user.UserTestData; import sonia.scm.user.UserTestData;
import sonia.scm.user.xml.XmlUserManager; import sonia.scm.user.DefaultUserManager;
import sonia.scm.util.MockUtil; import sonia.scm.util.MockUtil;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@@ -142,8 +142,8 @@ public class XmlAuthenticationHandlerTest extends AbstractTestBase
XmlUserDAO userDAO = new XmlUserDAO(storeFactory); XmlUserDAO userDAO = new XmlUserDAO(storeFactory);
XmlUserManager userManager = DefaultUserManager userManager =
new XmlUserManager(MockUtil.getAdminSecurityContextProvider(), new DefaultUserManager(MockUtil.getAdminSecurityContextProvider(),
userDAO, listenerProvider); userDAO, listenerProvider);
userManager.init(contextProvider); userManager.init(contextProvider);