From eb7609552b0087187aa8cd1d64459c1c4daa99a8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 09 Apr 2012 16:26:07 -0400
Subject: [PATCH] Automatically set java.awt.headless=true for Gitblit GO
---
src/com/gitblit/GitBlit.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 3bda06f..e166795 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -87,7 +87,6 @@
import com.gitblit.utils.MetricUtils;
import com.gitblit.utils.ObjectCache;
import com.gitblit.utils.StringUtils;
-import com.gitblit.utils.TimeUtils;
/**
* GitBlit is the servlet context listener singleton that acts as the core for
@@ -812,6 +811,8 @@
"gitblit", null, "postReceiveScript")));
model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "mailingList")));
+ model.indexedBranches = new ArrayList<String>(Arrays.asList(config.getStringList(
+ "gitblit", null, "indexBranch")));
}
model.HEAD = JGitUtils.getHEADRef(r);
model.availableRefs = JGitUtils.getAvailableHeadTargets(r);
@@ -871,6 +872,9 @@
repository.close();
}
}
+
+ // close any open index writer/searcher in the Lucene executor
+ luceneExecutor.close(repositoryName);
}
/**
@@ -1046,19 +1050,44 @@
config.setBoolean("gitblit", null, "showReadme", repository.showReadme);
config.setBoolean("gitblit", null, "skipSizeCalculation", repository.skipSizeCalculation);
config.setBoolean("gitblit", null, "skipSummaryMetrics", repository.skipSummaryMetrics);
- config.setStringList("gitblit", null, "federationSets", repository.federationSets);
config.setString("gitblit", null, "federationStrategy",
repository.federationStrategy.name());
config.setBoolean("gitblit", null, "isFederated", repository.isFederated);
- if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {
+
+ // federation sets
+ if (ArrayUtils.isEmpty(repository.federationSets)) {
+ config.unset("gitblit", null, "federationSets");
+ } else {
+ config.setStringList("gitblit", null, "federationSets", repository.federationSets);
+ }
+
+ // pre receive scripts
+ if (ArrayUtils.isEmpty(repository.preReceiveScripts)) {
+ config.unset("gitblit", null, "preReceiveScript");
+ } else {
config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts);
}
- if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {
+
+ // post receive scripts
+ if (ArrayUtils.isEmpty(repository.postReceiveScripts)) {
+ config.unset("gitblit", null, "postReceiveScript");
+ } else {
config.setStringList("gitblit", null, "postReceiveScript",
repository.postReceiveScripts);
}
- if (!ArrayUtils.isEmpty(repository.mailingLists)) {
+
+ // mailing lists
+ if (ArrayUtils.isEmpty(repository.mailingLists)) {
+ config.unset("gitblit", null, "mailingList");
+ } else {
config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
+ }
+
+ // indexed branches
+ if (ArrayUtils.isEmpty(repository.indexedBranches)) {
+ config.unset("gitblit", null, "indexBranch");
+ } else {
+ config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);
}
try {
config.save();
@@ -1653,12 +1682,13 @@
* Search the specified repositories using the Lucene query.
*
* @param query
- * @param maximumHits
+ * @param page
+ * @param pageSize
* @param repositories
* @return
*/
- public List<SearchResult> search(String query, int maximumHits, List<String> repositories) {
- List<SearchResult> srs = luceneExecutor.search(query, maximumHits, repositories);
+ public List<SearchResult> search(String query, int page, int pageSize, List<String> repositories) {
+ List<SearchResult> srs = luceneExecutor.search(query, page, pageSize, repositories);
return srs;
}
@@ -1830,18 +1860,8 @@
logger.warn("Mail server is not properly configured. Mail services disabled.");
}
luceneExecutor = new LuceneExecutor(settings, repositoriesFolder);
- if (luceneExecutor.isReady()) {
- String idle = settings.getString(Keys.lucene.frequency, "2 mins");
- int mins = TimeUtils.convertFrequencyToMinutes(idle);
- if (mins <= 2) {
- mins = 2;
- idle = mins + " mins";
- }
- logger.info("Lucene executor is scheduled to process ref changes every " + idle);
- scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, mins, TimeUnit.MINUTES);
- } else {
- logger.warn("Lucene integration is disabled.");
- }
+ logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");
+ scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES);
if (startFederation) {
configureFederation();
}
--
Gitblit v1.9.1