Rearranged federation status enum.

James Moger

2011-09-22 c729c59cedff4e800c659e524081fbd1be8db3c1

 build.xml

@@ -13,9 +13,19 @@
   <property name="project.war.dir" value="${basedir}/war" />

   <property name="project.site.dir" value="${basedir}/site" />

   <property name="project.resources.dir" value="${basedir}/resources" />   

   <available property="hasBuildProps" file="${basedir}/build.properties"/>



   <!-- Load publication servers, paths, and credentials --> 
   <loadproperties srcfile="${basedir}/build.properties" />

   <!--

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

      Load build.properties, if available

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <target name="buildprops" if="hasBuildProps">

      <!-- Load publication servers, paths, and credentials --> 
      <loadproperties>

         <file file="${basedir}/build.properties" />

      </loadproperties>

   </target>

   

   

   <!--

@@ -23,7 +33,7 @@
      Scrape the version info from code and setup the build properties 

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <target name="buildinfo">

   <target name="buildinfo" depends="buildprops">

   

      <!-- extract Gitblit version number from source code -->

      <loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">

@@ -192,6 +202,7 @@
               <include name="bug_16x16.png" />

               <include name="book_16x16.png" />

               <include name="blank.png" />

               <include name="federated_16x16.png" />

            </fileset>



            <!-- Copy Doc images -->

@@ -250,9 +261,21 @@
            <arg value="--substitute" />

            <arg value="%JGIT%=${jgit.version}" />



            <arg value="--load" />

            <arg value="--properties" />

            <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />



            <arg value="--nomarkdown" />

            <arg value="%BEGINCODE%:%ENDCODE%" />



            <arg value="--substitute" />

            <arg value="&quot;%BEGINCODE%=&lt;pre class='prettyprint lang-java'&gt;&quot;" />



            <arg value="--substitute" />

            <arg value="%ENDCODE%=&lt;/pre&gt;" />

				
            <arg value="--regex" />

            <arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />

		
         </java>

   </target>

   

@@ -366,6 +389,7 @@
            <include name="bug_16x16.png" />

            <include name="book_16x16.png" />

            <include name="blank.png" />

            <include name="federated_16x16.png" />

         </fileset>



         <!-- Copy Doc images -->

@@ -379,6 +403,14 @@
      <mkdir dir="${project.site.dir}/fancybox" />

      <copy todir="${project.site.dir}/fancybox">

         <fileset dir="${basedir}/docs/fancybox">

            <exclude name="thumbs.db" />

         </fileset>

      </copy>



      <!-- Copy google-code-prettify -->

      <mkdir dir="${basedir}/src/com/gitblit/wicket/pages/prettify" />

      <copy todir="${project.site.dir}/prettify">

         <fileset dir="${basedir}/src/com/gitblit/wicket/pages/prettify">

            <exclude name="thumbs.db" />

         </fileset>

      </copy>

@@ -449,6 +481,18 @@


         <arg value="--properties" />

         <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />

			
         <arg value="--nomarkdown" />

         <arg value="%BEGINCODE%:%ENDCODE%" />



         <arg value="--substitute" />

         <arg value="&quot;%BEGINCODE%=&lt;pre class='prettyprint lang-java'&gt;&quot;" />



         <arg value="--substitute" />

         <arg value="%ENDCODE%=&lt;/pre&gt;" />



         <arg value="--regex" />

         <arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />



      </java>   

   </target>