From 4a5a55229bf066bf933dde6cb6f51a4378d67fb7 Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Fri, 04 May 2012 09:50:22 -0400
Subject: [PATCH] Change techique for custom properties to fall in line with reading / writing of all other properties
---
src/com/gitblit/models/RepositoryModel.java | 45 ++-------------------------------------------
1 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index fd35f36..539aa51 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -19,17 +19,11 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.lib.StoredConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Map;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationStrategy;
-import com.gitblit.GitBlit;
import com.gitblit.utils.ArrayUtils;
-import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -42,11 +36,6 @@
public class RepositoryModel implements Serializable, Comparable<RepositoryModel> {
private static final long serialVersionUID = 1L;
-
- public static String CUSTOM_DEFINED_PROP_SECTION = "gitblit";
- public static String CUSTOM_DEFINED_PROP_SUBSECTION = "customDefinedProperties";
-
- private final Logger logger = LoggerFactory.getLogger(RepositoryModel.class);
// field names are reflectively mapped in EditRepository page
public String name;
@@ -75,6 +64,7 @@
public List<String> preReceiveScripts;
public List<String> postReceiveScripts;
public List<String> mailingLists;
+ public Map<String, String> userDefinedProperties;
private String displayName;
public RepositoryModel() {
@@ -102,37 +92,6 @@
}
}
return localBranches;
- }
-
- public String getCustomProperty(String propertyKey) {
- try {
- Repository r = GitBlit.self().getRepository(name);
- StoredConfig config = JGitUtils.readConfig(r);
-
- return config.getString(CUSTOM_DEFINED_PROP_SECTION, CUSTOM_DEFINED_PROP_SUBSECTION, propertyKey);
- } catch (Exception e) {
- logger.error("Error getting Custom Property", e);
-
- return null;
- }
- }
-
- public String setCustomProperty(String propertyKey, String propertyValue) {
- try {
- Repository r = GitBlit.self().getRepository(name);
- StoredConfig config = JGitUtils.readConfig(r);
-
- String oldValue = config.getString(CUSTOM_DEFINED_PROP_SECTION, CUSTOM_DEFINED_PROP_SUBSECTION, propertyKey);
-
- config.setString(CUSTOM_DEFINED_PROP_SECTION, CUSTOM_DEFINED_PROP_SUBSECTION, propertyKey, propertyValue);
- config.save();
-
- return oldValue;
- } catch (Exception e) {
- logger.error("Error getting Custom Property", e);
-
- return null;
- }
}
@Override
--
Gitblit v1.9.1