From d5ee557ef1370b5b9953dca1c8d3b14d0bd68a98 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 May 2013 22:31:58 -0400
Subject: [PATCH] Do not use problematic WicketUtils fluid api
---
build.xml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 9ae494d..3355529 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" />
@@ -274,7 +278,7 @@
<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.PagesFilter" />
<class name="com.gitblit.PagesServlet" />
<class name="com.gitblit.RobotsTxtServlet" />
@@ -283,6 +287,9 @@
<class name="com.gitblit.SyndicationFilter" />
<class name="com.gitblit.SyndicationServlet" />
<class name="com.gitblit.wicket.GitBlitWebApp" />
+ <!-- Manually include alternative User Services -->
+ <class name="com.gitblit.LdapUserService" />
+ <class name="com.gitblit.RedmineUserService" />
</mx:genjar>
<!-- Build the WAR file -->
@@ -382,7 +389,7 @@
<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.PagesFilter" />
<class name="com.gitblit.PagesServlet" />
<class name="com.gitblit.RobotsTxtServlet" />
@@ -391,6 +398,9 @@
<class name="com.gitblit.SyndicationFilter" />
<class name="com.gitblit.SyndicationServlet" />
<class name="com.gitblit.wicket.GitBlitWebApp" />
+ <!-- Manually include alternative User Services -->
+ <class name="com.gitblit.LdapUserService" />
+ <class name="com.gitblit.RedmineUserService" />
</mx:genjar>
<!-- Build Express Zip file -->
@@ -991,7 +1001,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