From 3d1b428d612032539e9a070b2d31c7c24f265245 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:42:34 -0500
Subject: [PATCH] Localize the ticket activity tab field name changes
---
build.xml | 140 +++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 76 deletions(-)
diff --git a/build.xml b/build.xml
index 3e42cb9..71e7430 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" >
@@ -306,7 +279,8 @@
<!-- generate jar by traversing the class hierarchy of the specified
classes, exclude any classes in classpath jars -->
<mx:genjar tag="" includeresources="false" excludeClasspathJars="true"
- destfile="${project.targetDirectory}/fedclient.jar">
+ destfile="${project.targetDirectory}/fedclient.jar"
+ excludes="**/.class,**/*.java, **/Thumbs.db, **/*.mkd, com/gitblit/wicket/**">
<mainclass name="com.gitblit.FederationClient" />
<class name="com.gitblit.Keys" />
<launcher paths="ext" />
@@ -368,34 +342,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}">
@@ -600,17 +547,32 @@
<page name="upgrade Express" src="upgrade_express.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" />
- <page name="client app menus" src="setup_clientmenus.mkd" />
+ <menu name="Server Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <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" />
+ <page name="client app menus" src="setup_clientmenus.mkd" />
+ <page name="bugtraq" src="setup_bugtraq.mkd" />
+ <page name="mirrors" src="setup_mirrors.mkd" />
+ <page name="scaling" src="setup_scaling.mkd" />
+ <divider />
+ <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+ </menu>
<divider />
- <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+ <menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="git client setup" src="setup_client.mkd" />
+ <page name="eclipse plugin" src="eclipse_plugin.mkd" />
+ </menu>
<divider />
- <page name="git client setup" src="setup_client.mkd" />
- <divider />
+ <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="tickets_overview.mkd" />
+ <page name="using" src="tickets_using.mkd" />
+ <page name="barnum" src="tickets_barnum.mkd" />
+ <page name="setup" src="tickets_setup.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -647,11 +609,17 @@
<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="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />
+ <divider />
<link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
<link name="Discussion" src="${project.forumUrl}" />
<link name="Google+" src="${project.socialNetworkUrl}" />
+ <link name="Twitter" src="https://twitter.com/gitblit" />
<link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />
+ <divider />
+ <link name="+JamesMoger" src="https://plus.google.com/+JamesMoger" />
+ <link name="@JamesMoger" src="https://twitter.com/JamesMoger" />
</menu>
<divider />
</structure>
@@ -662,6 +630,7 @@
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>" />
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://github.com/gitblit/gitblit/pull/$3'>pull request #$3</a>" />
+ <regex searchPattern="\b(ticket)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://dev.gitblit.com/tickets/gitblit.git/$3'>ticket $3</a>" />
<!-- Set the logo from the mx:doc resources -->
<logo file="${project.resources.dir}/gitblt_25_white.png" />
@@ -916,17 +885,32 @@
<page name="upgrade Express" src="upgrade_express.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" />
- <page name="client app menus" src="setup_clientmenus.mkd" />
+ <menu name="Server Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <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" />
+ <page name="client app menus" src="setup_clientmenus.mkd" />
+ <page name="bugtraq" src="setup_bugtraq.mkd" />
+ <page name="mirrors" src="setup_mirrors.mkd" />
+ <page name="scaling" src="setup_scaling.mkd" />
+ <divider />
+ <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+ </menu>
<divider />
- <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
+ <menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="git client setup" src="setup_client.mkd" />
+ <page name="eclipse plugin" src="eclipse_plugin.mkd" />
+ </menu>
<divider />
- <page name="git client setup" src="setup_client.mkd" />
- <divider />
+ <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="tickets_overview.mkd" />
+ <page name="using" src="tickets_using.mkd" />
+ <page name="barnum" src="tickets_barnum.mkd" />
+ <page name="setup" src="tickets_setup.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -955,6 +939,7 @@
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>" />
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://github.com/gitblit/gitblit/pull/$3'>pull request #$3</a>" />
+ <regex searchPattern="\b(ticket)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://dev.gitblit.com/tickets/gitblit.git/$3'>ticket $3</a>" />
<!-- Set the logo from the mx:doc resources -->
<logo file="${project.resources.dir}/gitblt_25_white.png" />
@@ -1010,6 +995,9 @@
<include name="localclone.groovy" />
<include name="fogbugz.groovy" />
<include name="thebuggenie.groovy" />
+ <include name="fisheye.groovy" />
+ <include name="redmine-fetch.groovy" />
+ <include name="subgit.groovy" />
</fileset>
</copy>
</sequential>
--
Gitblit v1.9.1