Fixed upgrade bug in user service (issue 41)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 78effe763b1b7dbcde03ae1485ccb051cb0fa116..c51c2d76b285e8899c0e5b9483dd601d90afba23 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -1,10 +1,17 @@
 ## Release History\r
 \r
 ### Current Release\r
+\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
 #### fixes\r
 \r
+- Fixed bug when upgrading from users.properties to users.conf (issue 41)\r
+\r
+**0.8.1** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.1.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.1.war) | [express](http://code.google.com/p/gitblit/downloads/detail?name=express-0.8.1.zip) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.8.1.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.8.1.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.8.1.zip)) based on [JGit 1.2.0 (201112221803-r)][jgit]   *released 2012-01-11*\r
+\r
+#### fixes\r
+\r
 - Include missing icon resource for the manager (issue 40)\r
 - Fixed sendmail.groovy message content with incorrect tag/branch labels\r
 \r

diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index a28a871a589aab909cb8d37ea7221ab75a765610..cedda6f436b7f1b5f14e6c3a96a3012b6422dc09 100644 (file)
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -29,11 +29,11 @@ public class Constants {
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r
-       public static final String VERSION = "0.9.0-SNAPSHOT";\r
+       public static final String VERSION = "0.8.2";\r
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r
-       public static final String VERSION_DATE = "PENDING";\r
+       public static final String VERSION_DATE = "2012-01-13";\r
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r

diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java
index eddc8a3d39a14032006efdb6bbf86264d10f549b..7462af083019ed020f7c1dca847c5806a061901d 100644 (file)
--- a/src/com/gitblit/GitblitUserService.java
+++ b/src/com/gitblit/GitblitUserService.java
@@ -95,8 +95,8 @@ public class GitblitUserService implements IUserService {
                                logger.info(MessageFormat.format("Automatically creating {0} based on {1}",\r
                                                usersConfig.getAbsolutePath(), realmFile.getAbsolutePath()));\r
                                ConfigUserService configService = new ConfigUserService(usersConfig);\r
-                               for (String username : serviceImpl.getAllUsernames()) {\r
-                                       UserModel userModel = serviceImpl.getUserModel(username);\r
+                               for (String username : service.getAllUsernames()) {\r
+                                       UserModel userModel = service.getUserModel(username);\r
                                        configService.updateUserModel(userModel);\r
                                }\r
                        }\r