diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-17 10:54:22 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-17 10:54:22 -0400 |
| commit | 41dd02a437c174ed71fd6c8b3d76000bbbcbc3bd (patch) | |
| tree | 8a6daadc25b9595fd01de160134a13cead49c997 /build.xml | |
| parent | 9186c6413e7cdfc33527ca69d2e56dfec6d8b760 (diff) | |
| download | gitblit-41dd02a437c174ed71fd6c8b3d76000bbbcbc3bd.tar.gz gitblit-41dd02a437c174ed71fd6c8b3d76000bbbcbc3bd.zip | |
Fix WAR web.xml generation regression
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -8,7 +8,7 @@ documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.9.2" />
+ <property name="moxie.version" value="0.9.3" />
<property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
<property name="moxie.dir" value="${user.home}/.moxie" />
@@ -251,13 +251,10 @@ <!-- Prepare the data directory -->
<prepareDataDirectory toDir="${webinf}/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 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>
<!-- Gitblit jar -->
<mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />
|