From 9985ed23ae251c1d024a223f9ea8372b75a122f2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 May 2013 19:03:40 -0400
Subject: [PATCH] Restore web.xml version stamping
---
build.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 3355529..485e981 100644
--- a/build.xml
+++ b/build.xml
@@ -267,7 +267,9 @@
<prepareDataDirectory toDir="${webinf}/data" />
<!-- Build the WAR web.xml from the prototype web.xml -->
- <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" />
+ <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml">
+ <replace token="@gb.version@" value="${project.version}" />
+ </mx:webxml>
<!-- Gitblit jar -->
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -377,8 +379,10 @@
<!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->
<!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->
<mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml"
- propertiesFile="${project.distrib.dir}/data/gitblit.properties"
- skip="server.*" />
+ propertiesFile="${project.distrib.dir}/data/gitblit.properties"
+ skip="server.*">
+ <replace token="@gb.version@" value="${project.version}" />
+ </mx:webxml>
<!-- Gitblit classes -->
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
--
Gitblit v1.9.1