Switch to basic ant copy filter for web.xml

diff --git a/build.xml b/build.xml
index be6f1dd250651b088472f82ab319171ad1274037..035f1896d2b989c5936a3021c26ee969998dc3ca 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -174,8 +174,19 @@
                <property name="go.dir" value="${project.outputDirectory}/go" />        \r
                <delete dir="${go.dir}" />\r
 \r
+               <local name="webinf" />\r
+               <property name="webinf" value="${project.compileOutputDirectory}/WEB-INF" />\r
+\r
                <prepareDataDirectory toDir="${go.dir}/data" />\r
                \r
+               <!-- Copy the web.xml from the prototype web.xml -->\r
+               <copy todir="${webinf}" overwrite="true">\r
+                       <fileset file="${project.src.dir}/WEB-INF/web.xml" />\r
+                       <filterset>\r
+                               <filter token="gb.version" value="${project.version}" />\r
+                       </filterset>\r
+               </copy>\r
+               \r
                <!-- Build jar -->\r
                <mx:jar destfile="${go.dir}/gitblit.jar" includeresources="true">\r
                        <mainclass name="com.gitblit.GitBlitServer" />\r
@@ -240,10 +251,13 @@
                <!-- Prepare the data directory -->\r
                <prepareDataDirectory toDir="${webinf}/data" />\r
 \r
-               <!-- Build the WAR web.xml from the prototype web.xml -->\r
-               <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml">\r
-                       <replace token="@gb.version@" value="${project.version}" />\r
-               </mx:webxml>\r
+               <!-- Copy the web.xml from the prototype web.xml -->\r
+               <copy todir="${webinf}" overwrite="true">\r
+                       <fileset file="${project.src.dir}/WEB-INF/web.xml" />\r
+                       <filterset>\r
+                               <filter token="gb.version" value="${project.version}" />\r
+                       </filterset>\r
+               </copy>\r
 \r
                <!-- Gitblit jar -->\r
                <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />\r

diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 3a6c449027c6d4c6dd0f293dcc0b5e5db35abaa2..13f612e467d994c1aba55fea200945294a06069d 100644 (file)
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -30,12 +30,8 @@
        </env-entry>\r
        \r
        <!-- Gitblit Displayname -->\r
-       <display-name>\r
-               Gitblit - @gb.version@\r
-       </display-name>\r
+       <display-name>Gitblit - @gb.version@</display-name>\r
 \r
-       <!-- PARAMS --> \r
-        \r
         \r
 <!-- Gitblit Context Listener --><!-- STRIP     \r
        <listener>\r