From 62bb5a763062fc452bd58696992eaba9e7bf119d Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 18 Nov 2010 20:59:45 +0100
Subject: [PATCH] improve handler initialisation

---
 .../scm/repository/GitRepositoryHandler.java  | 10 +++-
 .../scm/repository/SvnRepositoryHandler.java  | 16 +++++--
 .../repository/AbstractRepositoryHandler.java |  6 ++-
 .../AbstractSimpleRepositoryHandler.java      | 47 ++++++++++++++++++-
 4 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index 91e149ffe5..729bce8b4e 100644
--- a/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -112,8 +112,14 @@ public class GitRepositoryHandler
     return GitConfig.class;
   }
 
+  @Override
+  protected GitConfig createInitialConfig()
+  {
+    return new GitConfig();
+  }
+
+
+
   //~--- fields ---------------------------------------------------------------
 
-  /** Field description */
-  private FileRepositoryBuilder builder = new FileRepositoryBuilder();
 }
diff --git a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
index d16aff2fb8..5e609d977e 100644
--- a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
+++ b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
@@ -41,16 +41,12 @@ import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 
 import sonia.scm.Type;
-import sonia.scm.io.ExtendedCommand;
 
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.File;
 import java.io.IOException;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /**
  *
  * @author Sebastian Sdorra
@@ -109,6 +105,18 @@ public class SvnRepositoryHandler
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected SvnConfig createInitialConfig()
+  {
+    return new SvnConfig();
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index a1b6a4fbde..b3c6a949f5 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -115,8 +115,9 @@ public abstract class AbstractRepositoryHandler<C extends BasicRepositoryConfig>
   {
     String name = getType().getName();
 
+    baseDirectory = context.getBaseDirectory();
     configFile =
-      new File(context.getBaseDirectory(),
+      new File(baseDirectory,
                "config".concat(File.separator).concat(name).concat(".xml"));
     loadConfig();
   }
@@ -260,6 +261,9 @@ public abstract class AbstractRepositoryHandler<C extends BasicRepositoryConfig>
 
   //~--- fields ---------------------------------------------------------------
 
+  /** Field description */
+  protected File baseDirectory;
+
   /** Field description */
   protected C config;
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index 2c8ad966d0..dce645705e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -68,6 +68,9 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
         extends AbstractRepositoryHandler<C>
 {
 
+  /** Field description */
+  public static final String DIRECTORY_REPOSITORY = "repositories";
+
   /** Field description */
   private static final Logger logger =
     LoggerFactory.getLogger(AbstractSimpleRepositoryHandler.class);
@@ -142,6 +145,37 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
     createConfigDirectory(context);
   }
 
+  /**
+   * Method description
+   *
+   */
+  @Override
+  public void loadConfig()
+  {
+    super.loadConfig();
+
+    if (config == null)
+    {
+      config = createInitialConfig();
+
+      if (config != null)
+      {
+        File repositoryDirectory = config.getRepositoryDirectory();
+
+        if (repositoryDirectory == null)
+        {
+          repositoryDirectory = new File(
+              baseDirectory,
+              DIRECTORY_REPOSITORY.concat(File.separator).concat(
+                getType().getName()));
+          config.setRepositoryDirectory(repositoryDirectory);
+        }
+
+        IOUtil.mkdirs(repositoryDirectory);
+      }
+    }
+  }
+
   /**
    * Method description
    *
@@ -301,8 +335,6 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
    */
   protected void createConfigDirectory(SCMContextProvider context)
   {
-    File baseDirectory = context.getBaseDirectory();
-
     configDirectory =
       new File(baseDirectory,
                "config".concat(File.separator).concat(getType().getName()));
@@ -313,6 +345,17 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected C createInitialConfig()
+  {
+    return null;
+  }
+
   /**
    * Method description
    *