Fixed url panel failure when there are no repository urls (issue 269)

James Moger

2013-07-15 8f6e672ffe19c439aadc07b64e36ae4b83e78f1e

 build.xml

@@ -683,11 +683,17 @@
                  <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 />

@@ -800,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>

@@ -811,51 +817,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>



@@ -863,32 +890,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.

@@ -898,19 +916,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>



      

@@ -939,11 +983,17 @@
                     <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 />