From b5798e1e6cf15da4eb33647190e127b53410c620 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Jul 2013 14:49:06 -0400
Subject: [PATCH] Improvements to handling internal accounts (anonymous, federation user)
---
build.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/build.xml b/build.xml
index 9ae494d..6138c20 100644
--- a/build.xml
+++ b/build.xml
@@ -4,14 +4,17 @@
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Retrieve Moxie Toolkit
+
+ documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.7.1" />
- <property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />
+ <property name="moxie.version" value="0.7.4" />
+ <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" />
<!-- Download Moxie from it's Maven repository to user.home -->
+ <mkdir dir="${moxie.dir}" />
<get src="${moxie.url}/org/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"
dest="${moxie.dir}" skipexisting="true" verbose="true" />
@@ -33,8 +36,9 @@
<target name="prepare">
<!-- Setup Ant build from build.moxie and resolve dependencies.
- if it exists, build.properties is automatically loaded -->
- <mx:init verbose="no" />
+ If it exists, build.properties is automatically loaded.
+ Explicitly set mxroot allowing CI servers to override the default. -->
+ <mx:init verbose="no" mxroot="${moxie.dir}" />
<!-- Set Ant project properties -->
<property name="distribution.zipfile" value="gitblit-${project.version}.zip" />
@@ -97,6 +101,11 @@
this file is only used for parsing setting descriptions. -->
<copy tofile="${project.src.dir}/reference.properties" overwrite="true"
file="${project.distrib.dir}/data/gitblit.properties" />
+
+ <!-- copy clientapps.json to the source directory.
+ this file is only used if a local file is not provided. -->
+ <copy tofile="${project.src.dir}/clientapps.json" overwrite="true"
+ file="${project.distrib.dir}/data/clientapps.json" />
<!--
upgrade existing workspace to data directory
@@ -135,8 +144,8 @@
outputclass="com.gitblit.Keys"
todir="${project.src.dir}" />
- <!-- Compile project incrementally -->
- <mx:javac scope="compile" clean="false" />
+ <!-- Compile project -->
+ <mx:javac scope="compile" clean="true" />
</target>
@@ -263,7 +272,9 @@
<prepareDataDirectory toDir="${webinf}/data" />
<!-- Build the WAR web.xml from the prototype web.xml -->
- <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" />
+ <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml">
+ <replace token="@gb.version@" value="${project.version}" />
+ </mx:webxml>
<!-- Gitblit jar -->
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -274,7 +285,8 @@
<class name="com.gitblit.EnforceAuthenticationFilter" />
<class name="com.gitblit.FederationServlet" />
<class name="com.gitblit.GitFilter" />
- <class name="com.gitblit.GitServlet" />
+ <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" />
@@ -282,7 +294,13 @@
<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.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" />
</mx:genjar>
<!-- Build the WAR file -->
@@ -370,8 +388,10 @@
<!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->
<!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->
<mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml"
- propertiesFile="${project.distrib.dir}/data/gitblit.properties"
- skip="server.*" />
+ propertiesFile="${project.distrib.dir}/data/gitblit.properties"
+ skip="server.*">
+ <replace token="@gb.version@" value="${project.version}" />
+ </mx:webxml>
<!-- Gitblit classes -->
<mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -382,7 +402,8 @@
<class name="com.gitblit.EnforceAuthenticationFilter" />
<class name="com.gitblit.FederationServlet" />
<class name="com.gitblit.GitFilter" />
- <class name="com.gitblit.GitServlet" />
+ <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" />
@@ -390,7 +411,13 @@
<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.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" />
</mx:genjar>
<!-- Build Express Zip file -->
@@ -680,7 +707,8 @@
</menu>
<menu name="links">
- <link name="Demo" src="https://demo-gitblit.rhcloud.com" />
+ <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
+ <link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
<divider />
<link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
@@ -896,7 +924,8 @@
<page name="older releases" src="releasehistory.mkd" />
</menu>
<menu name="links">
- <link name="Demo" src="https://demo-gitblit.rhcloud.com" />
+ <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="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
@@ -944,7 +973,7 @@
<fileset dir="${project.distrib.dir}/data">
<include name="users.conf" />
<include name="projects.conf" />
- <include name="gitblit.properties" />
+ <include name="gitblit.properties" />
</fileset>
</copy>
<mkdir dir="@{toDir}/groovy" />
@@ -991,7 +1020,8 @@
<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" />
- <mx:jar destfile="${project.jar}" includeresources="true" />
+ <property name="resourceFolderPrefix" value="" />
+ <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
<exec executable="mvn">
<arg value="install:install-file" />
--
Gitblit v1.9.1