Switch GO to monolithic build for installations without internet connection

diff --git a/build.xml b/build.xml
index bd25e6c476336b64e2a09e741892c744677760a6..c5400752f2ccd7e671230a93a64e9312308216c5 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -181,6 +181,15 @@
                        </manifest>\r
                </jar>\r
 \r
+               <!-- Gitblit library dependencies -->\r
+               <mkdir dir="${project.deploy.dir}/lib"/>\r
+               <copy todir="${project.deploy.dir}/lib">\r
+                       <fileset dir="${basedir}/ext">\r
+                               <exclude name="*-sources.jar" />\r
+                               <exclude name="*-javadoc.jar" />\r
+                       </fileset>\r
+               </copy>\r
+               \r
                <!-- Build the docs for the deploy -->\r
                <antcall target="buildDocs" inheritall="true" inheritrefs="true">\r
                        <param name="docs.output.dir" value="${project.deploy.dir}/docs" />\r
@@ -459,7 +468,7 @@
                Build a Gitblit filesystem for deployment to RedHat OpenShif Expresst\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <target name="buildOpenShift" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express">\r
+       <target name="buildExpress" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express">\r
                <echo>Building Gitblit Express for RedHat OpenShift ${gb.version}</echo>\r
                \r
                <delete dir="${project.express.dir}" />\r
@@ -825,7 +834,7 @@
                Compile from source, publish binaries, and build & deploy site\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <target name="buildAll" depends="buildGO,buildWAR,buildOpenShift,buildFederationClient,buildManager,buildApiLibrary,buildSite">         \r
+       <target name="buildAll" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite">           \r
                <!-- Cleanup -->\r
                <delete dir="${project.build.dir}" />\r
                <delete dir="${project.war.dir}" />\r
@@ -839,7 +848,7 @@
                Publish binaries to Google Code\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <target name="publishBinaries" depends="buildGO,buildWAR,buildOpenShift,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code">\r
+       <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code">\r
 \r
                <echo>Uploading Gitblit ${gb.version} binaries</echo>\r
 \r
@@ -938,4 +947,4 @@
                <delete dir="${project.war.dir}" />\r
                <delete dir="${project.deploy.dir}" />\r
        </target>\r
-</project>\r
+</project>

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index d1c08fe60369afb894fa69d18d6c8fbdbb8f1da6..89d69414eb1a414b3524f9724f85dc3a945720cc 100644 (file)
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -41,7 +41,7 @@ You do not need Apache httpd, Perl, Git, or Gitweb.  Should you want to use some
 \r
 This is what you should download if you want to go from zero to Git in less than 5 mins.\r
 \r
-All dependencies are downloaded on first execution.\r
+All dependencies are bundled.\r
 \r
 ### WAR: For Your Servlet Container\r
 *Gitblit WAR* is what you should download if you already have a servlet container available that you wish to use.  Jetty 6/7/8 and Tomcat 6/7 are known to work.  Generally, any Servlet 2.5 or Servlet 3.0 container should work.\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 75ce1459dc4d4b8c02050e5764bb1b2b15228d7f..1ec0641149916fee3db4b0341f1eafe9367af81f 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -3,6 +3,8 @@
 ### Current Release\r
 **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 \r
+- updated: Gitblit GO is now monolithic like the WAR build. (issue 30)  \r
+Either the dependencies are downloaded on first execution OR the dependencies are bundled, either way you would need the dependencies.  This change helps adoption of GO in environments without an internet connection or with a restricted connection.\r
 - added: Groovy 1.8.4 and sample pre- and post- push Groovy hook scripts.  Hook scripts can be set per-repository or globally for all repositories.  \r
 Unfortunately this adds another 6 MB to the 8MB Gitblit package, but it allows for a *very* powerful, flexible, platform-independent hook script mechanism.  \r
     **New:** *groovy.scriptsFolder = groovy*  \r