From c5d052400cd60e5b58ba7b5e1fd7706ee0676ab7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Mar 2013 11:16:45 -0400
Subject: [PATCH] Updated documentation
---
src/main/java/com/gitblit/GitBlit.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 2361a6e..65dc559 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -1656,6 +1656,11 @@
} else {
model.name = com.gitblit.utils.FileUtils.getRelativePath(basePath, r.getDirectory().getParentFile());
}
+ if (StringUtils.isEmpty(model.name)) {
+ // Repository is NOT located relative to the base folder because it
+ // is symlinked. Use the provided repository name.
+ model.name = repositoryName;
+ }
model.hasCommits = JGitUtils.hasCommits(r);
model.lastChange = JGitUtils.getLastChange(r);
model.projectPath = StringUtils.getFirstPathElement(repositoryName);
@@ -2903,6 +2908,10 @@
* @param toAddresses
*/
public void sendMail(String subject, String message, String... toAddresses) {
+ if (toAddresses == null || toAddresses.length == 0) {
+ logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ return;
+ }
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
@@ -2934,6 +2943,10 @@
* @param toAddresses
*/
public void sendHtmlMail(String subject, String message, String... toAddresses) {
+ if (toAddresses == null || toAddresses.length == 0) {
+ logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ return;
+ }
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
@@ -3228,13 +3241,15 @@
if (!StringUtils.isEmpty(openShift)) {
// Gitblit is running in OpenShift/JBoss
File base = new File(openShift);
+ logger.info("EXPRESS contextFolder is " + contextFolder.getAbsolutePath());
// gitblit.properties setting overrides
File overrideFile = new File(base, "gitblit.properties");
webxmlSettings.applyOverrides(overrideFile);
// Copy the included scripts to the configured groovy folder
- File localScripts = new File(base, webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy"));
+ String path = webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy");
+ File localScripts = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, base, path);
if (!localScripts.exists()) {
File warScripts = new File(contextFolder, "/WEB-INF/data/groovy");
if (!warScripts.equals(localScripts)) {
--
Gitblit v1.9.1