		@@ -26,6 +26,2 @@ <?xml version="1.0" encoding="UTF-8"?>
		<target name="buildinfo">
		<!-- build date -->
		<tstamp>
		<format property="gb.buildDate" pattern="yyyy-MM-dd" />
		</tstamp>

		@@ -46,3 +42,18 @@ <!-- extract Gitblit version number from source code -->
		</loadfile>


		<!-- extract Gitblit version date from source code -->
		<loadfile property="gb.versionDate" srcfile="${basedir}/src/com/gitblit/Constants.java">
		<filterchain>
		<linecontains>
		<contains value="public static final String VERSION_DATE = " />
		</linecontains>
		<striplinebreaks />
		<tokenfilter>
		<replacestring from="public static final String VERSION_DATE = "" to="" />
		<replacestring from="";" to="" />
		<trim />
		</tokenfilter>
		</filterchain>
		</loadfile>

		<!-- extract JGit version number from source code -->
		@@ -234,3 +245,3 @@ <loadfile property="jgit.version" srcfile="${basedir}/src/com/gitblit/Constants.java">
		<arg value="--substitute" />
		<arg value="%BUILDDATE%=${gb.buildDate}" />
		<arg value="%BUILDDATE%=${gb.versionDate}" />

		@@ -430,3 +441,3 @@ <arg value="--substitute" />
		<arg value="--substitute" />
		<arg value="%BUILDDATE%=${gb.buildDate}" />
		<arg value="%BUILDDATE%=${gb.versionDate}" />

		@@ -433,0 +444,0 @@ <arg value="--substitute" />

+1

-1

distrib/gitblit.properties

		@@ -64,3 +64,3 @@ #

		# Allow dyanamic zip downloads.
		# Allow dynamic zip downloads.
		web.allowZipDownloads = true
		@@ -67,0 +67,0 @@

+38

-2

distrib/installService.cmd

		@@ -1,2 +0,38 @@
		set JVM=C:\Program Files\Java\jdk1.6.0_26
		JavaService.exe -install gitblit "%JVM%\jre\bin\server\jvm.dll" -Xmx1024M -Djava.class.path=%CD%\gitblit.jar;"%JVM%\lib\tools.jar" -start com.gitblit.Launcher -params --storePassword gitblit -stop com.gitblit.Launcher -params --stop -out %CD%\logs\stdout.log -err %CD%\logs\stderr.log -current %CD%
		@REM Install Gitblit as a Windows service.

		@REM gitblitw.exe (prunmgr.exe) is a GUI application for monitoring
		@REM and configuring the Gitblit procrun service.
		@REM
		@REM By default this tool launches the service properties dialog
		@REM but it also has some other very useful functionality.
		@REM
		@REM http://commons.apache.org/daemon/procrun.html

		@REM arch = x86, amd64, or ia32
		SET ARCH=amd64

		@REM Be careful not to introduce trailing whitespace after the ^ characters.
		@REM Use ; or # to separate values in the --StartParams parameter.
		"%CD%\%ARCH%\prunsrv.exe" //IS//gitblit ^
		--DisplayName="gitblit" ^
		--Description="a pure Java Git solution" ^
		--Startup=auto ^
		--LogPath="%CD%\logs" ^
		--LogLevel=INFO ^
		--LogPrefix=gitblit ^
		--StdOutput=auto ^
		--StdError=auto ^
		--StartPath="%CD%" ^
		--StartClass=com.gitblit.Launcher ^
		--StartMethod=main ^
		--StartParams="--storePassword;gitblit" ^
		--StartMode=jvm ^
		--StopPath="%CD%" ^
		--StopClass=com.gitblit.Launcher ^
		--StopMethod=main ^
		--StopParams="--stop" ^
		--StopMode=jvm ^
		--Classpath="%CD%\gitblit.jar" ^
		--Jvm=auto ^
		--JvmMx=1024

+5

-1

distrib/makekeystore_jdk.cmd

		@@ -0,2 +1,6 @@
		@REM --------------------------------------------------------------------------
		@REM Set HOSTNAME to the server's hostname
		@REM --------------------------------------------------------------------------
		@SET HOSTNAME=localhost
		@del keystore
		@keytool -keystore keystore -alias localhost -genkey -keyalg RSA -dname "CN=localhost, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US"
		@keytool -keystore keystore -alias %HOSTNAME% -genkey -keyalg RSA -dname "CN=%HOSTNAME%, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US"

+5

-1

distrib/makekeystore.cmd

		@@ -0,2 +1,6 @@
		@REM --------------------------------------------------------------------------
		@REM Set HOSTNAME to the server's hostname
		@REM --------------------------------------------------------------------------
		@SET HOSTNAME=localhost
		@del keystore
		@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.MakeCertificate --alias localhost --subject "CN=localhost, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US"
		@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.MakeCertificate --hostname %HOSTNAME% --subject "CN=%HOSTNAME%, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US"

+5

-1

distrib/uninstallService.cmd

		@@ -1,1 +0,5 @@
		javaservice -uninstall gitblit
		@REM arch = x86, amd64, or ia32
		SET ARCH=amd64

		@REM Delete the gitblit service
		"%CD%\%ARCH%\prunsrv.exe" //DS//gitblit

+4

-4

NOTICE

		@@ -19,8 +19,8 @@ Gitblit
		---------------------------------------------------------------------------
		JavaService
		Commons Daemon
		---------------------------------------------------------------------------
		JavaService, released under the
		BSD License and the Lesser GNU Public License.
		Commons Daemon, released under the
		Apache Software License, Version 2.0.

		http://forge.ow2.org/projects/javaservice
		http://commons.apache.org/daemon

		@@ -27,0 +27,0 @@ ---------------------------------------------------------------------------

+5

-1

src/com/gitblit/Constants.java

		@@ -26,6 +26,10 @@ /*
		// and only use A-Z a-z 0-9 .-_ in the string.
		public static final String VERSION = "0.5.0";
		public static final String VERSION = "0.5.1";

		// The build script extracts this exact line so be careful editing it
		// and only use A-Z a-z 0-9 .-_ in the string.
		public static final String VERSION_DATE = "2011-06-28";

		// The build script extracts this exact line so be careful editing it
		// and only use A-Z a-z 0-9 .-_ in the string.
		public static final String JGIT_VERSION = "JGit 1.0.0 (201106090707-r)";
		@@ -32,0 +36,0 @@

+3

-3

src/com/gitblit/MakeCertificate.java

		@@ -60,3 +60,3 @@ /*
		File keystore = new File("keystore");
		generateSelfSignedCertificate(params.alias, keystore, params.storePassword, params.subject);
		generateSelfSignedCertificate(params.hostname, keystore, params.storePassword, params.subject);
		}
		@@ -162,4 +162,4 @@

		@Parameter(names = { "--alias" }, description = "Server alias", required = true)
		public String alias;
		@Parameter(names = { "--hostname" }, description = "Server Hostname", required = true)
		public String hostname;

		@@ -166,0 +166,0 @@ @Parameter(names = { "--subject" }, description = "Certificate subject", required = true)

-2

distrib/installService64.cmd

		set JVM=C:\Program Files\Java\jdk1.6.0_26
		JavaService64.exe -install gitblit "%JVM%\jre\bin\server\jvm.dll" -Djava.class.path=%CD%\gitblit.jar;"%JVM%\lib\tools.jar" -start com.gitblit.Launcher -params --storePassword gitblit -stop com.gitblit.Launcher -params --stop -out %CD%\logs\stdout.log -err %CD%\logs\stderr.log -current %CD%

distrib/JavaService.exe

Sorry, the diff of this file is not supported yet

distrib/JavaService64.exe

Sorry, the diff of this file is not supported yet

-1

distrib/uninstallService64.cmd

javaservice64 -uninstall gitblit

docs/01_features.mkd

Sorry, the diff of this file is not supported yet

docs/01_setup.mkd

Sorry, the diff of this file is not supported yet

docs/02_faq.mkd

Sorry, the diff of this file is not supported yet

docs/04_design.mkd

Sorry, the diff of this file is not supported yet

docs/04_releases.mkd

Sorry, the diff of this file is not supported yet