From ac7e9a61460554aa0183c677bb15d1f473519f55 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 07 Dec 2012 08:24:43 -0500 Subject: [PATCH] Harden metrics from polluted data (issue-176) --- build.xml | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index aa247d3..0088597 100644 --- a/build.xml +++ b/build.xml @@ -95,6 +95,7 @@ <property name="authority.zipfile" value="authority-${gb.version}.zip" /> <property name="gbapi.zipfile" value="gbapi-${gb.version}.zip" /> <property name="express.zipfile" value="express-${gb.version}.zip" /> + <property name="distribution.pomfileTmplt" value="tmplt.pom.xml" /> </target> @@ -170,7 +171,7 @@ Build Gitblit GO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <target name="buildGO" depends="compile" description="Build Gitblit GO distribution"> + <target name="buildGO" depends="compile,buildAuthority" description="Build Gitblit GO distribution"> <echo>Building Gitblit GO ${gb.version}</echo> @@ -495,6 +496,11 @@ <exclude name="com/gitblit/Launcher*.class" /> </fileset> </copy> + <copy todir="${project.jar.dir}/static"> + <fileset dir="${project.resources.dir}"> + <exclude name="thumbs.db" /> + </fileset> + </copy> <!-- Build the JAR file --> <jar basedir="${project.jar.dir}" destfile="${distribution.jarfile}" compress="true" /> @@ -762,10 +768,13 @@ <resource file="${basedir}/resources/user_16x16.png" /> <resource file="${basedir}/resources/users_16x16.png" /> <resource file="${basedir}/resources/rosette_16x16.png" /> + <resource file="${basedir}/resources/rosette_32x32.png" /> <resource file="${basedir}/resources/vcard_16x16.png" /> <resource file="${basedir}/resources/settings_16x16.png" /> <resource file="${basedir}/resources/settings_32x32.png" /> <resource file="${basedir}/resources/search-icon.png" /> + <resource file="${basedir}/resources/mail_16x16.png" /> + <resource file="${basedir}/resources/script_16x16.png" /> <resource file="${basedir}/resources/blank.png" /> <resource file="${basedir}/resources/bullet_green.png" /> <resource file="${basedir}/resources/bullet_orange.png" /> -- Gitblit v1.9.1