Simplify resource loading

15 files changed, 3 insertions, 8 deletions

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 1a817ab7..566a917e 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -2997,11 +2997,10 @@ public class GitBlit implements ServletContextListener {
 	 * Parse the properties file and aggregate all the comments by the setting

 	 * key. A setting model tracks the current value, the default value, the

 	 * description of the setting and and directives about the setting.

-	 * @param referencePropertiesInputStream

 	 * 

 	 * @return Map<String, SettingModel>

 	 */

-	private ServerSettings loadSettingModels(InputStream referencePropertiesInputStream) {

+	private ServerSettings loadSettingModels() {

 		ServerSettings settingsModel = new ServerSettings();

 		settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();

 		settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();

@@ -3011,7 +3010,7 @@ public class GitBlit implements ServletContextListener {
 			// Read bundled Gitblit properties to extract setting descriptions.

 			// This copy is pristine and only used for populating the setting

 			// models map.

-			InputStream is = referencePropertiesInputStream;

+			InputStream is = getClass().getResourceAsStream("/reference.properties");

 			BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));

 			StringBuilder description = new StringBuilder();

 			SettingModel setting = new SettingModel();

@@ -3239,10 +3238,6 @@ public class GitBlit implements ServletContextListener {
 	 */

 	@Override

 	public void contextInitialized(ServletContextEvent contextEvent) {

-		contextInitialized(contextEvent, contextEvent.getServletContext().getResourceAsStream("/WEB-INF/reference.properties"));

-	}

-

-	public void contextInitialized(ServletContextEvent contextEvent, InputStream referencePropertiesInputStream) {

 		servletContext = contextEvent.getServletContext();

 		if (settings == null) {

 			// Gitblit is running in a servlet container

@@ -3307,7 +3302,7 @@ public class GitBlit implements ServletContextListener {
 			}

 		}

 		

-		settingsModel = loadSettingModels(referencePropertiesInputStream);

+		settingsModel = loadSettingModels();

 		serverStatus.servletContainer = servletContext.getServerInfo();

 	}

 

diff --git a/src/main/resources/login.mkd b/src/main/java/login.mkd
index 51a4cf71..51a4cf71 100644
--- a/src/main/resources/login.mkd
+++ b/src/main/java/login.mkd
diff --git a/src/main/resources/login_es.mkd b/src/main/java/login_es.mkd
index 700d63f4..700d63f4 100644
--- a/src/main/resources/login_es.mkd
+++ b/src/main/java/login_es.mkd
diff --git a/src/main/resources/login_ko.mkd b/src/main/java/login_ko.mkd
index a48099c1..a48099c1 100644
--- a/src/main/resources/login_ko.mkd
+++ b/src/main/java/login_ko.mkd
diff --git a/src/main/resources/login_nl.mkd b/src/main/java/login_nl.mkd
index 38224c96..38224c96 100644
--- a/src/main/resources/login_nl.mkd
+++ b/src/main/java/login_nl.mkd
diff --git a/src/main/resources/login_pl.mkd b/src/main/java/login_pl.mkd
index cc7978b4..cc7978b4 100644
--- a/src/main/resources/login_pl.mkd
+++ b/src/main/java/login_pl.mkd
diff --git a/src/main/resources/login_pt_br.mkd b/src/main/java/login_pt_br.mkd
index 6a4a8570..6a4a8570 100644
--- a/src/main/resources/login_pt_br.mkd
+++ b/src/main/java/login_pt_br.mkd
diff --git a/src/main/resources/login_zh_CN.mkd b/src/main/java/login_zh_CN.mkd
index 09046231..09046231 100644
--- a/src/main/resources/login_zh_CN.mkd
+++ b/src/main/java/login_zh_CN.mkd
diff --git a/src/main/resources/welcome.mkd b/src/main/java/welcome.mkd
index 130cd8ac..130cd8ac 100644
--- a/src/main/resources/welcome.mkd
+++ b/src/main/java/welcome.mkd
diff --git a/src/main/resources/welcome_es.mkd b/src/main/java/welcome_es.mkd
index 52f290e3..52f290e3 100644
--- a/src/main/resources/welcome_es.mkd
+++ b/src/main/java/welcome_es.mkd
diff --git a/src/main/resources/welcome_ko.mkd b/src/main/java/welcome_ko.mkd
index 27cd65da..27cd65da 100644
--- a/src/main/resources/welcome_ko.mkd
+++ b/src/main/java/welcome_ko.mkd
diff --git a/src/main/resources/welcome_nl.mkd b/src/main/java/welcome_nl.mkd
index 406ca1e0..406ca1e0 100644
--- a/src/main/resources/welcome_nl.mkd
+++ b/src/main/java/welcome_nl.mkd
diff --git a/src/main/resources/welcome_pl.mkd b/src/main/java/welcome_pl.mkd
index bc60770a..bc60770a 100644
--- a/src/main/resources/welcome_pl.mkd
+++ b/src/main/java/welcome_pl.mkd
diff --git a/src/main/resources/welcome_pt_br.mkd b/src/main/java/welcome_pt_br.mkd
index 6b30bbcd..6b30bbcd 100644
--- a/src/main/resources/welcome_pt_br.mkd
+++ b/src/main/java/welcome_pt_br.mkd
diff --git a/src/main/resources/welcome_zh_CN.mkd b/src/main/java/welcome_zh_CN.mkd
index f4a651ef..f4a651ef 100644
--- a/src/main/resources/welcome_zh_CN.mkd
+++ b/src/main/java/welcome_zh_CN.mkd