James Moger
2013-03-28 0ac5316db70942ceceea68e360c70d00d98ccbea
Fixed extracting Groovy scripts on Express installs (issue-220)
2 files modified
5 ■■■■ changed files
releases.moxie 1 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/GitBlit.java 4 ●●● patch | view | raw | blame | history
releases.moxie
@@ -11,6 +11,7 @@
     - 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: 
src/main/java/com/gitblit/GitBlit.java
@@ -3236,13 +3236,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)) {