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

diff --git a/build.xml b/build.xml
index 869c370b21bbbad413323ca17d4b8b8bb5865f23..ed91f29675f86e48d1d29be28a994ddc459dd25f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -208,6 +208,9 @@
                <copy todir="${project.build.dir}">\r
                        <fileset dir="${basedir}/src" excludes="**/*.java,**/thumbs.db" />\r
                </copy>\r
+               \r
+               <!-- Set Version into web.xml -->\r
+               <replace file="${project.build.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>\r
        </target>\r
 \r
        \r
@@ -277,6 +280,9 @@
                                <include name="authority.conf" />\r
                        </fileset>\r
                </copy>\r
+               \r
+               <!-- Set Version into web.xml -->\r
+               <replace file="${project.build.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>\r
                                                \r
                <!-- Build jar -->\r
                <jar jarfile="${project.deploy.dir}/${project.jar}">\r
@@ -454,6 +460,9 @@
                        </fileset>\r
                </copy>\r
                \r
+               <!-- Set Version into web.xml -->\r
+               <replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>\r
+               \r
                <!-- Copy gitblit.properties as reference.properties -->\r
                <copy tofile="${project.war.dir}/WEB-INF/reference.properties" \r
                        file="${basedir}/distrib/gitblit.properties"/>\r
@@ -497,6 +506,9 @@
                        <arg value="${project.war.dir}/WEB-INF/web.xml" />\r
                        \r
                </java>\r
+               \r
+               <!-- Set Version into web.xml -->\r
+               <replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>\r
 \r
                <!-- Gitblit resources -->\r
                <copy todir="${project.war.dir}">\r
@@ -729,6 +741,9 @@
                        <arg value="--propertiesFile" />\r
                        <arg value="${basedir}/distrib/gitblit.properties" />\r
                </java>\r
+               \r
+               <!-- Set Version into web.xml -->\r
+               <replace file="${deployments.root}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>\r
 \r
                <!-- Gitblit resources -->\r
                <copy todir="${deployments.root}">\r

diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
index 75ccf9bdd1ccc40722dadbf09f3c46fa041d88db..bdc882a66e7f66cbcffab47800ff20883a1ce32f 100644 (file)
--- a/src/WEB-INF/web.xml
+++ b/src/WEB-INF/web.xml
@@ -26,6 +26,11 @@
                <param-name>baseFolder</param-name>\r
                <param-value>${contextFolder}/WEB-INF/data</param-value>\r
        </context-param>\r
+       \r
+       <!-- Gitblit Displayname -->\r
+       <display-name>\r
+               Gitblit - @gb.version@\r
+       </display-name>\r
 \r
        <!-- PARAMS --> \r
         \r