James Moger
2013-07-14 5aec867b2fae0ff039d0ca4228ccceadecf316c9
build.xml
@@ -286,6 +286,7 @@
         <class name="com.gitblit.FederationServlet" />
         <class name="com.gitblit.GitFilter" />
         <class name="com.gitblit.git.GitServlet" />
         <class name="com.gitblit.LogoServlet" />
         <class name="com.gitblit.PagesFilter" />
         <class name="com.gitblit.PagesServlet" />
         <class name="com.gitblit.RobotsTxtServlet" />
@@ -293,10 +294,13 @@
         <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" />
         <class name="com.gitblit.SalesforceUserService" />
         <class name="com.gitblit.WindowsUserService" />
      </mx:genjar>
      <!-- Build the WAR file -->
@@ -399,6 +403,7 @@
         <class name="com.gitblit.FederationServlet" />
         <class name="com.gitblit.GitFilter" />
         <class name="com.gitblit.git.GitServlet" />
         <class name="com.gitblit.LogoServlet" />
         <class name="com.gitblit.PagesFilter" />
         <class name="com.gitblit.PagesServlet" />
         <class name="com.gitblit.RobotsTxtServlet" />
@@ -406,10 +411,13 @@
         <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" />
         <class name="com.gitblit.SalesforceUserService" />
         <class name="com.gitblit.WindowsUserService" />
      </mx:genjar>
      <!-- Build Express Zip file -->
@@ -664,8 +672,33 @@
               <page name="features" src="features.mkd" />
               <page name="screenshots" src="screenshots.mkd" />
            </menu>
            <menu name="documentation">
               <page name="setup" src="setup.mkd" />
            <menu name="documentation" pager="true" pagerPlacement="bottom" pagerLayout="justified">
               <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="settings" src="properties.mkd" />
@@ -699,7 +732,8 @@
            </menu>
            
            <menu name="links">
               <link name="Demo" src="https://demo-gitblit.rhcloud.com" />
               <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
               <link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
               <divider />
               <link name="Github" src="${project.scmUrl}" />
               <link name="Issues" src="${project.issuesUrl}" />
@@ -772,7 +806,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>
@@ -783,7 +817,7 @@
      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" description="Publish the Gitblit binaries to Google Code">
      <echo>Uploading Gitblit ${project.version} binaries</echo>
@@ -835,32 +869,23 @@
   <!--
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
      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.
@@ -870,19 +895,45 @@
      <!-- 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}" />
         </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>
      
@@ -901,11 +952,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" />
@@ -915,7 +991,8 @@
                  <page name="older releases" src="releasehistory.mkd" />
               </menu>
               <menu name="links">
                  <link name="Demo" src="https://demo-gitblit.rhcloud.com" />
                  <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
                  <link name="Gitbilt Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
                  <divider />
                  <link name="Github" src="${project.scmUrl}" />
                  <link name="Issues" src="${project.issuesUrl}" />
@@ -966,6 +1043,12 @@
               <include name="gitblit.properties" />               
            </fileset>
         </copy>
         <mkdir dir="@{toDir}/git" />
         <copy todir="@{toDir}/git" overwrite="false">
            <fileset dir="${project.distrib.dir}/data/git">
               <include name="project.mkd" />
            </fileset>
         </copy>
         <mkdir dir="@{toDir}/groovy" />
         <copy todir="@{toDir}/groovy">
            <fileset dir="${project.distrib.dir}/data/groovy">