From f8f6aa4d07cdfaaf23e24bf9eaf0a5fb9b437dda Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Update unit tests for refactored architecture

---
 build.xml |   64 +++-----------------------------
 1 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/build.xml b/build.xml
index e2c46b2..ab6699b 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 		documentation @ http://gitblit.github.io/moxie
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<property name="moxie.version" value="0.9.0" />
+	<property name="moxie.version" value="0.9.1" />
 	<property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
 	<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
 	<property name="moxie.dir" value="${user.home}/.moxie" />
@@ -247,34 +247,7 @@
 		</mx:webxml>
 
 		<!-- Gitblit jar -->
-		<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" />
-			<class name="com.gitblit.FederationServlet" />
-			<class name="com.gitblit.GitFilter" />
-			<class name="com.gitblit.git.GitServlet" />
-			<class name="com.gitblit.LogoServlet" />
-			<class name="com.gitblit.PagesFilter" />
-			<class name="com.gitblit.PagesServlet" />
-			<class name="com.gitblit.RobotsTxtServlet" />
-			<class name="com.gitblit.RpcFilter" />
-			<class name="com.gitblit.RpcServlet" />
-			<class name="com.gitblit.SyndicationFilter" />
-			<class name="com.gitblit.SyndicationServlet" />
-			<class name="com.gitblit.SparkleShareInviteServlet" />
-			<class name="com.gitblit.wicket.GitblitWicketFilter" />
-			<class name="com.gitblit.wicket.GitBlitWebApp" />
-			<!-- Manually include alternative User Services -->
-			<class name="com.gitblit.LdapUserService" />
-			<class name="com.gitblit.RedmineUserService" />
-			<class name="com.gitblit.SalesforceUserService" />
-			<class name="com.gitblit.WindowsUserService" />
-			<class name="com.gitblit.PAMUserService" />
-		</mx:genjar>
+		<mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />
 
 		<!-- Build the WAR file -->
 		<mx:zip basedir="${war.dir}" destfile="${project.targetDirectory}/${distribution.warfile}" compress="true" >
@@ -368,34 +341,7 @@
 		</mx:webxml>
 
 		<!-- Gitblit classes -->
-		<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" />
-			<class name="com.gitblit.FederationServlet" />
-			<class name="com.gitblit.GitFilter" />
-			<class name="com.gitblit.git.GitServlet" />
-			<class name="com.gitblit.LogoServlet" />
-			<class name="com.gitblit.PagesFilter" />
-			<class name="com.gitblit.PagesServlet" />
-			<class name="com.gitblit.RobotsTxtServlet" />
-			<class name="com.gitblit.RpcFilter" />
-			<class name="com.gitblit.RpcServlet" />
-			<class name="com.gitblit.SyndicationFilter" />
-			<class name="com.gitblit.SyndicationServlet" />
-			<class name="com.gitblit.SparkleShareInviteServlet" />
-			<class name="com.gitblit.wicket.GitblitWicketFilter" />
-			<class name="com.gitblit.wicket.GitBlitWebApp" />
-			<!-- Manually include alternative User Services -->
-			<class name="com.gitblit.LdapUserService" />
-			<class name="com.gitblit.RedmineUserService" />
-			<class name="com.gitblit.SalesforceUserService" />
-			<class name="com.gitblit.WindowsUserService" />
-			<class name="com.gitblit.PAMUserService" />
-		</mx:genjar>
+		<mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />
 
 		<!-- Build Express Zip file -->
 		<mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}">
@@ -661,6 +607,7 @@
 			<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />
 			
 			<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />
+			<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />
 			
 			<!-- Set the logo from the mx:doc resources -->
 			<logo file="${project.resources.dir}/gitblt_25_white.png" />
@@ -953,7 +900,8 @@
 				<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />
 				
 				<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />
-				
+				<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />
+
 				<!-- Set the logo from the mx:doc resources -->
 				<logo file="${project.resources.dir}/gitblt_25_white.png" />
 				<favicon file="${project.resources.dir}/gitblt-favicon.png" />

--
Gitblit v1.9.1