Fixed extracting Groovy scripts on Express installs (issue 220)

diff --git a/releases.moxie b/releases.moxie
index 05ca4d52b355b78691233644b16a098891d39f17..535c7ecf708bd0855e3df7fcfb8ce5ae725802dc 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@ r17: {
         - Fix internal error on folder history links (issue 192)\r
         - Fixed incorrect icon file name for .doc files (issue 200)\r
         - Do not queue emails with no recipients (issue 201)\r
+        - Fixed extracting Groovy scripts on Express installs (issue 220)\r
         - Use standard ServletRequestWrapper instead of custom wrapper (issue 224)\r
 \r
     additions: \r

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index b8daa06ce6359708b821dd2b23b9f75955e79ef6..7c6a535067716063a24932af78aeaf7a0cc7cab0 100644 (file)
--- 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)) {\r
                                // Gitblit is running in OpenShift/JBoss\r
                                File base = new File(openShift);\r
+                               logger.info("EXPRESS contextFolder is " + contextFolder.getAbsolutePath());\r
 \r
                                // gitblit.properties setting overrides\r
                                File overrideFile = new File(base, "gitblit.properties");\r
                                webxmlSettings.applyOverrides(overrideFile);\r
                                \r
                                // Copy the included scripts to the configured groovy folder\r
-                               File localScripts = new File(base, webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy"));\r
+                               String path = webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy");\r
+                               File localScripts = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, base, path);\r
                                if (!localScripts.exists()) {\r
                                        File warScripts = new File(contextFolder, "/WEB-INF/data/groovy");\r
                                        if (!warScripts.equals(localScripts)) {\r