Eliminate static singleton calls from user services

James Moger

2013-11-19 5200b359257c2ab5e29781c2b05c6092fc8338f8

 src/main/java/com/gitblit/GitblitUserService.java

@@ -25,6 +25,7 @@
import org.slf4j.LoggerFactory;



import com.gitblit.Constants.AccountType;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.DeepCopier;

@@ -58,8 +59,8 @@
   }



   @Override

   public void setup(IStoredSettings settings) {

      File realmFile = GitBlit.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");

   public void setup(IRuntimeManager runtimeManager) {

      File realmFile = runtimeManager.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");

      serviceImpl = createUserService(realmFile);

      logger.info("GUS delegating to " + serviceImpl.toString());

   }