the display-name in web.xml now shows the actual version of Gitblit

Thomas Pummer

2013-02-22 dfc4ece4083bbbb98f55291d05e7d2b1513464b7

 build.xml

@@ -208,6 +208,9 @@
      <copy todir="${project.build.dir}">

         <fileset dir="${basedir}/src" excludes="**/*.java,**/thumbs.db" />

      </copy>

		
      <!-- Set Version into web.xml -->

      <replace file="${project.build.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

   </target>



   

@@ -251,6 +254,8 @@
            <include name="sendmail-html.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="fogbugz.groovy" />

            <include name="thebuggenie.groovy" />

         </fileset>

      </copy>

      

@@ -275,6 +280,9 @@
            <include name="authority.conf" />

         </fileset>

      </copy>

		
      <!-- Set Version into web.xml -->

      <replace file="${project.build.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

                  

      <!-- Build jar -->

      <jar jarfile="${project.deploy.dir}/${project.jar}">

@@ -452,6 +460,9 @@
         </fileset>

      </copy>

      

      <!-- Set Version into web.xml -->

      <replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

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

      <copy tofile="${project.war.dir}/WEB-INF/reference.properties" 

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

@@ -479,6 +490,8 @@
            <include name="sendmail-html.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="fogbugz.groovy" />

            <include name="thebuggenie.groovy" />

         </fileset>

      </copy>



@@ -493,6 +506,9 @@
         <arg value="${project.war.dir}/WEB-INF/web.xml" />

         

      </java>

		
      <!-- Set Version into web.xml -->

      <replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>



      <!-- Gitblit resources -->

      <copy todir="${project.war.dir}">

@@ -706,6 +722,8 @@
            <include name="sendmail-html.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="fogbugz.groovy" />

            <include name="thebuggenie.groovy" />

         </fileset>

      </copy>

               

@@ -723,6 +741,9 @@
         <arg value="--propertiesFile" />

         <arg value="${basedir}/distrib/gitblit.properties" />

      </java>

		
      <!-- Set Version into web.xml -->

      <replace file="${deployments.root}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>



      <!-- Gitblit resources -->

      <copy todir="${deployments.root}">

@@ -926,6 +947,9 @@
      <genjar jarfile="${project.target.dir}/gbapi-${gb.version}.jar">

         <class name="com.gitblit.Keys" />

         <class name="com.gitblit.client.GitblitClient" />

         <class name="com.gitblit.models.FederationModel" />

         <class name="com.gitblit.models.FederationProposal" />

         <class name="com.gitblit.models.FederationSet" />			
         <classpath refid="master-classpath" />

         <classfilter>

            <exclude name="com.google.gson." />

@@ -1168,7 +1192,7 @@
      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildGhPages">

         <classpath refid="master-classpath" />

         <arg value="--sourceFolder" />

         <arg value="${basedir}/site" />

         <arg value="${basedir}/target/site" />



         <arg value="--repository" />

         <arg value="${basedir}" />

@@ -1192,7 +1216,7 @@
          username="${googlecode.user}" 

          password="${googlecode.password}" 

          projectname="gitblit" 

          filename="${distribution.zipfile}" 
          filename="${project.target.dir}/${distribution.zipfile}" 
          targetfilename="gitblit-${gb.version}.zip"

          summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"

          labels="Featured, Type-Package, OpSys-All" />

@@ -1202,7 +1226,7 @@
           username="${googlecode.user}" 

           password="${googlecode.password}" 

           projectname="gitblit" 

           filename="${distribution.warfile}" 
           filename="${project.target.dir}/${distribution.warfile}" 
           targetfilename="gitblit-${gb.version}.war"

           summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)"

           labels="Featured, Type-Package, OpSys-All" />

@@ -1212,7 +1236,7 @@
         username="${googlecode.user}" 

         password="${googlecode.password}" 

         projectname="gitblit" 

         filename="${fedclient.zipfile}" 
         filename="${project.target.dir}/${fedclient.zipfile}" 
         targetfilename="fedclient-${gb.version}.zip"

         summary="Gitblit Federation Client v${gb.version} (command-line tool to clone data from federated Gitblit instances)"

         labels="Featured, Type-Package, OpSys-All" />

@@ -1222,7 +1246,7 @@
         username="${googlecode.user}" 

         password="${googlecode.password}" 

         projectname="gitblit" 

         filename="${manager.zipfile}" 
         filename="${project.target.dir}/${manager.zipfile}" 
         targetfilename="manager-${gb.version}.zip"

         summary="Gitblit Manager v${gb.version} (Swing tool to remotely administer a Gitblit server)"

         labels="Featured, Type-Package, OpSys-All" />

@@ -1232,7 +1256,7 @@
         username="${googlecode.user}" 

         password="${googlecode.password}" 

         projectname="gitblit" 

         filename="${gbapi.zipfile}" 
         filename="${project.target.dir}/${gbapi.zipfile}" 
         targetfilename="gbapi-${gb.version}.zip"

         summary="Gitblit API Library v${gb.version} (JSON RPC library to integrate with your software)"

         labels="Featured, Type-Package, OpSys-All" />

@@ -1242,7 +1266,7 @@
         username="${googlecode.user}" 

         password="${googlecode.password}" 

         projectname="gitblit" 

         filename="${express.zipfile}" 
         filename="${project.target.dir}/${express.zipfile}" 
         targetfilename="express-${gb.version}.zip"

         summary="Gitblit Express v${gb.version} (run Gitblit on RedHat's OpenShift cloud)"

         labels="Featured, Type-Package, OpSys-All" />