From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 09:35:44 +0000 (+0200)
Subject: Revert "Minor ajustments for gerrit-gitblit plugin"
X-Git-Tag: v1.3.0~190
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2df02e9abdcd13dc7081ef64fae4badbdd38044f;p=gitblit.git

Revert "Minor ajustments for gerrit-gitblit plugin"

This reverts commit f15f17a8035717d260eb77b766c7b9c748729170.
---

diff --git a/build.xml b/build.xml
index 1fe60385..a0a29fbd 100644
--- a/build.xml
+++ b/build.xml
@@ -6,15 +6,15 @@
 		Retrieve Moxie Toolkit
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<property name="moxie.version" value="0.8.0-SNAPSHOT" />
+	<property name="moxie.version" value="0.7.1" />
 	<property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />
 	<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
 	<property name="moxie.dir" value="${user.home}/.moxie" />
-	<mkdir dir="${moxie.dir}" />
+	
 	<!-- Download Moxie from it's Maven repository to user.home -->
 	<mkdir dir="${moxie.dir}" />
 	<get src="${moxie.url}/org/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"
-		dest="${moxie.dir}/${moxie.jar}" skipexisting="true" verbose="true" />
+		dest="${moxie.dir}" skipexisting="true" verbose="true" />
 	
 	<!-- Register Moxie tasks -->
 	<taskdef uri="antlib:org.moxie">
@@ -991,10 +991,8 @@
 	-->
 	<target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">
 		<local name="project.jar" />
-		<property name="project.jar"
-			  value="${project.outputDirectory}/gitblit.jar" />
-                <property name="resourceFolderPrefix" value=""/>
-		<mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}"/>
+		<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
+		<mx:jar destfile="${project.jar}" includeresources="true" />
 
 		<exec executable="mvn">
 			<arg value="install:install-file" />
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 4e34db4a..2c5bfe51 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3006,7 +3006,7 @@ public class GitBlit implements ServletContextListener {
 	 * 
 	 * @return Map<String, SettingModel>
 	 */
-	private ServerSettings loadSettingModels(InputStream referencePropertiesInputStream) {
+	private ServerSettings loadSettingModels() {
 		ServerSettings settingsModel = new ServerSettings();
 		settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();
 		settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();
@@ -3016,7 +3016,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();
@@ -3266,11 +3266,7 @@ public class GitBlit implements ServletContextListener {
 	 * @see ServletContextListener.contextInitialize(ServletContextEvent)
 	 */
 	@Override
-        public void contextInitialized(ServletContextEvent contextEvent) {
-	    contextInitialized(contextEvent, getClass().getResourceAsStream("/reference.properties"));
-	}
-
-	public void contextInitialized(ServletContextEvent contextEvent, InputStream referencePropertiesInputStream) {
+	public void contextInitialized(ServletContextEvent contextEvent) {
 		servletContext = contextEvent.getServletContext();
 		if (settings == null) {
 			// Gitblit is running in a servlet container
@@ -3335,7 +3331,7 @@ public class GitBlit implements ServletContextListener {
 			}
 		}
 		
-		settingsModel = loadSettingModels(referencePropertiesInputStream);
+		settingsModel = loadSettingModels();
 		serverStatus.servletContainer = servletContext.getServerInfo();
 	}