Update to slf4j 1.6.6 and log4j 1.2.17

James Moger

2012-07-11 d00a0ca46fcde3e3e580afea6a548b9c12aeac25

 build.xml

@@ -16,6 +16,7 @@
   <property name="project.war.dir" value="${basedir}/war" />

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

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

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

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



   <!--

@@ -85,6 +86,9 @@
      <property name="distribution.zipfile" value="gitblit-${gb.version}.zip" />

      <property name="distribution.warfile" value="gitblit-${gb.version}.war" />

      <property name="fedclient.zipfile" value="fedclient-${gb.version}.zip" />

      <property name="manager.zipfile" value="manager-${gb.version}.zip" />

      <property name="gbapi.zipfile" value="gbapi-${gb.version}.zip" />

      <property name="express.zipfile" value="express-${gb.version}.zip" />

   </target>

   

   

@@ -99,16 +103,21 @@
      <copy todir="${basedir}" overwrite="false">

         <fileset dir="${basedir}/distrib">

            <include name="gitblit.properties" />

            <include name="users.properties" />

            <include name="users.conf" />

         </fileset>

      </copy>



      <!-- copy gitblit.properties to the WEB-INF folder.

           this file is only used for parsing setting descriptions. -->

      <copy tofile="${basedir}/src/WEB-INF/reference.properties" overwrite="true"

         file="${basedir}/distrib/gitblit.properties" />



      <!-- Compile the build tool and execute it.

          This downloads missing compile-time dependencies from Maven. -->



      <delete dir="${project.build.dir}" />

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

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}">

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}" includeantruntime="false">

         <include name="com/gitblit/build/Build.java" />         

         <include name="com/gitblit/Constants.java" />

         <include name="com/gitblit/utils/StringUtils.java" />         

@@ -122,7 +131,7 @@
         </fileset>

         <pathelement path="${project.build.dir}" />            

      </path>

      <javac debug="true" destdir="${project.build.dir}" failonerror="false">

      <javac debug="true" destdir="${project.build.dir}" failonerror="false" includeantruntime="false">

         <src path="${basedir}/src" />

         <classpath refid="master-classpath" />

      </javac>

@@ -150,6 +159,7 @@
         <fileset dir="${basedir}/distrib">

            <include name="**/*" />

            <exclude name="federation.properties" />

            <exclude name="openshift.mkd" />

         </fileset>

         <fileset dir="${basedir}">

            <include name="LICENSE" />

@@ -161,6 +171,7 @@
      <jar jarfile="${project.deploy.dir}/${project.jar}">

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

            <include name="**/*" />

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

         </fileset>

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

            <exclude name="thumbs.db" />

@@ -170,11 +181,33 @@
         </manifest>

      </jar>



      <!-- Gitblit library dependencies -->

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

      <copy todir="${project.deploy.dir}/ext">

         <fileset dir="${basedir}/ext">

            <exclude name="junit*.jar" />

            <exclude name="commons-net*.jar" />

            <exclude name="*-sources.jar" />

            <exclude name="*-javadoc.jar" />

         </fileset>

      </copy>

		
      <!-- Build the docs for the deploy -->

      <antcall target="buildDocs" inheritall="true" inheritrefs="true">

         <param name="docs.output.dir" value="${project.deploy.dir}/docs" />

      </antcall>

      

      <!-- Copy the supported Groovy hook scripts -->

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

      <copy todir="${project.deploy.dir}/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="localclone.groovy" />

         </fileset>

      </copy>

	
      <!-- Create Zip deployment -->      

      <zip destfile="${distribution.zipfile}">

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

@@ -196,10 +229,9 @@
         <copy todir="${docs.output.dir}">

            <!-- Copy selected Gitblit resources -->

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

               <include name="background.png" />

               <include name="bootstrap/**/*" />

               <include name="gitblit.css" />

               <include name="markdown.css" />

               <include name="gitblt_25.png" />

               <include name="gitblt_25_white.png" />

               <include name="gitblt-favicon.png" />

               <include name="lock_go_16x16.png" />

               <include name="lock_pull_16x16.png" />

@@ -209,11 +241,13 @@
               <include name="book_16x16.png" />

               <include name="blank.png" />

               <include name="federated_16x16.png" />

               <include name="arrow_page.png" />

            </fileset>



            <!-- Copy Doc images -->

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

               <include name="*.png" />

               <include name="*.gif" />

            </fileset>

         </copy>



@@ -250,7 +284,7 @@
            <arg value="index=overview" />



            <arg value="--alias" />

            <arg value="properties=gitblit.properties" />

            <arg value="properties=settings" />



            <arg value="--substitute" />

            <arg value="%VERSION%=${gb.version}" />

@@ -263,6 +297,15 @@


            <arg value="--substitute" />

            <arg value="%FEDCLIENT%=${fedclient.zipfile}" />



            <arg value="--substitute" />

            <arg value="%MANAGER%=${manager.zipfile}" />



            <arg value="--substitute" />

            <arg value="%API%=${gbapi.zipfile}" />



            <arg value="--substitute" />

            <arg value="%EXPRESS%=${express.zipfile}" />



            <arg value="--substitute" />

            <arg value="%BUILDDATE%=${gb.versionDate}" />

@@ -298,12 +341,12 @@
      

      <echo>Building Gitblit WAR ${gb.version}</echo>

      

      <delete dir="${project.war.dir}" />		
      <delete dir="${project.war.dir}" />



      <!-- Copy web.xml and users.properties to WEB-INF -->

      <!-- Copy web.xml and users.conf to WEB-INF -->

      <copy todir="${project.war.dir}/WEB-INF">

         <fileset dir="${basedir}/distrib">

             <include name="users.properties" />

             <include name="users.conf" />

         </fileset>

         <fileset dir="${basedir}/src/WEB-INF">

             <include name="web.xml" />

@@ -314,11 +357,26 @@
         </fileset>

      </copy>

      

      <!-- Copy gitblit.properties as reference.properties -->

      <copy tofile="${project.war.dir}/WEB-INF/reference.properties" 
         file="${basedir}/distrib/gitblit.properties"/>

		
      <!-- Build the docs for the WAR build -->

      <antcall target="buildDocs" inheritall="true" inheritrefs="true">

         <param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" />

      </antcall>

		


      <!-- Copy the supported Groovy hook scripts -->

      <mkdir dir="${project.war.dir}/WEB-INF/groovy" />

      <copy todir="${project.war.dir}/WEB-INF/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="localclone.groovy" />

         </fileset>

      </copy>



      <!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties --> 

      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">

         <classpath refid="master-classpath" />

@@ -350,6 +408,7 @@
            <exclude name="jetty*.jar" />

            <exclude name="junit*.jar" />

            <exclude name="servlet*.jar" />

            <exclude name="javax.servlet*.jar" />

         </fileset>

      </copy>



@@ -357,12 +416,14 @@
      <mkdir dir="${project.war.dir}/WEB-INF/classes"/>

      <copy todir="${project.war.dir}/WEB-INF/classes">

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

            <exclude name="WEB-INF/web.xml" />

            <exclude name="WEB-INF/" />

            <exclude name="com/gitblit/tests/" />

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

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

            <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/MakeCertificate*.class" />

         </fileset>

      </copy>



@@ -393,7 +454,7 @@
         <classpath refid="master-classpath" />

         <manifest>

            <attribute name="Main-Class" value="com.gitblit.FederationClientLauncher" />

            <attribute name="Specification-Version" value="${gb.version}" />				
            <attribute name="Specification-Version" value="${gb.version}" />

            <attribute name="Release-Date" value="${gb.versionDate}" />

         </manifest>

      </genjar>

@@ -401,14 +462,246 @@
      <!-- Build the federation client zip file -->

      <zip destfile="${fedclient.zipfile}">

         <fileset dir="${basedir}">

            <include name="fedclient.jar" />				
            <include name="fedclient.jar" />

            <include name="LICENSE" />

            <include name="NOTICE" />

         </fileset>

         <fileset dir="${basedir}/distrib">

            <include name="federation.properties" />				
            <include name="federation.properties" />

         </fileset>

      </zip>

   </target>





   <!-- 
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

      Build a Gitblit filesystem for deployment to RedHat OpenShif Expresst

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

   -->

   <target name="buildExpress" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express">

      <echo>Building Gitblit Express for RedHat OpenShift ${gb.version}</echo>

		
      <delete dir="${project.express.dir}" />

		
      <!-- Create the OpenShift filesystem -->

      <property name="deployments.root" value="${project.express.dir}/deployments/ROOT.war"/>

      <mkdir dir="${deployments.root}" />

      <touch file="${project.express.dir}/deployments/ROOT.war.dodeploy" />



      <!-- Copy the Gitblit OpenShift readme file -->

      <copy tofile="${project.express.dir}/README.gitblit" 
         file="${basedir}/distrib/openshift.mkd"/>



      <!-- Copy LICENSE and NOTICE to WEB-INF -->

      <copy todir="${deployments.root}/WEB-INF">

         <fileset dir="${basedir}">

            <include name="LICENSE" />

            <include name="NOTICE" />

         </fileset>

      </copy>



      <!-- Copy gitblit.properties as reference.properties -->

      <copy tofile="${deployments.root}/WEB-INF/reference.properties" 
         file="${basedir}/distrib/gitblit.properties"/>



      <!-- Copy the supported Groovy hook scripts -->

      <mkdir dir="${deployments.root}/WEB-INF/groovy" />

      <copy todir="${deployments.root}/WEB-INF/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

         </fileset>

      </copy>

					
      <!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties -->

      <!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->

      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">

         <classpath refid="master-classpath" />



         <arg value="--sourceFile" />

         <arg value="${basedir}/src/WEB-INF/web.xml" />



         <arg value="--destinationFile" />

         <arg value="${deployments.root}/WEB-INF/web.xml" />



         <arg value="--propertiesFile" />

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

      </java>



      <!-- Gitblit resources -->

      <copy todir="${deployments.root}">

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

            <exclude name="thumbs.db" />

         </fileset>

      </copy>



      <!-- Gitblit library dependencies -->

      <mkdir dir="${deployments.root}/WEB-INF/lib"/>

      <copy todir="${deployments.root}/WEB-INF/lib">

         <fileset dir="${basedir}/ext">

            <exclude name="*-sources.jar" />

            <exclude name="*-javadoc.jar" />

            <exclude name="jcommander*.jar" />

            <exclude name="jetty*.jar" />

            <exclude name="junit*.jar" />

            <exclude name="servlet*.jar" />

            <exclude name="javax.servlet*.jar" />

         </fileset>

      </copy>



      <!-- Gitblit classes -->

      <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">

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

            <exclude name="WEB-INF/" />

            <exclude name="com/gitblit/tests/" />

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

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

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

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

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

         </fileset>

      </jar>



      <!-- Build Express Zip file -->

      <zip destfile="${express.zipfile}">

         <fileset dir="${project.express.dir}" />

      </zip>



   </target>





   <!-- 
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

      Build the stand-alone, Gitblit Manager

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

   -->

   <target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager">

      <echo>Building Gitblit Manager ${gb.version}</echo>



      <genjar jarfile="manager-${gb.version}.jar">

         <resource file="${basedir}/src/com/gitblit/client/splash.png" />

         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/gitweb-favicon.png" />

         <resource file="${basedir}/resources/git-orange-16x16.png" />

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

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

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

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

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

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

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

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

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

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

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

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

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

         <resource file="${basedir}/resources/search-icon.png" />

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

         <resource file="${basedir}/resources/commit_merge_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_ja.properties" />



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

         <classfilter>

            <exclude name="org.apache." />

            <exclude name="org.bouncycastle." />

            <exclude name="org.eclipse." />

            <exclude name="org.slf4j." />

            <exclude name="com.beust." />

            <exclude name="com.google." />

         </classfilter>

         <classpath refid="master-classpath" />

         <manifest>

            <attribute name="Main-Class" value="com.gitblit.client.GitblitManagerLauncher" />

            <attribute name="SplashScreen-Image" value="splash.png" />

            <attribute name="Specification-Version" value="${gb.version}" />

            <attribute name="Release-Date" value="${gb.versionDate}" />

         </manifest>

      </genjar>



      <!-- Build Manager Zip file -->

      <zip destfile="${manager.zipfile}">

         <fileset dir="${basedir}">

            <include name="manager-${gb.version}.jar" />

            <include name="LICENSE" />

            <include name="NOTICE" />

         </fileset>

      </zip>

   </target>

	
   <!-- 
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

         Build the Gitblit API client library

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

      -->

      <target name="buildApiLibrary" depends="compile" description="Builds the Gitblit RPC client library">

         <echo>Building Gitblit API Library ${gb.version}</echo>

		
         <!-- Build API Library jar -->

         <genjar jarfile="gbapi-${gb.version}.jar">

            <class name="com.gitblit.Keys" />

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

            <classpath refid="master-classpath" />

            <classfilter>

               <exclude name="com.google.gson." />

               <exclude name="com.sun.syndication." />

            </classfilter>

            <manifest>

               <attribute name="Specification-Version" value="${gb.version}" />

               <attribute name="Release-Date" value="${gb.versionDate}" />

            </manifest>

         </genjar>

			
         <!-- Build API sources jar -->

         <zip destfile="gbapi-${gb.version}-sources.jar">

            <fileset dir="${basedir}/src" defaultexcludes="yes">

               <include name="com/gitblit/Constants.java"/>

               <include name="com/gitblit/GitBlitException.java"/>

               <include name="com/gitblit/Keys.java"/>

                 <include name="com/gitblit/client/**/*.java"/>

                 <include name="com/gitblit/models/**/*.java"/>

                 <include name="com/gitblit/utils/**/*.java"/>			  		
            </fileset>

         </zip>

			
         <!-- Build API JavaDoc jar -->

         <javadoc destdir="${basedir}/javadoc">

            <fileset dir="${basedir}/src" defaultexcludes="yes">

               <include name="com/gitblit/Constants.java"/>

               <include name="com/gitblit/GitBlitException.java"/>

               <include name="com/gitblit/Keys.java"/>

                 <include name="com/gitblit/client/**/*.java"/>

                 <include name="com/gitblit/models/**/*.java"/>

                 <include name="com/gitblit/utils/**/*.java"/>			  		
            </fileset>

         </javadoc>

         <zip destfile="gbapi-${gb.version}-javadoc.jar">

            <fileset dir="${basedir}/javadoc" />

         </zip>

			
         <!-- Build the API library zip file -->

         <zip destfile="${gbapi.zipfile}">

            <fileset dir="${basedir}">

               <include name="gbapi-${gb.version}.jar" />

               <include name="gbapi-${gb.version}-sources.jar" />

               <include name="gbapi-${gb.version}-javadoc.jar" />

               <include name="LICENSE" />

               <include name="NOTICE" />

            </fileset>

            <fileset dir="${basedir}/ext">

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

               <exclude name="gson*-sources.jar" />

               <exclude name="gson*-javadoc.jar" />

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

               <exclude name="rome*-sources.jar" />

               <exclude name="rome*-javadoc.jar" />

            </fileset>

         </zip>

      </target>

		
      

   <!-- 

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

@@ -425,10 +718,9 @@
      <copy todir="${project.site.dir}">

         <!-- Copy selected Gitblit resources -->

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

            <include name="background.png" />

            <include name="bootstrap/**/*" />

            <include name="gitblit.css" />

            <include name="markdown.css" />

            <include name="gitblt_25.png" />

            <include name="gitblt_25_white.png" />

            <include name="gitblt-favicon.png" />

            <include name="lock_go_16x16.png" />

            <include name="lock_pull_16x16.png" />

@@ -438,11 +730,13 @@
            <include name="book_16x16.png" />

            <include name="blank.png" />

            <include name="federated_16x16.png" />

            <include name="arrow_page.png" />

         </fileset>



         <!-- Copy Doc images -->

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

            <include name="*.png" />

            <include name="*.gif" />

            <include name="*.js" />

         </fileset>

      </copy>

@@ -510,7 +804,7 @@
         <arg value="index=overview" />



         <arg value="--alias" />

         <arg value="properties=gitblit.properties" />

         <arg value="properties=settings" />



         <arg value="--substitute" />

         <arg value="%VERSION%=${gb.version}" />

@@ -523,6 +817,15 @@


         <arg value="--substitute" />

         <arg value="%FEDCLIENT%=${fedclient.zipfile}" />



         <arg value="--substitute" />

         <arg value="%MANAGER%=${manager.zipfile}" />



         <arg value="--substitute" />

         <arg value="%API%=${gbapi.zipfile}" />



         <arg value="--substitute" />

         <arg value="%EXPRESS%=${express.zipfile}" />



         <arg value="--substitute" />

         <arg value="%BUILDDATE%=${gb.versionDate}" />

@@ -547,31 +850,52 @@


      </java>   

   </target>

		




   <!--

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

      Compile from source, publish binaries, and build & deploy site

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

   -->

   <target name="buildAll" depends="buildGO,buildWAR,buildFederationClient,buildSite">		
   <target name="buildAll" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite">		
      <!-- Cleanup -->

      <delete dir="${project.build.dir}" />

      <delete dir="${project.war.dir}" />

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

      <delete dir="${project.express.dir}" />

   </target>

				


   

   <!--

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
      Update the gh-pages branch with the current site

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

   -->

   <target name="updateGhPages" depends="buildSite">

      <!-- Build gh-pages branch -->

      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildGhPages">

         <classpath refid="master-classpath" />

         <arg value="--sourceFolder" />

         <arg value="${basedir}/site" />



         <arg value="--repository" />

         <arg value="${basedir}" />

			
         <arg value="--obliterate" />

      </java>

   </target>

	


   <!-- 

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

      Publish binaries to Google Code

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

   -->

   <target name="publishBinaries" depends="buildGO,buildWAR" description="Publish the Gitblit binaries to Google Code">

		
   <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code">



      <echo>Uploading Gitblit ${gb.version} binaries</echo>

		
      <!-- Upload ZIP file -->



      <!-- Upload Gitblit GO ZIP file -->

      <gcupload 

          username="${googlecode.user}" 

          password="${googlecode.password}" 

@@ -580,8 +904,8 @@
          targetfilename="gitblit-${gb.version}.zip"

          summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"

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

			
      <!-- Upload WAR file -->



      <!-- Upload Gitblit WAR file -->

      <gcupload 

           username="${googlecode.user}" 

           password="${googlecode.password}" 

@@ -590,8 +914,8 @@
           targetfilename="gitblit-${gb.version}.war"

           summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)"

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

		
      <!-- Upload FedClient -->



      <!-- Upload Gitblit FedClient -->

      <gcupload 

         username="${googlecode.user}" 

         password="${googlecode.password}" 

@@ -600,19 +924,50 @@
         targetfilename="fedclient-${gb.version}.zip"

         summary="Gitblit Federation Client v${gb.version} (command-line tool to clone data from federated Gitblit instances)"

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



      <!-- Upload Gitblit Manager -->

      <gcupload 
         username="${googlecode.user}" 
         password="${googlecode.password}" 
         projectname="gitblit" 
         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 API Library -->

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

         summary="Gitblit API Library v${gb.version} (JSON RPC library to integrate with your software)"

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



      <!-- Upload Gitblit Express for RedHat OpenShift -->

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

         summary="Gitblit Express v${gb.version} (run Gitblit on RedHat's OpenShift cloud)"

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



   </target>



	


   <!--

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

      Publish site to hosting service

      Publish site to site hosting service

      You must add ext/commons-net-1.4.0.jar to your ANT classpath.

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

   -->

   <target name="publishSite" depends="buildSite" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >

		
   <target name="publishSite" depends="buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >



      <echo>Uploading Gitblit ${gb.version} website</echo>

		


      <ftp server="${ftp.server}"

         userid="${ftp.user}"

         password="${ftp.password}"

@@ -623,16 +978,16 @@
      </ftp>

   </target>



	


   <!--

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

      Compile from source, publish binaries, and build & deploy site

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

   -->

   <target name="publishAll" depends="publishBinaries,publishSite">		
   <target name="publishAll" depends="publishBinaries,publishSite">

      <!-- Cleanup -->

      <delete dir="${project.build.dir}" />

      <delete dir="${project.war.dir}" />

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

   </target>

</project>
</project>