Null checks when generating a fork network (issue-187)

James Moger

2013-01-13 9727511ad07db2c332f164fe399108768457bdae

 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>



@@ -190,9 +191,9 @@
         <fileset dir="${basedir}">

            <include name="LICENSE" />

            <include name="NOTICE" />

            <include name="authority*.jar" />

         </fileset>

         </fileset>			
      </copy>

      <copy tofile="${project.deploy.dir}/authority.jar" file="${basedir}/authority-${gb.version}.jar" />

      

      <!-- Certificate templates -->

      <mkdir dir="${project.deploy.dir}/certs"/>

@@ -461,7 +462,6 @@
            <exclude name="com/gitblit/AddIndexedBranch*.class" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />

            <exclude name="com/gitblit/authority/**" />

         </fileset>

      </copy>

@@ -494,7 +494,11 @@
            <exclude name="com/gitblit/AddIndexedBranch*.class" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />

         </fileset>

      </copy>

      <copy todir="${project.jar.dir}/static">

         <fileset dir="${project.resources.dir}">

            <exclude name="thumbs.db" />

         </fileset>

      </copy>



@@ -671,7 +675,6 @@
            <exclude name="com/gitblit/client/**" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />

            <exclude name="com/gitblit/authority/**" />

         </fileset>

      </jar>

@@ -714,12 +717,15 @@
         <resource file="${basedir}/resources/commit_changes_16x16.png" />

         <resource file="${basedir}/resources/commit_merge_16x16.png" />

         <resource file="${basedir}/resources/commit_divide_16x16.png" />

         <resource file="${basedir}/resources/star_16x16.png" />

         <resource file="${basedir}/resources/blank.png" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_es.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ko.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_nl.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pl.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties" />



         <class name="com.gitblit.client.GitblitManagerLauncher" />

         <classfilter>

@@ -765,9 +771,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" />

@@ -775,6 +785,7 @@
         <resource file="${basedir}/resources/bullet_white.png" />

         <resource file="${basedir}/resources/bullet_delete.png" />

         <resource file="${basedir}/resources/bullet_key.png" />

         <resource file="${basedir}/src/log4j.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_es.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />

@@ -1114,16 +1125,6 @@
         filename="${manager.zipfile}" 

         targetfilename="manager-${gb.version}.zip"

         summary="Gitblit Manager v${gb.version} (Swing tool to remotely administer a Gitblit server)"

         labels="Featured, Type-Package, OpSys-All" />



      <!-- Upload Gitblit Authority -->

      <gcupload 
         username="${googlecode.user}" 
         password="${googlecode.password}" 
         projectname="gitblit" 
         filename="${authority.zipfile}" 
         targetfilename="authority-${gb.version}.zip"

         summary="Gitblit Authority v${gb.version} (Swing tool to manage client SSL certificates)"

         labels="Featured, Type-Package, OpSys-All" />



      <!-- Upload Gitblit API Library -->