Add version number and date to ServerStatus. Conditionally hide status.

James Moger

2011-10-27 8e40cd53b6b1579e383bd5e993cb3c35ce4583c4

 build.xml

@@ -104,6 +104,11 @@
         </fileset>

      </copy>



      <!-- copy gitblit.properties to the WEB-INF folder.

           this file is only used for parsing setting descriptions. -->

      <copy tofile="${basedir}/src/WEB-INF/reference.properties" overwrite="true"

         file="${basedir}/distrib/gitblit.properties" />



      <!-- Compile the build tool and execute it.

          This downloads missing compile-time dependencies from Maven. -->



@@ -162,6 +167,7 @@
      <jar jarfile="${project.deploy.dir}/${project.jar}">

         <fileset dir="${project.build.dir}">

            <include name="**/*" />

            <exclude name="com/gitblit/client/**" />

         </fileset>

         <fileset dir="${project.resources.dir}">

            <exclude name="thumbs.db" />

@@ -252,7 +258,7 @@
            <arg value="index=overview" />



            <arg value="--alias" />

            <arg value="properties=gitblit.properties" />

            <arg value="properties=settings" />



            <arg value="--substitute" />

            <arg value="%VERSION%=${gb.version}" />

@@ -319,6 +325,10 @@
         </fileset>

      </copy>

      

      <!-- Copy gitblit.properties as reference.properties -->

      <copy tofile="${project.war.dir}/WEB-INF/reference.properties" 
         file="${basedir}/distrib/gitblit.properties"/>

		
      <!-- Build the docs for the WAR build -->

      <antcall target="buildDocs" inheritall="true" inheritrefs="true">

         <param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" />

@@ -365,6 +375,7 @@
            <exclude name="WEB-INF/web.xml" />

            <exclude name="com/gitblit/tests/" />

            <exclude name="com/gitblit/build/**" />

            <exclude name="com/gitblit/client/**" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />            

@@ -426,6 +437,9 @@
      <genjar jarfile="manager.jar">

         <resource file="${basedir}/src/com/gitblit/client/splash.png" />

         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/gitweb-favicon.png" />

         <resource file="${basedir}/resources/user_16x16.png" />

         <resource file="${basedir}/resources/settings_16x16.png" />

         <resource file="${basedir}/resources/lock_go_16x16.png" />

         <resource file="${basedir}/resources/lock_pull_16x16.png" />

         <resource file="${basedir}/resources/shield_16x16.png" />

@@ -433,6 +447,7 @@
         <resource file="${basedir}/resources/cold_16x16.png" />

         <resource file="${basedir}/resources/book_16x16.png" />

         <resource file="${basedir}/resources/bug_16x16.png" />

         <resource file="${basedir}/resources/health_16x16.png" />

         <resource file="${basedir}/resources/blank.png" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

            

@@ -564,7 +579,7 @@
         <arg value="index=overview" />



         <arg value="--alias" />

         <arg value="properties=gitblit.properties" />

         <arg value="properties=settings" />



         <arg value="--substitute" />

         <arg value="%VERSION%=${gb.version}" />