diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
new file mode 100644
index 0000000000..acaccb0d7e
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
@@ -0,0 +1,204 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.repository;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.List;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ * @since 1.12
+ */
+public abstract class AbstactImportHandler implements ImportHandler
+{
+
+  /**
+   * the logger for AbstactImportHandler
+   */
+  private static final Logger logger =
+    LoggerFactory.getLogger(AbstactImportHandler.class);
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract String[] getDirectoryNames();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract AbstractRepositoryHandler<?> getRepositoryHandler();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract String getTypeName();
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param manager
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  @Override
+  public void importRepositories(RepositoryManager manager)
+          throws IOException, RepositoryException
+  {
+    if (logger.isTraceEnabled())
+    {
+      logger.trace("search for repositories to import");
+    }
+
+    List<String> repositoryNames =
+      RepositoryUtil.getRepositoryNames(getRepositoryHandler(),
+        getDirectoryNames());
+
+    for (String repositoryName : repositoryNames)
+    {
+      if (logger.isTraceEnabled())
+      {
+        logger.trace("check repository {} for import", repositoryName);
+      }
+
+      Repository repository = manager.get(getTypeName(), repositoryName);
+
+      if (repository == null)
+      {
+        importRepository(manager, repositoryName);
+      }
+      else if (logger.isDebugEnabled())
+      {
+        logger.debug("repository {} is allready managed", repositoryName);
+      }
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param repositoryDirectory
+   * @param repositoryName
+   *
+   * @return
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  protected Repository createRepository(File repositoryDirectory,
+          String repositoryName)
+          throws IOException, RepositoryException
+  {
+    Repository repository = new Repository();
+
+    repository.setName(repositoryName);
+    repository.setPublicReadable(false);
+    repository.setType(getTypeName());
+
+    return repository;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param manager
+   * @param repositoryName
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  private void importRepository(RepositoryManager manager,
+                                String repositoryName)
+          throws IOException, RepositoryException
+  {
+    Repository repository =
+      createRepository(getRepositoryDirectory(repositoryName), repositoryName);
+
+    if (repository != null)
+    {
+      if (logger.isInfoEnabled())
+      {
+        logger.info("import repository {} of type {}", repositoryName,
+                    getTypeName());
+      }
+
+      manager.importRepository(repository);
+    }
+    else if (logger.isWarnEnabled())
+    {
+      logger.warn("could not create repository object for {}", repositoryName);
+    }
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param repositoryName
+   *
+   * @return
+   */
+  private File getRepositoryDirectory(String repositoryName)
+  {
+    return new File(
+        getRepositoryHandler().getConfig().getRepositoryDirectory(),
+        repositoryName);
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java
index f5a52447eb..ad8aaa6cc1 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java
@@ -36,17 +36,11 @@ package sonia.scm.repository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.IOException;
-
-import java.util.List;
-
 /**
  *
  * @author Sebastian Sdorra
  */
-public class GitImportHandler implements ImportHandler
+public class GitImportHandler extends AbstactImportHandler
 {
 
   /** Field description */
@@ -74,75 +68,42 @@ public class GitImportHandler implements ImportHandler
     this.handler = handler;
   }
 
-  //~--- methods --------------------------------------------------------------
+  //~--- get methods ----------------------------------------------------------
 
   /**
    * Method description
    *
    *
-   * @param manager
-   *
-   * @throws IOException
-   * @throws RepositoryException
+   * @return
    */
   @Override
-  public void importRepositories(RepositoryManager manager)
-          throws IOException, RepositoryException
+  protected String[] getDirectoryNames()
   {
-    if (logger.isTraceEnabled())
-    {
-      logger.trace("search for git repositories for import");
-    }
-
-    List<String> repositoryNames = RepositoryUtil.getRepositoryNames(handler,
-                                     GIT_DIR, GIT_DIR_REFS);
-
-    for (String repositoryName : repositoryNames)
-    {
-      if (logger.isTraceEnabled())
-      {
-        logger.trace("check git repository {} for import", repositoryName);
-      }
-
-      Repository repository = manager.get(GitRepositoryHandler.TYPE_NAME,
-                                repositoryName);
-
-      if (repository == null)
-      {
-        importRepository(manager, repositoryName);
-      }
-      else if (logger.isDebugEnabled())
-      {
-        logger.debug("repository {} is allready managed", repositoryName);
-      }
-    }
+    return new String[] { GIT_DIR, GIT_DIR_REFS };
   }
 
   /**
    * Method description
    *
    *
-   * @param manager
-   * @param repositoryName
-   *
-   * @throws IOException
-   * @throws RepositoryException
+   * @return
    */
-  private void importRepository(RepositoryManager manager,
-                                String repositoryName)
-          throws RepositoryException, IOException
+  @Override
+  protected AbstractRepositoryHandler<?> getRepositoryHandler()
   {
-    if (logger.isInfoEnabled())
-    {
-      logger.info("try to import git repository {}", repositoryName);
-    }
+    return handler;
+  }
 
-    Repository repository = new Repository();
-
-    repository.setName(repositoryName);
-    repository.setType(GitRepositoryHandler.TYPE_NAME);
-    repository.setPublicReadable(false);
-    manager.importRepository(repository);
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getTypeName()
+  {
+    return GitRepositoryHandler.TYPE_NAME;
   }
 
   //~--- fields ---------------------------------------------------------------