Minor ajustments for gerrit-gitblit plugin

diff --git a/build.xml b/build.xml
index 9ae494d5290fdd4d759603c740d51d6f5cb105e7..798a630fa1f4ed7d5832b78cf50400eb87a1279b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -6,14 +6,14 @@
                Retrieve Moxie Toolkit\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <property name="moxie.version" value="0.7.1" />\r
+       <property name="moxie.version" value="0.8.0-SNAPSHOT" />\r
        <property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />\r
        <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />\r
        <property name="moxie.dir" value="${user.home}/.moxie" />\r
-       \r
+       <mkdir dir="${moxie.dir}" />\r
        <!-- Download Moxie from it's Maven repository to user.home -->\r
        <get src="${moxie.url}/org/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"\r
-               dest="${moxie.dir}" skipexisting="true" verbose="true" />\r
+               dest="${moxie.dir}/${moxie.jar}" skipexisting="true" verbose="true" />\r
        \r
        <!-- Register Moxie tasks -->\r
        <taskdef uri="antlib:org.moxie">\r
@@ -990,8 +990,10 @@
        -->\r
        <target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">\r
                <local name="project.jar" />\r
-               <property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />\r
-               <mx:jar destfile="${project.jar}" includeresources="true" />\r
+               <property name="project.jar"\r
+                         value="${project.outputDirectory}/gitblit.jar" />\r
+                <property name="resourceFolderPrefix" value=""/>\r
+               <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}"/>\r
 \r
                <exec executable="mvn">\r
                        <arg value="install:install-file" />\r

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 2c5bfe518d03f863b8cf51e7e23e7269a4652dfe..4e34db4adafe4b4b32e440722e2f16102c7e23e4 100644 (file)
--- 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 {
         * \r
         * @return Map<String, SettingModel>\r
         */\r
-       private ServerSettings loadSettingModels() {\r
+       private ServerSettings loadSettingModels(InputStream referencePropertiesInputStream) {\r
                ServerSettings settingsModel = new ServerSettings();\r
                settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();\r
                settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();\r
@@ -3016,7 +3016,7 @@ public class GitBlit implements ServletContextListener {
                        // Read bundled Gitblit properties to extract setting descriptions.\r
                        // This copy is pristine and only used for populating the setting\r
                        // models map.\r
-                       InputStream is = getClass().getResourceAsStream("/reference.properties");\r
+                       InputStream is = referencePropertiesInputStream;\r
                        BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));\r
                        StringBuilder description = new StringBuilder();\r
                        SettingModel setting = new SettingModel();\r
@@ -3266,7 +3266,11 @@ public class GitBlit implements ServletContextListener {
         * @see ServletContextListener.contextInitialize(ServletContextEvent)\r
         */\r
        @Override\r
-       public void contextInitialized(ServletContextEvent contextEvent) {\r
+        public void contextInitialized(ServletContextEvent contextEvent) {\r
+           contextInitialized(contextEvent, getClass().getResourceAsStream("/reference.properties"));\r
+       }\r
+\r
+       public void contextInitialized(ServletContextEvent contextEvent, InputStream referencePropertiesInputStream) {\r
                servletContext = contextEvent.getServletContext();\r
                if (settings == null) {\r
                        // Gitblit is running in a servlet container\r
@@ -3331,7 +3335,7 @@ public class GitBlit implements ServletContextListener {
                        }\r
                }\r
                \r
-               settingsModel = loadSettingModels();\r
+               settingsModel = loadSettingModels(referencePropertiesInputStream);\r
                serverStatus.servletContainer = servletContext.getServerInfo();\r
        }\r
 \r