Merged #185 "Fix GITBLIT_HOME environment variable baseFolder support"

James Moger

2014-09-24 a8cac83f310be77c1acb6ef39fc0245787a79834

 src/main/java/com/gitblit/servlet/GitblitContext.java

@@ -317,9 +317,9 @@
         logger.error("");
      }

      String baseFromJndi = lookupBaseFolderFromJndi();
      if (!StringUtils.isEmpty(baseFromJndi)) {
         path = baseFromJndi;
      String externalBase = System.getProperty("GITBLIT_HOME", lookupBaseFolderFromJndi());
      if (!StringUtils.isEmpty(externalBase)) {
         path = externalBase;
      }

      File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path);