New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor ajustments for gerrit-gitblit plugin #78

Closed
wants to merge 10 commits into
base: master
from

Conversation

Projects
None yet
3 participants
@davido
Contributor

davido commented Apr 6, 2013

No description provided.

@gitblit

View changes

Show outdated Hide outdated src/main/java/com/gitblit/GitBlit.java
@@ -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");

This comment has been minimized.

@gitblit

gitblit Apr 8, 2013

Owner

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.

@gitblit

gitblit Apr 8, 2013

Owner

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.

This comment has been minimized.

@davido

davido Apr 13, 2013

Contributor

I guess yes, i am going to revisit it.

@davido

davido Apr 13, 2013

Contributor

I guess yes, i am going to revisit it.

@gitblit

View changes

Show outdated Hide outdated build.xml
@@ -6,14 +6,14 @@
Retrieve Moxie Toolkit
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<property name="moxie.version" value="0.7.1" />
<property name="moxie.version" value="0.8.0-SNAPSHOT" />

This comment has been minimized.

@gitblit

gitblit Apr 8, 2013

Owner

I have to release 0.8.0 before we can amend the build script in Gitblit master. :)
Thanks for the patches to Moxie, BTW. Hopefully it wasn't _too_confusing - alien perhaps.

@gitblit

gitblit Apr 8, 2013

Owner

I have to release 0.8.0 before we can amend the build script in Gitblit master. :)
Thanks for the patches to Moxie, BTW. Hopefully it wasn't _too_confusing - alien perhaps.

This comment has been minimized.

@davido

davido Apr 13, 2013

Contributor

i've found Moxie very impressive and intuitive ;-)
Another challenge we have for Gerrit is JGit API change. Any chance to switch to the new JGit version in near future?

https://gerrit-review.googlesource.com/#/c/44263/
https://gerrit-review.googlesource.com/#/c/43846/

@davido

davido Apr 13, 2013

Contributor

i've found Moxie very impressive and intuitive ;-)
Another challenge we have for Gerrit is JGit API change. Any chance to switch to the new JGit version in near future?

https://gerrit-review.googlesource.com/#/c/44263/
https://gerrit-review.googlesource.com/#/c/43846/

This comment has been minimized.

@gitblit

gitblit Apr 13, 2013

Owner

2.3.1 is the current stable release. I've taken a look at 3.0.0-SNAPSHOT and seen some of the API changes and commented to Matthias, Shawn, and the JGit team about a few. I don't mind switching master to 3.0.0-SNAPSHOT sooner than later, but I don't intend to release the next Gitblit with a SNAPSHOT dependency.

@gitblit

gitblit Apr 13, 2013

Owner

2.3.1 is the current stable release. I've taken a look at 3.0.0-SNAPSHOT and seen some of the API changes and commented to Matthias, Shawn, and the JGit team about a few. I don't mind switching master to 3.0.0-SNAPSHOT sooner than later, but I don't intend to release the next Gitblit with a SNAPSHOT dependency.

gitblit added a commit that referenced this pull request Apr 13, 2013

@gitblit

View changes

Show outdated Hide outdated build.xml
<property name="project.jar"
value="${project.outputDirectory}/gitblit.jar" />
<property name="resourceFolderPrefix" value=""/>
<mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}"/>

This comment has been minimized.

@gitblit

gitblit Apr 13, 2013

Owner

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.

@gitblit

gitblit Apr 13, 2013

Owner

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.

@davido davido closed this Apr 14, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment