From 9b26b74d198aa4efbe4b25f6667b98eb5261e13d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 31 May 2013 20:08:50 -0400
Subject: [PATCH] Refinements to push log display and daily digests
---
build.xml | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/build.xml b/build.xml
index 596f0dd..39f39eb 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.7.2" />
+ <property name="moxie.version" value="0.7.4" />
<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" />
@@ -36,8 +36,9 @@
<target name="prepare">
<!-- Setup Ant build from build.moxie and resolve dependencies.
- if it exists, build.properties is automatically loaded -->
- <mx:init verbose="no" />
+ If it exists, build.properties is automatically loaded.
+ Explicitly set mxroot allowing CI servers to override the default. -->
+ <mx:init verbose="no" mxroot="${moxie.dir}" />
<!-- Set Ant project properties -->
<property name="distribution.zipfile" value="gitblit-${project.version}.zip" />
@@ -100,6 +101,11 @@
this file is only used for parsing setting descriptions. -->
<copy tofile="${project.src.dir}/reference.properties" overwrite="true"
file="${project.distrib.dir}/data/gitblit.properties" />
+
+ <!-- copy clientapps.json to the source directory.
+ this file is only used if a local file is not provided. -->
+ <copy tofile="${project.src.dir}/clientapps.json" overwrite="true"
+ file="${project.distrib.dir}/data/clientapps.json" />
<!--
upgrade existing workspace to data directory
@@ -138,8 +144,8 @@
outputclass="com.gitblit.Keys"
todir="${project.src.dir}" />
- <!-- Compile project incrementally -->
- <mx:javac scope="compile" clean="false" />
+ <!-- Compile project -->
+ <mx:javac scope="compile" clean="true" />
</target>
@@ -266,7 +272,9 @@
<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" />
+ <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:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -277,7 +285,7 @@
<class name="com.gitblit.EnforceAuthenticationFilter" />
<class name="com.gitblit.FederationServlet" />
<class name="com.gitblit.GitFilter" />
- <class name="com.gitblit.GitServlet" />
+ <class name="com.gitblit.git.GitServlet" />
<class name="com.gitblit.PagesFilter" />
<class name="com.gitblit.PagesServlet" />
<class name="com.gitblit.RobotsTxtServlet" />
@@ -285,7 +293,11 @@
<class name="com.gitblit.RpcServlet" />
<class name="com.gitblit.SyndicationFilter" />
<class name="com.gitblit.SyndicationServlet" />
+ <class name="com.gitblit.SparkleShareInviteServlet" />
<class name="com.gitblit.wicket.GitBlitWebApp" />
+ <!-- Manually include alternative User Services -->
+ <class name="com.gitblit.LdapUserService" />
+ <class name="com.gitblit.RedmineUserService" />
</mx:genjar>
<!-- Build the WAR file -->
@@ -373,8 +385,10 @@
<!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->
<!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->
<mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml"
- propertiesFile="${project.distrib.dir}/data/gitblit.properties"
- skip="server.*" />
+ propertiesFile="${project.distrib.dir}/data/gitblit.properties"
+ skip="server.*">
+ <replace token="@gb.version@" value="${project.version}" />
+ </mx:webxml>
<!-- Gitblit classes -->
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -385,7 +399,7 @@
<class name="com.gitblit.EnforceAuthenticationFilter" />
<class name="com.gitblit.FederationServlet" />
<class name="com.gitblit.GitFilter" />
- <class name="com.gitblit.GitServlet" />
+ <class name="com.gitblit.git.GitServlet" />
<class name="com.gitblit.PagesFilter" />
<class name="com.gitblit.PagesServlet" />
<class name="com.gitblit.RobotsTxtServlet" />
@@ -393,7 +407,11 @@
<class name="com.gitblit.RpcServlet" />
<class name="com.gitblit.SyndicationFilter" />
<class name="com.gitblit.SyndicationServlet" />
+ <class name="com.gitblit.SparkleShareInviteServlet" />
<class name="com.gitblit.wicket.GitBlitWebApp" />
+ <!-- Manually include alternative User Services -->
+ <class name="com.gitblit.LdapUserService" />
+ <class name="com.gitblit.RedmineUserService" />
</mx:genjar>
<!-- Build Express Zip file -->
@@ -947,7 +965,7 @@
<fileset dir="${project.distrib.dir}/data">
<include name="users.conf" />
<include name="projects.conf" />
- <include name="gitblit.properties" />
+ <include name="gitblit.properties" />
</fileset>
</copy>
<mkdir dir="@{toDir}/groovy" />
@@ -994,7 +1012,8 @@
<target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">
<local name="project.jar" />
<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
- <mx:jar destfile="${project.jar}" includeresources="true" />
+ <property name="resourceFolderPrefix" value="" />
+ <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
<exec executable="mvn">
<arg value="install:install-file" />
--
Gitblit v1.9.1