diff options
| -rw-r--r-- | distrib/gitblit.properties | 7 | ||||
| -rw-r--r-- | docs/01_setup.mkd | 21 | ||||
| -rw-r--r-- | docs/04_releases.mkd | 2 | ||||
| -rw-r--r-- | src/com/gitblit/GitServlet.java | 7 |
4 files changed, 36 insertions, 1 deletions
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 91b1c2b7..f3e2ac15 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -151,6 +151,13 @@ git.packedGitMmap = false # SINCE 0.8.0
groovy.scriptsFolder = groovy
+# Specify the directory Grape uses for downloading libraries.
+# http://groovy.codehaus.org/Grape
+#
+# RESTART REQUIRED
+# SINCE 1.0.0
+groovy.grapeFolder = groovy/grape
+
# Scripts to execute on Pre-Receive.
#
# These scripts execute after an incoming push has been parsed and validated
diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd index c8cd09db..07f4b004 100644 --- a/docs/01_setup.mkd +++ b/docs/01_setup.mkd @@ -398,6 +398,27 @@ Some sample scripts are included in the GO and WAR distributions to show you how Hook contributions and improvements are welcome.
+### Grapes
+
+*SINCE 1.0.0*
+
+[Grape](http://groovy.codehaus.org/Grape) lets you quickly add maven repository dependencies to your Groovy hook script.
+
+<blockquote>Grape (The Groovy Adaptable Packaging Engine or Groovy Advanced Packaging Engine) is the infrastructure enabling the grab() calls in Groovy, a set of classes leveraging [Ivy](http://ant.apache.org/ivy) to allow for a repository driven module system for Groovy. This allows a developer to write a script with an essentially arbitrary library requirement, and ship just the script. Grape will, at runtime, download as needed and link the named libraries and all dependencies forming a transitive closure when the script is run from existing repositories such as Ibiblio, Codehaus, and java.net.</blockquote>
+
+%BEGINCODE%
+// create and use a primitive array
+import org.apache.commons.collections.primitives.ArrayIntList
+
+@Grab(group='commons-primitives', module='commons-primitives', version='1.0')
+def createEmptyInts() { new ArrayIntList() }
+
+def ints = createEmptyInts()
+ints.add(0, 42)
+assert ints.size() == 1
+assert ints.get(0) == 42
+%ENDCODE%
+
### Custom Fields
*SINCE 1.0.0*
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index a47c0861..a281ffe5 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -35,6 +35,8 @@ Make sure to properly set *web.blobEncodings* before starting Gitblit if you are **New:** *git.packedGitMmap = false*
- Added default access restriction. Applies to new repositories and repositories that have not been configured with Gitblit. (issue 88)
**New:** *git.defaultAccessRestriction = NONE*
+- Added setting to control Groovy Grape root folder. [Grape](http://groovy.codehaus.org/Grape) allows you to add Maven dependencies to your pre-/post-receive hook script classpath.
+ **New:** *groovy.grapeFolder = groovy/grape*
- Added LDAP User Service with many new *realm.ldap* keys (Github/jcrygier)
- Added support for custom repository properties for Groovy hooks (Github/jcrygier)
- Added script to facilitate proxy environment setup on Linux (Github/mragab)
diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java index 94042c70..68097cb8 100644 --- a/src/com/gitblit/GitServlet.java +++ b/src/com/gitblit/GitServlet.java @@ -79,7 +79,12 @@ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet { public void init(ServletConfig config) throws ServletException {
groovyDir = GitBlit.getGroovyScriptsFolder();
try {
- gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());
+ // set Grape root
+ File grapeRoot = new File(GitBlit.getString(Keys.groovy.grapeFolder, "groovy/grape")).getAbsoluteFile();
+ grapeRoot.mkdirs();
+ System.setProperty("grape.root", grapeRoot.getAbsolutePath());
+
+ gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());
} catch (IOException e) {
throw new ServletException("Failed to instantiate Groovy Script Engine!", e);
}
|