From 0ac5316db70942ceceea68e360c70d00d98ccbea Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 28 Mar 2013 17:31:09 -0400 Subject: [PATCH] Fixed extracting Groovy scripts on Express installs (issue 220) --- releases.moxie | 1 + src/main/java/com/gitblit/GitBlit.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/releases.moxie b/releases.moxie index 05ca4d52..535c7ecf 100644 --- a/releases.moxie +++ b/releases.moxie @@ -11,6 +11,7 @@ r17: { - Fix internal error on folder history links (issue 192) - Fixed incorrect icon file name for .doc files (issue 200) - Do not queue emails with no recipients (issue 201) + - Fixed extracting Groovy scripts on Express installs (issue 220) - Use standard ServletRequestWrapper instead of custom wrapper (issue 224) additions: diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index b8daa06c..7c6a5350 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java @@ -3236,13 +3236,15 @@ public class GitBlit implements ServletContextListener { 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)) { -- 2.39.5