Switch web.xml baseFolder from context-param to env-entry

Change-Id: Id18077126e984a767725cf9e8d8eb531a14e1713

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 5eec7a93..7f82432d 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -62,6 +62,9 @@ import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMultipart;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -3776,6 +3779,18 @@ public class GitBlit implements ServletContextListener {
 					logger.error("");
 				}
 
+				try {
+					// try to lookup JNDI env-entry for the baseFolder
+					InitialContext ic = new InitialContext();
+					Context env = (Context) ic.lookup("java:comp/env");
+					String val = (String) env.lookup("baseFolder");
+					if (!StringUtils.isEmpty(val)) {
+						path = val;
+					}
+				} catch (NamingException n) {
+					logger.error("Failed to get JNDI env-entry: " + n.getExplanation());
+				}
+
 				File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path);
 				base.mkdirs();