From 889e695280f9b82cc31aeb5e8a28b60f8cd6c260 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Jul 2013 13:10:04 -0400
Subject: [PATCH] Adjust unit test to confirm null permission fix (issue-259)
---
build.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 894e51a..8910c3c 100644
--- a/build.xml
+++ b/build.xml
@@ -286,6 +286,7 @@
<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" />
@@ -299,6 +300,7 @@
<class name="com.gitblit.LdapUserService" />
<class name="com.gitblit.RedmineUserService" />
<class name="com.gitblit.SalesforceUserService" />
+ <class name="com.gitblit.WindowsUserService" />
</mx:genjar>
<!-- Build the WAR file -->
@@ -401,6 +403,7 @@
<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" />
@@ -414,6 +417,7 @@
<class name="com.gitblit.LdapUserService" />
<class name="com.gitblit.RedmineUserService" />
<class name="com.gitblit.SalesforceUserService" />
+ <class name="com.gitblit.WindowsUserService" />
</mx:genjar>
<!-- Build Express Zip file -->
@@ -668,8 +672,27 @@
<page name="features" src="features.mkd" />
<page name="screenshots" src="screenshots.mkd" />
</menu>
- <menu name="documentation">
- <page name="setup" src="setup.mkd" />
+ <menu name="documentation" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <menu name="Gitblit GO" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="setup GO" src="setup_go.mkd" />
+ <page name="upgrade GO" src="upgrade_go.mkd" />
+ </menu>
+ <divider />
+ <menu name="Gitblit WAR" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="setup WAR" src="setup_war.mkd" />
+ <page name="upgrade WAR" src="upgrade_war.mkd" />
+ </menu>
+ <divider />
+ <page name="administration" src="administration.mkd" />
+ <page name="authentication" src="setup_authentication.mkd" />
+ <page name="push hooks" src="setup_hooks.mkd" />
+ <page name="lucene indexing" src="setup_lucene.mkd" />
+ <page name="reverse proxies" src="setup_proxy.mkd" />
+ <divider />
+ <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+ <divider />
+ <page name="git client setup" src="setup_client.mkd" />
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -906,11 +929,30 @@
<page name="features" src="features.mkd" />
</menu>
<menu name="documentation">
- <page name="setup" src="setup.mkd" />
+ <menu name="Gitblit GO" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="setup GO" src="setup_go.mkd" />
+ <page name="upgrade GO" src="upgrade_go.mkd" />
+ </menu>
+ <divider />
+ <menu name="Gitblit WAR" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="setup WAR" src="setup_war.mkd" />
+ <page name="upgrade WAR" src="upgrade_war.mkd" />
+ </menu>
+ <divider />
+ <page name="administration" src="administration.mkd" />
+ <page name="authentication" src="setup_authentication.mkd" />
+ <page name="push hooks" src="setup_hooks.mkd" />
+ <page name="lucene indexing" src="setup_lucene.mkd" />
+ <page name="reverse proxies" src="setup_proxy.mkd" />
+ <divider />
+ <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+ <divider />
+ <page name="git client setup" src="setup_client.mkd" />
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
- <page name="faq" src="faq.mkd" />
<page name="settings" src="properties.mkd" />
+ <page name="faq" src="faq.mkd" />
<divider />
<page name="design" src="design.mkd" />
<page name="rpc" src="rpc.mkd" />
@@ -972,6 +1014,12 @@
<include name="gitblit.properties" />
</fileset>
</copy>
+ <mkdir dir="@{toDir}/git" />
+ <copy todir="@{toDir}/git" overwrite="false">
+ <fileset dir="${project.distrib.dir}/data/git">
+ <include name="project.mkd" />
+ </fileset>
+ </copy>
<mkdir dir="@{toDir}/groovy" />
<copy todir="@{toDir}/groovy">
<fileset dir="${project.distrib.dir}/data/groovy">
--
Gitblit v1.9.1