summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-10-21 17:34:12 -0400
committerJames Moger <james.moger@gitblit.com>2011-10-21 17:34:12 -0400
commitb75734f0600c333d70a3659af82be54caf3cfd3e (patch)
treea26f87f005f63779d0da1364d45619673c3a55cb /build.xml
parent4d44cf806ddfa8d051f2d6b1289fa3b67b0daf2e (diff)
downloadgitblit-b75734f0600c333d70a3659af82be54caf3cfd3e.tar.gz
gitblit-b75734f0600c333d70a3659af82be54caf3cfd3e.zip
Revised settings RPC to be Map<String, SettingModel>.
Added setting metadata. Added server status rpc. Improved setting tab in Manager.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 92174d4c..107fac37 100644
--- a/build.xml
+++ b/build.xml
@@ -104,6 +104,11 @@
</fileset>
</copy>
+ <!-- copy gitblit.properties to the WEB-INF folder.
+ this file is only used for parsing setting descriptions. -->
+ <copy todir="${basedir}/src/WEB-INF" overwrite="true"
+ file="${basedir}/distrib/gitblit.properties" />
+
<!-- Compile the build tool and execute it.
This downloads missing compile-time dependencies from Maven. -->
@@ -306,10 +311,11 @@
<delete dir="${project.war.dir}" />
- <!-- Copy web.xml and users.properties to WEB-INF -->
+ <!-- Copy web.xml, users.properties, and gitblit.properties to WEB-INF -->
<copy todir="${project.war.dir}/WEB-INF">
<fileset dir="${basedir}/distrib">
<include name="users.properties" />
+ <include name="gitblit.properties" />
</fileset>
<fileset dir="${basedir}/src/WEB-INF">
<include name="web.xml" />