From: James Moger <james.moger@gitblit.com>
Date: Mon, 9 Jun 2014 16:36:09 +0000 (-0400)
Subject: Switch to basic ant copy filter for web.xml
X-Git-Tag: v1.6.0~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dcd6541d4e7a159e7478962121fbfd0782568af0;p=gitblit.git

Switch to basic ant copy filter for web.xml
---

diff --git a/build.xml b/build.xml
index be6f1dd2..035f1896 100644
--- a/build.xml
+++ b/build.xml
@@ -174,8 +174,19 @@
 		<property name="go.dir" value="${project.outputDirectory}/go" />	
 		<delete dir="${go.dir}" />
 
+		<local name="webinf" />
+		<property name="webinf" value="${project.compileOutputDirectory}/WEB-INF" />
+
 		<prepareDataDirectory toDir="${go.dir}/data" />
 		
+		<!-- Copy the web.xml from the prototype web.xml -->
+		<copy todir="${webinf}" overwrite="true">
+			<fileset file="${project.src.dir}/WEB-INF/web.xml" />
+			<filterset>
+				<filter token="gb.version" value="${project.version}" />
+			</filterset>
+		</copy>
+		
 		<!-- Build jar -->
 		<mx:jar destfile="${go.dir}/gitblit.jar" includeresources="true">
 			<mainclass name="com.gitblit.GitBlitServer" />
@@ -240,10 +251,13 @@
 		<!-- Prepare the data directory -->
 		<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">
-			<replace token="@gb.version@" value="${project.version}" />
-		</mx:webxml>
+		<!-- Copy the web.xml from the prototype web.xml -->
+		<copy todir="${webinf}" overwrite="true">
+			<fileset file="${project.src.dir}/WEB-INF/web.xml" />
+			<filterset>
+				<filter token="gb.version" value="${project.version}" />
+			</filterset>
+		</copy>
 
 		<!-- Gitblit jar -->
 		<mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 3a6c4490..13f612e4 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -30,12 +30,8 @@
 	</env-entry>
 	
 	<!-- Gitblit Displayname -->
-	<display-name>
-		Gitblit - @gb.version@
-	</display-name>
+	<display-name>Gitblit - @gb.version@</display-name>
 
-	<!-- PARAMS --> 
-	 
 	 
 <!-- Gitblit Context Listener --><!-- STRIP	 
 	<listener>