rename manager classes from xml to default

2025-11-07 14:05:44 +01:00 · 2012-03-16 18:50:32 +01:00
parent fa4fe33082
commit cb37aec93a
7 changed files with 34 additions and 67 deletions
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -51,10 +51,10 @@ import sonia.scm.filter.AdminSecurityFilter;
 import sonia.scm.filter.BaseUrlFilter;
 import sonia.scm.filter.GZipFilter;
 import sonia.scm.filter.SecurityFilter;
+import sonia.scm.group.DefaultGroupManager;
 import sonia.scm.group.GroupDAO;
 import sonia.scm.group.GroupManager;
 import sonia.scm.group.xml.XmlGroupDAO;
-import sonia.scm.group.xml.XmlGroupManager;
 import sonia.scm.io.DefaultFileSystem;
 import sonia.scm.io.FileSystem;
 import sonia.scm.net.HttpClient;
@@ -64,6 +64,7 @@ import sonia.scm.plugin.Plugin;
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.plugin.PluginManager;
 import sonia.scm.repository.ChangesetViewerUtil;
+import sonia.scm.repository.DefaultRepositoryManager;
 import sonia.scm.repository.DefaultRepositoryProvider;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryBrowserUtil;
@@ -71,7 +72,6 @@ import sonia.scm.repository.RepositoryDAO;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.repository.RepositoryProvider;
 import sonia.scm.repository.xml.XmlRepositoryDAO;
-import sonia.scm.repository.xml.XmlRepositoryManager;
 import sonia.scm.resources.DefaultResourceManager;
 import sonia.scm.resources.DevelopmentResourceManager;
 import sonia.scm.resources.ResourceManager;
@@ -92,10 +92,10 @@ import sonia.scm.url.RestXmlUrlProvider;
 import sonia.scm.url.UrlProvider;
 import sonia.scm.url.UrlProviderFactory;
 import sonia.scm.url.WebUIUrlProvider;
+import sonia.scm.user.DefaultUserManager;
 import sonia.scm.user.UserDAO;
 import sonia.scm.user.UserManager;
 import sonia.scm.user.xml.XmlUserDAO;
-import sonia.scm.user.xml.XmlUserManager;
 import sonia.scm.util.DebugServlet;
 import sonia.scm.util.ScmConfigurationUtil;
 import sonia.scm.web.cgi.CGIExecutorFactory;
@@ -264,9 +264,9 @@ public class ScmServletModule extends ServletModule

    // bind(RepositoryManager.class).annotatedWith(Undecorated.class).to(
    // BasicRepositoryManager.class);
-    bind(RepositoryManager.class, XmlRepositoryManager.class);
-    bind(UserManager.class, XmlUserManager.class);
-    bind(GroupManager.class, XmlGroupManager.class);
+    bind(RepositoryManager.class, DefaultRepositoryManager.class);
+    bind(UserManager.class, DefaultUserManager.class);
+    bind(GroupManager.class, DefaultGroupManager.class);
    bind(CGIExecutorFactory.class, DefaultCGIExecutorFactory.class);
    bind(ChangesetViewerUtil.class);
    bind(RepositoryBrowserUtil.class);
--- a/scm-backend-xml/src/main/java/sonia/scm/group/xml/XmlGroupManager.java
+++ b/scm-backend-xml/src/main/java/sonia/scm/group/xml/XmlGroupManager.java
@@ -31,7 +31,7 @@



-package sonia.scm.group.xml;
+package sonia.scm.group;

 //~--- non-JDK imports --------------------------------------------------------

@@ -45,12 +45,6 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.HandlerEvent;
 import sonia.scm.SCMContextProvider;
 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.SearchUtil;
 import sonia.scm.security.SecurityContext;
@@ -75,12 +69,12 @@ import java.util.Set;
 * @author Sebastian Sdorra
 */
@Singleton
-public class XmlGroupManager extends AbstractGroupManager
+public class DefaultGroupManager extends AbstractGroupManager
 {

  /** the logger for XmlGroupManager */
  private static final Logger logger =
-    LoggerFactory.getLogger(XmlGroupManager.class);
+    LoggerFactory.getLogger(DefaultGroupManager.class);

  //~--- constructors ---------------------------------------------------------

@@ -93,7 +87,7 @@ public class XmlGroupManager extends AbstractGroupManager
   * @param groupListenerProvider
   */
  @Inject
-  public XmlGroupManager(Provider<SecurityContext> securityContextProvider,
+  public DefaultGroupManager(Provider<SecurityContext> securityContextProvider,
                             GroupDAO groupDAO,
                             Provider<Set<GroupListener>> groupListenerProvider)
  {
--- a/scm-backend-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
+++ b/scm-backend-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
@@ -31,7 +31,7 @@



-package sonia.scm.repository.xml;
+package sonia.scm.repository;

 //~--- non-JDK imports --------------------------------------------------------

@@ -46,24 +46,6 @@ import sonia.scm.ConfigurationException;
 import sonia.scm.HandlerEvent;
 import sonia.scm.SCMContextProvider;
 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.util.AssertUtil;
 import sonia.scm.util.CollectionAppender;
@@ -95,12 +77,12 @@ import javax.servlet.http.HttpServletRequest;
 * @author Sebastian Sdorra
 */
@Singleton
-public class XmlRepositoryManager extends AbstractRepositoryManager
+public class DefaultRepositoryManager extends AbstractRepositoryManager
 {

  /** Field description */
  private static final Logger logger =
-    LoggerFactory.getLogger(XmlRepositoryManager.class);
+    LoggerFactory.getLogger(DefaultRepositoryManager.class);

  //~--- constructors ---------------------------------------------------------

@@ -118,7 +100,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
   * @param repositoryHooksProvider
   */
  @Inject
-  public XmlRepositoryManager(
+  public DefaultRepositoryManager(
          SCMContextProvider contextProvider,
          Provider<WebSecurityContext> securityContextProvider,
          RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
--- a/scm-backend-xml/src/main/java/sonia/scm/user/xml/XmlUserManager.java
+++ b/scm-backend-xml/src/main/java/sonia/scm/user/xml/XmlUserManager.java
@@ -31,7 +31,7 @@



-package sonia.scm.user.xml;
+package sonia.scm.user;

 //~--- non-JDK imports --------------------------------------------------------

@@ -48,12 +48,6 @@ import sonia.scm.TransformFilter;
 import sonia.scm.search.SearchRequest;
 import sonia.scm.search.SearchUtil;
 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.CollectionAppender;
 import sonia.scm.util.IOUtil;
@@ -82,7 +76,7 @@ import javax.xml.bind.Unmarshaller;
 * @author Sebastian Sdorra
 */
@Singleton
-public class XmlUserManager extends AbstractUserManager
+public class DefaultUserManager extends AbstractUserManager
 {

  /** Field description */
@@ -97,7 +91,7 @@ public class XmlUserManager extends AbstractUserManager

  /** the logger for XmlUserManager */
  private static final Logger logger =
-    LoggerFactory.getLogger(XmlUserManager.class);
+    LoggerFactory.getLogger(DefaultUserManager.class);

  //~--- constructors ---------------------------------------------------------

@@ -110,8 +104,8 @@ public class XmlUserManager extends AbstractUserManager
   * @param userListenerProvider
   */
  @Inject
-  public XmlUserManager(Provider<WebSecurityContext> scurityContextProvider,
-                        UserDAO userDAO,
+  public DefaultUserManager(
+          Provider<WebSecurityContext> scurityContextProvider, UserDAO userDAO,
          Provider<Set<UserListener>> userListenerProvider)
  {
    this.scurityContextProvider = scurityContextProvider;
@@ -492,7 +486,7 @@ public class XmlUserManager extends AbstractUserManager
   */
  private void createDefaultAccount(Unmarshaller unmarshaller, String path)
  {
-    InputStream input = XmlUserManager.class.getResourceAsStream(path);
+    InputStream input = DefaultUserManager.class.getResourceAsStream(path);

    try
    {
--- a/scm-backend-xml/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
+++ b/scm-backend-xml/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;

 import sonia.scm.Type;
 import sonia.scm.repository.xml.XmlRepositoryDAO;
-import sonia.scm.repository.xml.XmlRepositoryManager;
 import sonia.scm.store.JAXBStoreFactory;
 import sonia.scm.store.StoreFactory;
 import sonia.scm.util.MockUtil;
@@ -61,7 +60,7 @@ import java.util.Set;
 *
 * @author Sebastian Sdorra
 */
-public class XmlRepositoryManagerTest extends RepositoryManagerTestBase
+public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
 {

  /**
@@ -101,7 +100,7 @@ public class XmlRepositoryManagerTest extends RepositoryManagerTestBase
   * @return
   */
  @Override
-  protected XmlRepositoryManager createManager()
+  protected DefaultRepositoryManager createManager()
  {
    Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>();
    StoreFactory factory = new JAXBStoreFactory();
@@ -135,10 +134,9 @@ public class XmlRepositoryManagerTest extends RepositoryManagerTestBase

    XmlRepositoryDAO repositoryDAO = new XmlRepositoryDAO(factory);

-    return new XmlRepositoryManager(contextProvider,
-                                    MockUtil.getAdminSecurityContextProvider(),
-                                    repositoryDAO, handlerSet,
-                                    listenerProvider, hookProvider);
+    return new DefaultRepositoryManager(contextProvider,
+            MockUtil.getAdminSecurityContextProvider(), repositoryDAO,
+            handlerSet, listenerProvider, hookProvider);
  }

  /**
--- a/scm-backend-xml/src/test/java/sonia/scm/user/XmlUserManagerTest.java
+++ b/scm-backend-xml/src/test/java/sonia/scm/user/XmlUserManagerTest.java
@@ -40,7 +40,6 @@ import com.google.inject.Provider;
 import sonia.scm.store.JAXBStoreFactory;
 import sonia.scm.store.StoreFactory;
 import sonia.scm.user.xml.XmlUserDAO;
-import sonia.scm.user.xml.XmlUserManager;
 import sonia.scm.util.MockUtil;

 import static org.mockito.Mockito.*;
@@ -54,7 +53,7 @@ import java.util.Set;
 *
 * @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);

-    return new XmlUserManager(MockUtil.getAdminSecurityContextProvider(),
+    return new DefaultUserManager(MockUtil.getAdminSecurityContextProvider(),
                                  userDAO, listenerProvider);
  }
 }
--- a/scm-webapp/src/test/java/sonia/scm/web/security/XmlAuthenticationHandlerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/web/security/XmlAuthenticationHandlerTest.java
@@ -47,7 +47,7 @@ import sonia.scm.store.StoreFactory;
 import sonia.scm.user.User;
 import sonia.scm.user.UserListener;
 import sonia.scm.user.UserTestData;
-import sonia.scm.user.xml.XmlUserManager;
+import sonia.scm.user.DefaultUserManager;
 import sonia.scm.util.MockUtil;

 import static org.junit.Assert.*;
@@ -142,8 +142,8 @@ public class XmlAuthenticationHandlerTest extends AbstractTestBase

    XmlUserDAO userDAO = new XmlUserDAO(storeFactory);
    
-    XmlUserManager userManager =
-      new XmlUserManager(MockUtil.getAdminSecurityContextProvider(),
+    DefaultUserManager userManager =
+      new DefaultUserManager(MockUtil.getAdminSecurityContextProvider(),
                         userDAO, listenerProvider);

    userManager.init(contextProvider);