From 2beb334fcbbfc0c218484babbbbe652b526303b5 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 3 Jan 2011 15:29:47 +0100 Subject: [PATCH] fix bug in initial configuration --- .../java/sonia/scm/repository/BzrConfig.java | 4 +-- .../scm/repository/BzrRepositoryHandler.java | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrConfig.java b/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrConfig.java index deffb169e3..cd3f763bb2 100644 --- a/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrConfig.java +++ b/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrConfig.java @@ -124,10 +124,10 @@ public class BzrConfig extends SimpleRepositoryConfig //~--- fields --------------------------------------------------------------- /** Field description */ - private String bzrBinary; + private String bzrBinary = "bzr"; /** Field description */ - private String pythonBinary; + private String pythonBinary = "python"; /** Field description */ private String pythonPath = ""; diff --git a/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrRepositoryHandler.java b/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrRepositoryHandler.java index 4a454d0ec0..8dc7ec4829 100644 --- a/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrRepositoryHandler.java +++ b/plugins/scm-bzr-plugin/src/main/java/sonia/scm/repository/BzrRepositoryHandler.java @@ -38,14 +38,19 @@ package sonia.scm.repository; import com.google.inject.Inject; import com.google.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import sonia.scm.Type; import sonia.scm.io.ExtendedCommand; import sonia.scm.plugin.ext.Extension; import sonia.scm.store.StoreFactory; +import sonia.scm.web.BzrScriptWriter; //~--- JDK imports ------------------------------------------------------------ import java.io.File; +import java.io.IOException; /** * @@ -66,6 +71,10 @@ public class BzrRepositoryHandler /** Field description */ public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME); + /** the logger for BzrRepositoryHandler */ + private static final Logger logger = + LoggerFactory.getLogger(BzrRepositoryHandler.class); + //~--- constructors --------------------------------------------------------- /** @@ -80,6 +89,32 @@ public class BzrRepositoryHandler super(storeFactory); } + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + */ + @Override + public void loadConfig() + { + super.loadConfig(); + + if (config == null) + { + config = new BzrConfig(); + } + + try + { + new BzrScriptWriter(config).write(); + } + catch (IOException ex) + { + logger.error(ex.getMessage(), ex); + } + } + //~--- get methods ---------------------------------------------------------- /**