Minor ajustments for gerrit-gitblit plugin #78
Conversation
| @@ -3016,7 +3016,7 @@ private ServerSettings loadSettingModels() { | |||
| // Read bundled Gitblit properties to extract setting descriptions. | |||
| // This copy is pristine and only used for populating the setting | |||
| // models map. | |||
| InputStream is = getClass().getResourceAsStream("/reference.properties"); | |||
There was a problem hiding this comment.
The reason for this is the "static" prefix, right? If so, I would prefer to stub out a protected method for getResourcePath(String file) or something like that which returned "/" + file for Gitblit GO/WAR/Express and in your Gitblit subclass it returned "/static/" + file. I'm not a fan of the inputstream parameter passing approach.
There was a problem hiding this comment.
I guess yes, i am going to revisit it.
| <property name="project.jar" | ||
| value="${project.outputDirectory}/gitblit.jar" /> | ||
| <property name="resourceFolderPrefix" value=""/> | ||
| <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}"/> |
There was a problem hiding this comment.
I just integrated this specific change. I think the only thing I skipped is the InputStream parameter, which I think needs to be revisited. I have changed the location of "reference.properties" from WEB-INF to a classpath resource (like Wicket html templates) - not a web resource like css files, etc. You may not have need to reintroduce the inputstream parameter. Reference.properties is only used to determine default settings (and SINCE, RESTART REQUIRED, etc) for the Gitblit Manager to display - or I suppose anything else that may take advantage of RPC setting controls.
This reverts commit f15f17a.
No description provided.