From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/WEB-INF/web.xml | 5 +++++
build.xml | 15 +++++++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml
index 869c370..ed91f29 100644
--- a/build.xml
+++ b/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>
@@ -277,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}">
@@ -454,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"/>
@@ -497,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}">
@@ -729,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}">
diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
index 75ccf9b..bdc882a 100644
--- a/src/WEB-INF/web.xml
+++ b/src/WEB-INF/web.xml
@@ -26,6 +26,11 @@
<param-name>baseFolder</param-name>
<param-value>${contextFolder}/WEB-INF/data</param-value>
</context-param>
+
+ <!-- Gitblit Displayname -->
+ <display-name>
+ Gitblit - @gb.version@
+ </display-name>
<!-- PARAMS -->
--
Gitblit v1.9.1