From 3a9e76b63f09a32e0b6812e18ffff00fab8e58e6 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] Flattened IGitblitManager, GitblitManager, and GitBlit classes
---
build.xml | 207 ++++++++++-----------------------------------------
1 files changed, 40 insertions(+), 167 deletions(-)
diff --git a/build.xml b/build.xml
index 642d874..ab6699b 100644
--- a/build.xml
+++ b/build.xml
@@ -8,14 +8,14 @@
documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.7.4" />
+ <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" />
<!-- 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}"
+ <get src="${moxie.url}/com/gitblit/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"
dest="${moxie.dir}" skipexisting="true" verbose="true" />
<!-- Register Moxie tasks -->
@@ -49,7 +49,8 @@
<property name="authority.zipfile" value="authority-${project.version}.zip" />
<property name="gbapi.zipfile" value="gbapi-${project.version}.zip" />
<property name="express.zipfile" value="express-${project.version}.zip" />
-
+ <property name="maven.directory" value="${basedir}/../gitblit-maven" />
+
<!-- Download links -->
<property name="gc.url" value="http://code.google.com/p/gitblit/downloads/detail?name=" />
</target>
@@ -61,22 +62,6 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<target name="clean" depends="prepare" description="Cleanup all build artifacts and directories">
- <!-- cleanup legacy build structure -->
- <!-- this can be eliminated after 1.3.0 release -->
- <delete>
- <fileset dir="${basedir}">
- <include name="*.zip" />
- <include name="*.war" />
- <include name="*.jar" />
- </fileset>
- </delete>
- <delete dir="${basedir}/deploy" failonerror="false" />
- <delete dir="${basedir}/express" failonerror="false" />
- <delete dir="${basedir}/jar" failonerror="false" />
- <delete dir="${basedir}/javadoc" failonerror="false" />
- <delete dir="${basedir}/site" failonerror="false" />
- <delete dir="${basedir}/temp" failonerror="false" />
- <delete dir="${basedir}/war" failonerror="false" />
<!-- Clean build and target directories -->
<mx:clean />
@@ -106,29 +91,7 @@
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
- this code can be eliminated after 1.3.0 release
- -->
- <move todir="${basedir}/data" overwrite="true" failonerror="false">
- <fileset dir="${basedir}">
- <include name="users.conf" />
- <include name="projects.conf" />
- <include name="gitblit.properties" />
- <include name="serverKeyStore.jks" />
- <include name="serverTrustStore.jks" />
- </fileset>
- </move>
- <move todir="${basedir}/data/certs" overwrite="true" failonerror="false">
- <fileset dir="${basedir}/certs" />
- </move>
- <move todir="${basedir}/data/git" overwrite="true" failonerror="false">
- <fileset dir="${basedir}/git" />
- </move>
- <move todir="${basedir}/data/proposals" overwrite="true" failonerror="false">
- <fileset dir="${basedir}/proposals" />
- </move>
+
</target>
@@ -185,6 +148,13 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<target name="run" depends="compile" description="Run Gitblit GO">
+ <!-- copy static files -->
+ <copy todir="${basedir}/build/classes" overwrite="false">
+ <fileset dir="${project.resources.dir}">
+ <exclude name="thumbs.db" />
+ <exclude name="*.mkd" />
+ </fileset>
+ </copy>
<!-- run the mainclass in a separate JVM -->
<mx:run fork="true" />
@@ -277,31 +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.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.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>
+ <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" >
@@ -335,6 +281,7 @@
<mx:genjar tag="" includeresources="false" excludeClasspathJars="true"
destfile="${project.targetDirectory}/fedclient.jar">
<mainclass name="com.gitblit.FederationClient" />
+ <class name="com.gitblit.Keys" />
<launcher paths="ext" />
<resource file="${project.compileOutputDirectory}/log4j.properties" />
</mx:genjar>
@@ -394,31 +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.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.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>
+ <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />
<!-- Build Express Zip file -->
<mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}">
@@ -474,6 +397,7 @@
<resource file="${project.resources.dir}/commit_merge_16x16.png" />
<resource file="${project.resources.dir}/commit_divide_16x16.png" />
<resource file="${project.resources.dir}/star_16x16.png" />
+ <resource file="${project.resources.dir}/mirror_16x16.png" />
<resource file="${project.resources.dir}/blank.png" />
<resource file="${project.src.dir}/log4j.properties" />
<resource>
@@ -510,75 +434,7 @@
<!-- Cleanup -->
<delete file="${project.targetDirectory}/manager.jar" />
</target>
-
-
- <!--
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Build the stand-alone, Gitblit Authority
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- -->
- <target name="buildAuthority" depends="compile" description="Builds the stand-alone Gitblit Authority">
- <echo>Building Gitblit Authority ${project.version}</echo>
- <!-- generate jar by traversing the class hierarchy of the specified
- classes, exclude any classes in "authority" classpath jars -->
- <mx:genjar tag="authority" excludeClasspathJars="true"
- destfile="${project.targetDirectory}/authority.jar">
- <resource file="${project.src.dir}/com/gitblit/client/splash.png" />
- <resource file="${project.resources.dir}/gitblt-favicon.png" />
- <resource file="${project.resources.dir}/user_16x16.png" />
- <resource file="${project.resources.dir}/users_16x16.png" />
- <resource file="${project.resources.dir}/rosette_16x16.png" />
- <resource file="${project.resources.dir}/rosette_32x32.png" />
- <resource file="${project.resources.dir}/vcard_16x16.png" />
- <resource file="${project.resources.dir}/settings_16x16.png" />
- <resource file="${project.resources.dir}/settings_32x32.png" />
- <resource file="${project.resources.dir}/search-icon.png" />
- <resource file="${project.resources.dir}/mail_16x16.png" />
- <resource file="${project.resources.dir}/script_16x16.png" />
- <resource file="${project.resources.dir}/blank.png" />
- <resource file="${project.resources.dir}/bullet_green.png" />
- <resource file="${project.resources.dir}/bullet_orange.png" />
- <resource file="${project.resources.dir}/bullet_red.png" />
- <resource file="${project.resources.dir}/bullet_white.png" />
- <resource file="${project.resources.dir}/bullet_delete.png" />
- <resource file="${project.resources.dir}/bullet_key.png" />
- <resource file="${project.src.dir}/log4j.properties" />
- <resource>
- <!-- inlcude all translations -->
- <fileset dir="${project.src.dir}/com/gitblit/wicket">
- <include name="*.properties" />
- </fileset>
- </resource>
-
- <mainclass name="com.gitblit.authority.Launcher" />
- <manifest>
- <attribute name="SplashScreen-Image" value="splash.png" />
- </manifest>
- </mx:genjar>
-
- <!-- Build Authority Zip file -->
- <mx:zip destfile="${project.targetDirectory}/${authority.zipfile}">
- <fileset dir="${basedir}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- </fileset>
- <fileset dir="${project.targetDirectory}">
- <include name="authority.jar" />
- </fileset>
- <zipfileset dir="${project.distrib.dir}/data" prefix="data">
- <include name="users.conf" />
- <include name="gitblit.properties" />
- </zipfileset>
- <!-- Gitblit Authority data -->
- <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
- <!-- include "authority" tagged dependencies -->
- <dependencies prefix="ext" tag="authority" />
- </mx:zip>
-
- <!-- Cleanup -->
- <delete file="${project.targetDirectory}/authority.jar" />
- </target>
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -649,9 +505,6 @@
<delete>
<fileset dir="${project.targetDirectory}">
<include name="javadoc/**" />
- <include name="gbapi-${project.version}.jar" />
- <include name="gbapi-${project.version}-sources.jar" />
- <include name="gbapi-${project.version}-javadoc.jar" />
</fileset>
</delete>
</target>
@@ -754,6 +607,7 @@
<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />
<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>" />
<!-- Set the logo from the mx:doc resources -->
<logo file="${project.resources.dir}/gitblt_25_white.png" />
@@ -797,13 +651,26 @@
</target>
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Package and deploy RELEASE artifacts to the Maven repository
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="buildMavenArtifacts" depends="buildApiLibrary">
+ <mx:package />
+ <mx:deploy basedir="${maven.directory}" allowsnapshots="false" />
+ <mx:deploy basedir="${maven.directory}" allowsnapshots="false"
+ name="Gitblit API" description="Gitblit JSON/RSS API client library"
+ tags="api" artifactid="gbapi" />
+ </target>
+
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Build all binaries and site
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="buildAll" depends="buildAuthority,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />
+ <target name="buildAll" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />
<!--
@@ -917,7 +784,7 @@
Tag a new version and prepare for the next development cycle.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="tagRelease" depends="prepare">
+ <target name="tagRelease" depends="prepare" description="tag a new version and prepare for the next development cycle">
<!-- release -->
<property name="dryrun" value="false" />
<mx:version stage="release" dryrun="${dryrun}" />
@@ -951,6 +818,8 @@
<filter token="project.version" value="${project.version}" />
<filter token="project.commitId" value="${project.commitId}" />
<filter token="project.tag" value="${project.tag}" />
+ <filter token="project.directory" value="${basedir}" />
+ <filter token="maven.directory" value="${maven.directory}" />
</filterset>
</copy>
<chmod file="${recipe}" perm="ugo+rx" />
@@ -1031,7 +900,8 @@
<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />
<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>" />
+
<!-- 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" />
@@ -1082,6 +952,8 @@
<include name="sendmail-html.groovy" />
<include name="jenkins.groovy" />
<include name="protect-refs.groovy" />
+ <include name="blockpush.groovy" />
+ <include name="localclone.groovy" />
<include name="fogbugz.groovy" />
<include name="thebuggenie.groovy" />
</fileset>
@@ -1152,5 +1024,6 @@
<arg value="-DrepositoryId=${project.maven.repo.id}" />
<arg value="-DcreateChecksum=true" />
</exec>
- </target>
+ </target>
+
</project>
--
Gitblit v1.9.1