Moved servlets and services to separate packages

James Moger

2013-11-21 7bf6e183ff8abd0c35eeb29f399da12389562ecb

 src/main/java/com/gitblit/SalesforceUserService.java

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

import com.gitblit.Constants.AccountType;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
@@ -16,21 +17,22 @@
import com.sforce.ws.ConnectorConfig;

public class SalesforceUserService extends GitblitUserService {
   public static final Logger logger = LoggerFactory
         .getLogger(SalesforceUserService.class);

   public static final Logger logger = LoggerFactory.getLogger(SalesforceUserService.class);
   private IStoredSettings settings;
	
   protected AccountType getAccountType() {

   @Override
   public AccountType getAccountType() {
      return AccountType.SALESFORCE;
   }
	

   @Override
   public void setup(IStoredSettings settings) {
      this.settings = settings;
   public void setup(IRuntimeManager runtimeManager) {
      this.settings = runtimeManager.getSettings();
      String file = settings.getString(
            Keys.realm.salesforce.backingUserService,
            "${baseFolder}/users.conf");
      File realmFile = GitBlit.getFileOrFolder(file);
      File realmFile = runtimeManager.getFileOrFolder(file);

      serviceImpl = createUserService(realmFile);