From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Fixes sort, page building and search functions on "my tickets" page.
---
build.xml | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index 0baf090..2fd49b8 100644
--- a/build.xml
+++ b/build.xml
@@ -558,8 +558,6 @@
<page name="mirrors" src="setup_mirrors.mkd" />
<page name="scaling" src="setup_scaling.mkd" />
<divider />
- <page name="plugins" src="setup_plugins.mkd" />
- <divider />
<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
</menu>
<divider />
@@ -575,6 +573,11 @@
<page name="barnum" src="tickets_barnum.mkd" />
<page name="setup" src="tickets_setup.mkd" />
<page name="replication & advanced administration" src="tickets_replication.mkd" />
+ </menu>
+ <divider />
+ <menu name="Plugins" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="plugins_overview.mkd" />
+ <page name="extension points" src="plugins_extensions.mkd" />
</menu>
<divider />
<page name="federation" src="federation.mkd" />
@@ -619,6 +622,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,8 +882,6 @@
<page name="mirrors" src="setup_mirrors.mkd" />
<page name="scaling" src="setup_scaling.mkd" />
<divider />
- <page name="plugins" src="setup_plugins.mkd" />
- <divider />
<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
</menu>
<divider />
@@ -896,6 +899,11 @@
<page name="replication & advanced administration" src="tickets_replication.mkd" />
</menu>
<divider />
+ <menu name="Plugins" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="plugins_overview.mkd" />
+ <page name="extension points" src="plugins_extensions.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -911,6 +919,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}" />
@@ -1011,13 +1021,23 @@
-->
<target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">
<local name="project.jar" />
- <property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
+ <property name="project.jar" value="${project.outputDirectory}/${project.artifactId}.jar" />
<property name="resourceFolderPrefix" value="" />
- <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+ <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+ <!-- Install Binary jar -->
<exec executable="mvn">
<arg value="install:install-file" />
<arg value="-Dfile=${project.jar}" />
+ <arg value="-DpomFile=${basedir}/pom.xml" />
+ <arg value="-DcreateChecksum=true" />
+ </exec>
+
+ <!-- Install Sources jar -->
+ <exec executable="mvn">
+ <arg value="install:install-file" />
+ <arg value="-Dfile=${project.outputDirectory}/${project.artifactId}-sources.jar" />
+ <arg value="-Dclassifier=sources" />
<arg value="-DpomFile=${basedir}/pom.xml" />
<arg value="-DcreateChecksum=true" />
</exec>
@@ -1035,7 +1055,7 @@
<target name="uploadMaven" depends="compile" description="Upload Gitblit JAR to remote Maven repository">
<local name="project.jar" />
<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
- <mx:jar destfile="${project.jar}" includeresources="true" />
+ <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" />
<exec executable="mvn">
<arg value="deploy:deploy-file" />
@@ -1056,7 +1076,7 @@
<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:jar destfile="${project.jar}" packageSources="true" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
<mx:install />
</target>
--
Gitblit v1.9.1