Extract WAR data resources if they do not exist in ${baseFolder}

James Moger

2014-11-24 0001f203daf794fd6a6d3bc49f6e474aa1459f74

Extract WAR data resources if they do not exist in ${baseFolder}

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

@@ -364,12 +364,10 @@
        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