diff options
| -rw-r--r-- | docs/00_index.mkd | 17 | ||||
| -rw-r--r-- | docs/01_setup.mkd | 10 | ||||
| -rw-r--r-- | docs/04_releases.mkd | 8 | ||||
| -rw-r--r-- | src/com/gitblit/FileUserService.java | 10 | ||||
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 1 | ||||
| -rw-r--r-- | src/com/gitblit/IUserService.java | 10 |
6 files changed, 38 insertions, 18 deletions
diff --git a/docs/00_index.mkd b/docs/00_index.mkd index 0da7f742..856c3eb2 100644 --- a/docs/00_index.mkd +++ b/docs/00_index.mkd @@ -28,22 +28,7 @@ Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit] *released %BUILDDATE%*
-- added: federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances. This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit.
-<br/>**New:** *federation.name =*
-<br/>**New:** *federation.passphrase =*
-<br/>**New:** *federation.allowProposals = false*
-<br/>**New:** *federation.proposalsFolder = proposals*
-<br/>**New:** *federation.defaultFrequency = 60 mins*
-<br/>**New:** *federation.sets =*
-<br/>**New:** *mail.* settings for sending emails
-<br/>**New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance
-- added: google-gson dependency
-- added: javamail dependency
-- updated: MarkdownPapers 1.1.1
-- updated: Wicket 1.4.18
-- updated: JGit 1.1.0
-- fixed: syndication urls for WAR deployments
-- fixed: authentication for zip downloads
+- added: IUserService.setup(IStoredSettings) for custom user service implementations
issues, binaries, and sources @ [Google Code][googlecode]<br/>
sources @ [Github][gitbltsrc]
diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd index 91900e1e..125bac23 100644 --- a/docs/01_setup.mkd +++ b/docs/01_setup.mkd @@ -172,6 +172,16 @@ Your user service class must be on Gitblit's classpath and must have a public de public interface IUserService {
/**
+ * Setup the user service.
+ *
+ * @param settings
+ * @since 0.6.1
+ */
+ @Override
+ public void setup(IStoredSettings settings) {
+ }
+
+ /**
* Does the user service support cookie authentication?
*
* @return true or false
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 3941c9f4..a77cfd50 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -3,6 +3,12 @@ ### Current Release
**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit] *released %BUILDDATE%*
+- added: IUserService.setup(IStoredSettings) for custom user service implementations
+
+### Older Releases
+
+**0.6.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.6.0.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.6.0.war)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.6.0.zip)) based on [JGit 1.1.0 (201109151100-r)][jgit] *released 2011-09-27*
+
- added: federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances. This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit.
<br/>**New:** *federation.name =*
<br/>**New:** *federation.passphrase =*
@@ -20,8 +26,6 @@ - fixed: syndication urls for WAR deployments
- fixed: authentication for zip downloads
-### Older Releases
-
**0.5.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.2.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.2.war)) based on [JGit 1.0.0 (201106090707-r)][jgit] *released 2011-07-27*
- fixed: active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14)
diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java index 9dc80087..cae0d791 100644 --- a/src/com/gitblit/FileUserService.java +++ b/src/com/gitblit/FileUserService.java @@ -53,6 +53,16 @@ public class FileUserService extends FileSettings implements IUserService { }
/**
+ * Setup the user service.
+ *
+ * @param settings
+ * @since 0.6.1
+ */
+ @Override
+ public void setup(IStoredSettings settings) {
+ }
+
+ /**
* Does the user service support cookie authentication?
*
* @return true or false
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index f7c43a85..c35340ac 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -249,6 +249,7 @@ public class GitBlit implements ServletContextListener { public void setUserService(IUserService userService) {
logger.info("Setting up user service " + userService.toString());
this.userService = userService;
+ this.userService.setup(settings);
}
/**
diff --git a/src/com/gitblit/IUserService.java b/src/com/gitblit/IUserService.java index 426d38c0..a85c997f 100644 --- a/src/com/gitblit/IUserService.java +++ b/src/com/gitblit/IUserService.java @@ -29,6 +29,16 @@ import com.gitblit.models.UserModel; public interface IUserService {
/**
+ * Setup the user service. This method allows custom implementations to
+ * retrieve settings from gitblit.properties or the web.xml file without
+ * relying on the GitBlit static singleton.
+ *
+ * @param settings
+ * @since 0.6.1
+ */
+ void setup(IStoredSettings settings);
+
+ /**
* Does the user service support cookie authentication?
*
* @return true or false
|