From fbe265fa787e4be9cb63c6bae2ef30b9400d9afc Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Thu, 18 Jul 2013 10:11:04 -0400
Subject: [PATCH] Fixes findbugs warning - dereferencing null in exception case
---
build.xml | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/build.xml b/build.xml
index 713578f..4939f7f 100644
--- a/build.xml
+++ b/build.xml
@@ -280,6 +280,7 @@
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
<!-- Specify all web.xml servlets and filters -->
<class name="com.gitblit.GitBlit" />
+ <class name="com.gitblit.Keys" />
<class name="com.gitblit.DownloadZipFilter" />
<class name="com.gitblit.DownloadZipServlet" />
<class name="com.gitblit.EnforceAuthenticationFilter" />
@@ -335,6 +336,7 @@
<mx:genjar tag="" includeresources="false" excludeClasspathJars="true"
destfile="${project.targetDirectory}/fedclient.jar">
<mainclass name="com.gitblit.FederationClient" />
+ <class name="com.gitblit.Keys" />
<launcher paths="ext" />
<resource file="${project.compileOutputDirectory}/log4j.properties" />
</mx:genjar>
@@ -395,6 +397,7 @@
<!-- Gitblit classes -->
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
+ <class name="com.gitblit.Keys" />
<!-- Specify all web.xml servlets and filters -->
<class name="com.gitblit.GitBlit" />
<class name="com.gitblit.DownloadZipFilter" />
@@ -484,6 +487,11 @@
</resource>
<mainclass name="com.gitblit.client.GitblitManagerLauncher" />
+ <class name="com.gitblit.Keys" />
+ <class name="com.gitblit.client.GitblitClient" />
+ <class name="com.gitblit.models.FederationModel" />
+ <class name="com.gitblit.models.FederationProposal" />
+ <class name="com.gitblit.models.FederationSet" />
<manifest>
<attribute name="SplashScreen-Image" value="splash.png" />
</manifest>
@@ -547,6 +555,7 @@
</resource>
<mainclass name="com.gitblit.authority.Launcher" />
+ <class name="com.gitblit.Keys" />
<manifest>
<attribute name="SplashScreen-Image" value="splash.png" />
</manifest>
@@ -817,51 +826,72 @@
Publish binaries to Google Code
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="publishBinaries" 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>
--
Gitblit v1.9.1