diff options
| author | James Moger <james.moger@gitblit.com> | 2014-11-24 09:15:57 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-11-24 09:15:57 -0500 |
| commit | 0001f203daf794fd6a6d3bc49f6e474aa1459f74 (patch) | |
| tree | a59ce2a455504e6f573f07bf3a4ae3ca7d305b69 | |
| parent | e2c0c97867829f7db5a95f5e055bb6251cad6a65 (diff) | |
| download | gitblit-0001f203daf794fd6a6d3bc49f6e474aa1459f74.tar.gz gitblit-0001f203daf794fd6a6d3bc49f6e474aa1459f74.zip | |
Extract WAR data resources if they do not exist in ${baseFolder}
| -rw-r--r-- | src/main/java/com/gitblit/servlet/GitblitContext.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java index 04a7d92e..fa0534db 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -364,12 +364,10 @@ public class GitblitContext extends GuiceServletContextListener { baseFolder.mkdirs(); // try to extract the data folder resource to the baseFolder - File localSettings = new File(baseFolder, "gitblit.properties"); - if (!localSettings.exists()) { - extractResources(context, "/WEB-INF/data/", baseFolder); - } + extractResources(context, "/WEB-INF/data/", baseFolder); // delegate all config to baseFolder/gitblit.properties file + File localSettings = new File(baseFolder, "gitblit.properties"); FileSettings fileSettings = new FileSettings(localSettings.getAbsolutePath()); // merge the stored settings into the runtime settings |