From 7847af6e63e7adef6ec8d99a1809e91472d2bc2d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Sep 2013 09:14:22 -0400
Subject: [PATCH] Restore blockpush and localclone hooks to binaries (issue-303)

---
 build.xml |  328 +++++++++++++++++++++++++++---------------------------
 1 files changed, 166 insertions(+), 162 deletions(-)

diff --git a/build.xml b/build.xml
index cc58f60..57a5052 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 		documentation @ http://gitblit.github.io/moxie
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<property name="moxie.version" value="0.7.4" />
+	<property name="moxie.version" value="0.8.1" />
 	<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" />
@@ -49,7 +49,8 @@
 		<property name="authority.zipfile" value="authority-${project.version}.zip" />
 		<property name="gbapi.zipfile" value="gbapi-${project.version}.zip" />
 		<property name="express.zipfile" value="express-${project.version}.zip" />
-		
+		<property name="maven.directory" value="${basedir}/../gitblit-maven" />
+
 		<!-- Download links -->
 		<property name="gc.url" value="http://code.google.com/p/gitblit/downloads/detail?name=" />
 	</target>
@@ -61,22 +62,6 @@
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
 	<target name="clean" depends="prepare" description="Cleanup all build artifacts and directories">
-		<!-- cleanup legacy build structure -->
-		<!-- this can be eliminated after 1.3.0 release -->
-		<delete>
-			<fileset dir="${basedir}">
-				<include name="*.zip" />
-				<include name="*.war" />
-				<include name="*.jar" />
-			</fileset>
-		</delete>
-		<delete dir="${basedir}/deploy" failonerror="false" />
-		<delete dir="${basedir}/express" failonerror="false" />
-		<delete dir="${basedir}/jar" failonerror="false" />
-		<delete dir="${basedir}/javadoc" failonerror="false" />
-		<delete dir="${basedir}/site" failonerror="false" />
-		<delete dir="${basedir}/temp" failonerror="false" />
-		<delete dir="${basedir}/war" failonerror="false" />
 		
 		<!-- Clean build and target directories -->
 		<mx:clean />
@@ -106,29 +91,7 @@
 		     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
-			this code can be eliminated after 1.3.0 release
-		 -->
-		<move todir="${basedir}/data" overwrite="true" failonerror="false">
-			<fileset dir="${basedir}">
-				<include name="users.conf" />
-				<include name="projects.conf" />
-				<include name="gitblit.properties" />
-				<include name="serverKeyStore.jks" />
-				<include name="serverTrustStore.jks" />
-			</fileset>
-		</move>
-		<move todir="${basedir}/data/certs" overwrite="true" failonerror="false">
-			<fileset dir="${basedir}/certs" />
-		</move>
-		<move todir="${basedir}/data/git" overwrite="true" failonerror="false">
-			<fileset dir="${basedir}/git" />
-		</move>
-		<move todir="${basedir}/data/proposals" overwrite="true" failonerror="false">
-			<fileset dir="${basedir}/proposals" />
-		</move>
+
 	</target>
 
 
@@ -185,6 +148,13 @@
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
 	<target name="run" depends="compile" description="Run Gitblit GO">
+        <!-- copy static files -->
+        <copy todir="${basedir}/build/classes" overwrite="false">
+            <fileset dir="${project.resources.dir}">
+                <exclude name="thumbs.db" />
+                <exclude name="*.mkd" />
+            </fileset>
+        </copy>
 		
 		<!-- run the mainclass in a separate JVM -->
 		<mx:run fork="true" />
@@ -280,6 +250,7 @@
 		<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
 			<!-- Specify all web.xml servlets and filters -->
 			<class name="com.gitblit.GitBlit" />
+			<class name="com.gitblit.Keys" />
 			<class name="com.gitblit.DownloadZipFilter" />
 			<class name="com.gitblit.DownloadZipServlet" />
 			<class name="com.gitblit.EnforceAuthenticationFilter" />
@@ -295,12 +266,14 @@
 			<class name="com.gitblit.SyndicationFilter" />
 			<class name="com.gitblit.SyndicationServlet" />
 			<class name="com.gitblit.SparkleShareInviteServlet" />
+			<class name="com.gitblit.wicket.GitblitWicketFilter" />
 			<class name="com.gitblit.wicket.GitBlitWebApp" />
 			<!-- Manually include alternative User Services -->
 			<class name="com.gitblit.LdapUserService" />
 			<class name="com.gitblit.RedmineUserService" />
 			<class name="com.gitblit.SalesforceUserService" />
 			<class name="com.gitblit.WindowsUserService" />
+			<class name="com.gitblit.PAMUserService" />
 		</mx:genjar>
 
 		<!-- Build the WAR file -->
@@ -335,6 +308,7 @@
 		<mx:genjar tag="" includeresources="false" excludeClasspathJars="true"
 			destfile="${project.targetDirectory}/fedclient.jar">
 			<mainclass name="com.gitblit.FederationClient" />
+			<class name="com.gitblit.Keys" />
 			<launcher paths="ext" />
 			<resource file="${project.compileOutputDirectory}/log4j.properties" />
 		</mx:genjar>
@@ -397,6 +371,7 @@
 		<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
 			<!-- Specify all web.xml servlets and filters -->
 			<class name="com.gitblit.GitBlit" />
+			<class name="com.gitblit.Keys" />
 			<class name="com.gitblit.DownloadZipFilter" />
 			<class name="com.gitblit.DownloadZipServlet" />
 			<class name="com.gitblit.EnforceAuthenticationFilter" />
@@ -412,12 +387,14 @@
 			<class name="com.gitblit.SyndicationFilter" />
 			<class name="com.gitblit.SyndicationServlet" />
 			<class name="com.gitblit.SparkleShareInviteServlet" />
+			<class name="com.gitblit.wicket.GitblitWicketFilter" />
 			<class name="com.gitblit.wicket.GitBlitWebApp" />
 			<!-- Manually include alternative User Services -->
 			<class name="com.gitblit.LdapUserService" />
 			<class name="com.gitblit.RedmineUserService" />
 			<class name="com.gitblit.SalesforceUserService" />
 			<class name="com.gitblit.WindowsUserService" />
+			<class name="com.gitblit.PAMUserService" />
 		</mx:genjar>
 
 		<!-- Build Express Zip file -->
@@ -484,6 +461,11 @@
 			</resource>
 
 			<mainclass name="com.gitblit.client.GitblitManagerLauncher" />
+			<class name="com.gitblit.Keys" />
+			<class name="com.gitblit.client.GitblitClient" />
+			<class name="com.gitblit.models.FederationModel" />
+			<class name="com.gitblit.models.FederationProposal" />
+			<class name="com.gitblit.models.FederationSet" />			
 			<manifest>
 				<attribute name="SplashScreen-Image" value="splash.png" />
 			</manifest>
@@ -505,75 +487,7 @@
 		<!-- Cleanup -->
 		<delete file="${project.targetDirectory}/manager.jar" />
 	</target>
-	
-	
-	<!-- 
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Build the stand-alone, Gitblit Authority
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="buildAuthority" depends="compile" description="Builds the stand-alone Gitblit Authority">
-		<echo>Building Gitblit Authority ${project.version}</echo>
 
-		<!-- generate jar by traversing the class hierarchy of the specified
-			 classes, exclude any classes in "authority" classpath jars -->
-		<mx:genjar tag="authority" excludeClasspathJars="true" 
-			destfile="${project.targetDirectory}/authority.jar">
-			<resource file="${project.src.dir}/com/gitblit/client/splash.png" />
-			<resource file="${project.resources.dir}/gitblt-favicon.png" />
-			<resource file="${project.resources.dir}/user_16x16.png" />
-			<resource file="${project.resources.dir}/users_16x16.png" />
-			<resource file="${project.resources.dir}/rosette_16x16.png" />
-			<resource file="${project.resources.dir}/rosette_32x32.png" />
-			<resource file="${project.resources.dir}/vcard_16x16.png" />
-			<resource file="${project.resources.dir}/settings_16x16.png" />
-			<resource file="${project.resources.dir}/settings_32x32.png" />
-			<resource file="${project.resources.dir}/search-icon.png" />
-			<resource file="${project.resources.dir}/mail_16x16.png" />
-			<resource file="${project.resources.dir}/script_16x16.png" />
-			<resource file="${project.resources.dir}/blank.png" />
-			<resource file="${project.resources.dir}/bullet_green.png" />
-			<resource file="${project.resources.dir}/bullet_orange.png" />
-			<resource file="${project.resources.dir}/bullet_red.png" />
-			<resource file="${project.resources.dir}/bullet_white.png" />
-			<resource file="${project.resources.dir}/bullet_delete.png" />
-			<resource file="${project.resources.dir}/bullet_key.png" />
-			<resource file="${project.src.dir}/log4j.properties" />
-			<resource>
-				<!-- inlcude all translations -->
-				<fileset dir="${project.src.dir}/com/gitblit/wicket">
-					<include name="*.properties" />
-				</fileset>
-			</resource>
-
-			<mainclass name="com.gitblit.authority.Launcher" />
-			<manifest>
-				<attribute name="SplashScreen-Image" value="splash.png" />
-			</manifest>
-		</mx:genjar>
-
-		<!-- Build Authority Zip file -->
-		<mx:zip destfile="${project.targetDirectory}/${authority.zipfile}">
-			<fileset dir="${basedir}">
-				<include name="LICENSE" />
-				<include name="NOTICE" />
-			</fileset>
-			<fileset dir="${project.targetDirectory}">
-				<include name="authority.jar" />
-			</fileset>
-			<zipfileset dir="${project.distrib.dir}/data" prefix="data">
-				<include name="users.conf" />
-				<include name="gitblit.properties" />
-			</zipfileset>
-			<!-- Gitblit Authority data -->
-			<zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
-			<!-- include "authority" tagged dependencies -->
-			<dependencies prefix="ext" tag="authority" />
-		</mx:zip>
-				
-		<!-- Cleanup -->
-		<delete file="${project.targetDirectory}/authority.jar" />
-	</target>
 					
 	<!-- 
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -644,9 +558,6 @@
 		<delete>
 			<fileset dir="${project.targetDirectory}">
 				<include name="javadoc/**" />
-				<include name="gbapi-${project.version}.jar" />
-				<include name="gbapi-${project.version}-sources.jar" />
-				<include name="gbapi-${project.version}-javadoc.jar" />
 		</fileset>
 		</delete>
 	</target>
@@ -673,17 +584,29 @@
 					<page name="screenshots" src="screenshots.mkd" />
 				</menu>
 				<menu name="documentation" pager="true" pagerPlacement="bottom" pagerLayout="justified">
-					<page name="setup GO" src="setup_go.mkd" />
-					<page name="upgrade GO" src="upgrade_go.mkd" />
+					<menu name="Gitblit GO" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+						<page name="setup GO" src="setup_go.mkd" />
+						<page name="upgrade GO" src="upgrade_go.mkd" />
+					</menu>
 					<divider />
-					<page name="setup WAR" src="setup_war.mkd" />
-					<page name="upgrade WAR" src="upgrade_war.mkd" />
+					<menu name="Gitblit WAR" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+						<page name="setup WAR" src="setup_war.mkd" />
+						<page name="upgrade WAR" src="upgrade_war.mkd" />
+					</menu>
 					<divider />
-					<page name="administration" src="setup.mkd" />
+					<menu name="Gitblit Express" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+						<page name="setup Express" src="setup_express.mkd" />
+						<page name="upgrade Express" src="upgrade_express.mkd" />
+					</menu>
+					<divider />
+					<page name="administration" src="administration.mkd" />
 					<page name="authentication" src="setup_authentication.mkd" />
 					<page name="push hooks" src="setup_hooks.mkd" />
 					<page name="lucene indexing" src="setup_lucene.mkd" />
 					<page name="reverse proxies" src="setup_proxy.mkd" />
+					<page name="client app menus" src="setup_clientmenus.mkd" />
+					<divider />
+					<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
 					<divider />
 					<page name="git client setup" src="setup_client.mkd" />
 					<divider />
@@ -780,13 +703,26 @@
 
 	</target>
 
+	<!--
+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		Package and deploy RELEASE artifacts to the Maven repository
+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	-->
+	<target name="buildMavenArtifacts" depends="buildApiLibrary">
+		<mx:package />
+		<mx:deploy basedir="${maven.directory}" allowsnapshots="false" />
+		<mx:deploy basedir="${maven.directory}" allowsnapshots="false"
+			name="Gitblit API" description="Gitblit JSON/RSS API client library"
+			tags="api" artifactid="gbapi" />
+	</target>
+
 
 	<!--
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 		Build all binaries and site
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="buildAll" depends="buildAuthority,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />		
+	<target name="buildAll" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />		
 
 	
 	<!--
@@ -794,7 +730,7 @@
 		Update the gh-pages branch with the current site
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="updateGhPages" depends="buildSite">
+	<target name="updateGhPages">
 		<!-- Build gh-pages branch -->
 		<mx:ghpages repositorydir="${basedir}" obliterate="true" />
 	</target>
@@ -805,51 +741,72 @@
 		Publish binaries to Google Code
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="publishBinaries" depends="clean,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code">
+	<target name="publishBinaries" depends="prepare" description="Publish the Gitblit binaries to Google Code">
 
 		<echo>Uploading Gitblit ${project.version} binaries</echo>
 
 		<!-- Upload Gitblit GO Windows ZIP file -->
 		<mx:gcupload 
-			 sourceFile="${distribution.zipfile}" 
-			 targetFile="gitblit-${project.version}.zip"
-			 description="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Windows)" />
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+			projectname="gitblit"
+			filename="${project.targetDirectory}/${distribution.zipfile}" 
+			targetFilename="gitblit-${project.version}.zip"
+			summary="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Windows)" />
 
 		<!-- Upload Gitblit GO Linux/Unix tar.gz file -->
 		<mx:gcupload
-			 sourceFile="${distribution.tgzfile}" 
-			 targetFile="gitblit-${project.version}.tar.gz"
-			 description="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Linux/Unix)" />
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+			projectname="gitblit"
+			filename="${project.targetDirectory}/${distribution.tgzfile}" 
+			targetFilename="gitblit-${project.version}.tar.gz"
+			summary="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Linux/Unix)" />
 
 		<!-- Upload Gitblit WAR file -->
-		<mx:gcupload 
-		     sourceFile="${distribution.warfile}" 
-		     targetFile="gitblit-${project.version}.war"
-		     description="Gitblit WAR v${project.version} (standard WAR webapp for servlet containers)" />
+		<mx:gcupload
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+			projectname="gitblit"
+			filename="${project.targetDirectory}/${distribution.warfile}" 
+			targetFilename="gitblit-${project.version}.war"
+			summary="Gitblit WAR v${project.version} (standard WAR webapp for servlet containers)" />
 
 		<!-- Upload Gitblit FedClient -->
-		<mx:gcupload 
-			sourceFile="${fedclient.zipfile}" 
-			targetFile="fedclient-${project.version}.zip"
-			description="Gitblit Federation Client v${project.version} (command-line tool to clone data from federated Gitblit instances)" />
+		<mx:gcupload
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+		    projectname="gitblit"
+			filename="${project.targetDirectory}/${fedclient.zipfile}" 
+			targetFilename="fedclient-${project.version}.zip"
+		    summary="Gitblit Federation Client v${project.version} (command-line tool to clone data from federated Gitblit instances)" />
 
 		<!-- Upload Gitblit Manager -->
 		<mx:gcupload
-			sourceFile="${manager.zipfile}" 
-			targetFile="manager-${project.version}.zip"
-			description="Gitblit Manager v${project.version} (Swing tool to remotely administer a Gitblit server)" />
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+			projectname="gitblit"
+			filename="${project.targetDirectory}/${manager.zipfile}" 
+			targetFilename="manager-${project.version}.zip"
+			summary="Gitblit Manager v${project.version} (Swing tool to remotely administer a Gitblit server)" />
 
 		<!-- Upload Gitblit API Library -->
 		<mx:gcupload
-			sourceFile="${gbapi.zipfile}" 
-			targetFile="gbapi-${project.version}.zip"
-			description="Gitblit API Library v${project.version} (JSON RPC library to integrate with your software)" />
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+			projectname="gitblit"
+			filename="${project.targetDirectory}/${gbapi.zipfile}" 
+			targetFilename="gbapi-${project.version}.zip"
+			summary="Gitblit API Library v${project.version} (JSON RPC library to integrate with your software)" />
 
 		<!-- Upload Gitblit Express for RedHat OpenShift -->
-		<mx:gcupload 
-			sourceFile="${express.zipfile}" 
-			targetFile="express-${project.version}.zip"
-			description="Gitblit Express v${project.version} (run Gitblit on RedHat's OpenShift cloud)" />
+		<mx:gcupload
+			username="${googlecode.user}"
+			password="${googlecode.password}"
+			projectname="gitblit"
+			filename="${project.targetDirectory}/${express.zipfile}" 
+			targetFilename="express-${project.version}.zip"
+			summary="Gitblit Express v${project.version} (run Gitblit on RedHat's OpenShift cloud)" />
 
 	</target>
 
@@ -857,54 +814,73 @@
 	<!--
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 		Publish site to site hosting service
-		You must add ext/commons-net-1.4.0.jar to your ANT classpath.
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="publishSite" depends="clean,buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >
+	<target name="publishSite" depends="clean,buildSite,updateGhPages" description="Publish the Gitblit site to a host" >
 
 		<echo>Uploading Gitblit ${project.version} website</echo>
 
-		<ftp server="${ftp.server}"
+		<mx:ftp server="${ftp.server}"
 			userid="${ftp.user}"
 			password="${ftp.password}"
 			remotedir="${ftp.dir}"
 			passive="true"
 			verbose="yes">
 			<fileset dir="${project.siteTargetDirectory}" />
-		</ftp>
+		</mx:ftp>
 	</target>
 
 
 	<!--
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-		Compile from source, publish binaries, and build & deploy site
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="publishAll" depends="publishBinaries,publishSite" />
-
-	
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 		Tag a new version and prepare for the next development cycle.
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 	-->
-	<target name="tagRelease" depends="prepare">
+	<target name="tagRelease" depends="prepare" description="tag a new version and prepare for the next development cycle">
 		<!-- release -->
 		<property name="dryrun" value="false" />
 		<mx:version stage="release" dryrun="${dryrun}" />		
+		<property name="project.tag" value="v${project.version}" />
 		<!-- commit build.moxie & releases.moxie (automatic) -->
 		<mx:commit showtitle="no">
 		    <message>Prepare ${project.version} release</message>
-			<tag name="v${project.version}">
+			<tag name="${project.tag}">
 				<message>${project.name} ${project.version} release</message>
 			</tag>
 		</mx:commit>
+
+		<!-- create the release process script -->
+		<mx:if>
+			<os family="windows" />
+			<then>
+				<!-- Windows PowerShell script        -->
+				<!-- set-executionpolicy remotesigned -->
+				<property name="recipe" value="release_${project.version}.ps1" />
+			</then>
+			<else>
+				<!-- Bash script -->
+				<property name="recipe" value="release_${project.version}.sh" />
+			</else>
+		</mx:if>
+		<delete file="${recipe}" failonerror="false" quiet="true" verbose="false" />
+		<!-- Work-around for lack of proper ant property substitution in copy -->
+		<property name="dollar" value="$"/>
+		<copy file="release.template" tofile="${recipe}">
+			<filterset begintoken="${dollar}{" endtoken="}">
+				<filter token="project.version" value="${project.version}" />
+				<filter token="project.commitId" value="${project.commitId}" />
+				<filter token="project.tag" value="${project.tag}" />
+				<filter token="project.directory" value="${basedir}" />
+				<filter token="maven.directory" value="${maven.directory}" />
+			</filterset>
+		</copy>
+		<chmod file="${recipe}" perm="ugo+rx" />
 
 		<!-- next cycle -->
 		<mx:version stage="snapshot" incrementNumber="incremental" dryrun="${dryrun}" />
 		<mx:commit showtitle="no">
 		    <message>Reset build identifiers for next development cycle</message>
-		</mx:commit>
+		</mx:commit>		
 	</target>
 
 		
@@ -923,11 +899,36 @@
 						<page name="features" src="features.mkd" />
 					</menu>
 					<menu name="documentation">
-						<page name="setup" src="setup.mkd" />
+						<menu name="Gitblit GO" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+							<page name="setup GO" src="setup_go.mkd" />
+							<page name="upgrade GO" src="upgrade_go.mkd" />
+						</menu>
+						<divider />
+						<menu name="Gitblit WAR" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+							<page name="setup WAR" src="setup_war.mkd" />
+							<page name="upgrade WAR" src="upgrade_war.mkd" />
+						</menu>
+						<divider />
+						<menu name="Gitblit Express" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+							<page name="setup Express" src="setup_express.mkd" />
+							<page name="upgrade Express" src="upgrade_express.mkd" />
+						</menu>
+						<divider />
+						<page name="administration" src="administration.mkd" />
+						<page name="authentication" src="setup_authentication.mkd" />
+						<page name="push hooks" src="setup_hooks.mkd" />
+						<page name="lucene indexing" src="setup_lucene.mkd" />
+						<page name="reverse proxies" src="setup_proxy.mkd" />
+						<page name="client app menus" src="setup_clientmenus.mkd" />
+						<divider />
+						<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+						<divider />
+						<page name="git client setup" src="setup_client.mkd" />
+						<divider />
 						<page name="federation" src="federation.mkd" />
 						<divider />
-						<page name="faq" src="faq.mkd" />
 						<page name="settings" src="properties.mkd" />
+						<page name="faq" src="faq.mkd" />
 						<divider />
 						<page name="design" src="design.mkd" />
 						<page name="rpc" src="rpc.mkd" />
@@ -1002,6 +1003,8 @@
 					<include name="sendmail-html.groovy" />
 					<include name="jenkins.groovy" />
 					<include name="protect-refs.groovy" />
+					<include name="blockpush.groovy" />
+					<include name="localclone.groovy" />
 					<include name="fogbugz.groovy" />
 					<include name="thebuggenie.groovy" />
 				</fileset>
@@ -1072,5 +1075,6 @@
 			<arg value="-DrepositoryId=${project.maven.repo.id}" />
 			<arg value="-DcreateChecksum=true" />
 		</exec>
-	</target>					
+	</target>
+	
 </project>

--
Gitblit v1.9.1