From 436bd3f0ecdee282c503a9eb0f7a240b7a68ff49 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 11 Apr 2014 14:51:50 -0400
Subject: [PATCH] Merged #6 "Support serving repositories over the SSH transport"

---
 build.xml |   68 ++++++++++++++++++++++++----------
 1 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index 32cb9f5..f9b171d 100644
--- a/build.xml
+++ b/build.xml
@@ -561,19 +561,24 @@
 						<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
 					</menu>
 					<divider />
-					<menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
-						<page name="git client setup" src="setup_client.mkd" />
-						<page name="eclipse plugin" src="eclipse_plugin.mkd" />
+					<menu name="Client Usage" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+						<page name="using HTTP/HTTPS" src="setup_transport_http.mkd" />
+						<page name="using SSH" src="setup_transport_ssh.mkd" />
+						<page name="using the Eclipse plugin" src="eclipse_plugin.mkd" />
 					</menu>
 					<divider />
-					<menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
-					  <page name="overview" src="tickets_overview.mkd" />
-					  <page name="using" src="tickets_using.mkd" />
-					  <page name="barnum" src="tickets_barnum.mkd" />
+					<menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+					  <page name="overview" src="tickets_overview.mkd" />
+					  <page name="using" src="tickets_using.mkd" />
+					  <page name="barnum" src="tickets_barnum.mkd" />
 					  <page name="setup" src="tickets_setup.mkd" />
-					  <page name="replication &amp; advanced administration" src="tickets_replication.mkd" />
-					</menu>
-					<divider />
+					  <page name="replication &amp; advanced administration" src="tickets_replication.mkd" />
+					</menu>
+					<divider />
+					<menu name="Plugins" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+					  <page name="plugins" src="setup_plugins.mkd" />
+					</menu>
+					<divider />
 					<page name="federation" src="federation.mkd" />
 					<divider />
 					<page name="settings" src="properties.mkd" />
@@ -616,6 +621,8 @@
 					<link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
 					<divider />
 					<link name="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />
+					<divider />
+					<link name="Plugin Registry" src="http://plugins.gitblit.com" />
 					<divider />
 					<link name="Github" src="${project.scmUrl}" />
 					<link name="Issues" src="${project.issuesUrl}" />
@@ -877,19 +884,24 @@
 							<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
 						</menu>
 						<divider />
-						<menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
-							<page name="git client setup" src="setup_client.mkd" />
-							<page name="eclipse plugin" src="eclipse_plugin.mkd" />
+						<menu name="Client Usage" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+							<page name="using HTTP/HTTPS" src="setup_transport_http.mkd" />
+							<page name="using SSH" src="setup_transport_ssh.mkd" />
+							<page name="using the Eclipse plugin" src="eclipse_plugin.mkd" />
 						</menu>
 						<divider />
-						<menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
-							<page name="overview" src="tickets_overview.mkd" />
-							<page name="using" src="tickets_using.mkd" />
-							<page name="barnum" src="tickets_barnum.mkd" />
-							<page name="setup" src="tickets_setup.mkd" />
+						<menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+							<page name="overview" src="tickets_overview.mkd" />
+							<page name="using" src="tickets_using.mkd" />
+							<page name="barnum" src="tickets_barnum.mkd" />
+							<page name="setup" src="tickets_setup.mkd" />
 							<page name="replication &amp; advanced administration" src="tickets_replication.mkd" />
-						</menu>
-						<divider />
+						</menu>
+						<divider />
+						<menu name="Plugins" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+						  <page name="plugins" src="setup_plugins.mkd" />
+						</menu>
+						<divider />
 						<page name="federation" src="federation.mkd" />
 						<divider />
 						<page name="settings" src="properties.mkd" />
@@ -905,6 +917,8 @@
 					<menu name="links">
 						<link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
 						<link name="Gitbilt Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
+						<divider />
+						<link name="Plugin Registry" src="http://plugins.gitblit.com" />
 						<divider />
 						<link name="Github" src="${project.scmUrl}" />
 						<link name="Issues" src="${project.issuesUrl}" />
@@ -1040,5 +1054,19 @@
 			<arg value="-DcreateChecksum=true" />
 		</exec>
 	</target>
+
+	<!--
+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		Install Gitblit JAR for usage as Moxie artifact
+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	-->
+	<target name="installMoxie" depends="compile" description="Install Gitblit JAR as a Moxie artifact">
+		<local name="project.jar" />
+		<property name="project.jar" value="${project.targetDirectory}/${project.artifactId}-${project.version}.jar" />
+		<property name="resourceFolderPrefix" value="" />
+		<mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+
+		<mx:install />
+	</target>
 	
 </project>

--
Gitblit v1.9.1