Minor tweaks to SalesForce user service

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 412bcae2e81012bc5acecbd7c0760b3cf75493ac..9f7eb778b5ad1d6b105205659e8c76dbbe36e141 100644 (file)
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -1128,7 +1128,7 @@ realm.salesforce.backingUserService = ${baseFolder}/users.conf
 # Restrict the Salesforce user to members of this org.\r
 # default: 0 (i.e. do not check the Org ID)\r
 #\r
-# RESTART REQUIRED\r
+# SINCE 1.3.0\r
 realm.salesforce.orgId = 0\r
 \r
 # URL of the LDAP server.\r

diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 5ed0a256d4db66dbc7a7481c0a32410cfb951f70..2c64570d4fbada85231ffe9b3cc6d9c6688e6d97 100644 (file)
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -480,7 +480,7 @@ public class Constants {
        }\r
        \r
        public static enum AccountType {\r
-               LOCAL, LDAP, REDMINE;\r
+               LOCAL, LDAP, REDMINE, SALESFORCE;\r
                \r
                public boolean isLocal() {\r
                        return this == LOCAL;\r

diff --git a/src/main/java/com/gitblit/SalesforceUserService.java b/src/main/java/com/gitblit/SalesforceUserService.java
index 989b487808b74bfca966db55702c9bb91f45fde0..aa0795ac5a20108fea4ee8f02d81d97c9d9e5a33 100644 (file)
--- a/src/main/java/com/gitblit/SalesforceUserService.java
+++ b/src/main/java/com/gitblit/SalesforceUserService.java
@@ -5,6 +5,7 @@ import java.io.File;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.gitblit.Constants.AccountType;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.ArrayUtils;
 import com.gitblit.utils.StringUtils;
@@ -18,7 +19,11 @@ public class SalesforceUserService extends GitblitUserService {
        public static final Logger logger = LoggerFactory
                        .getLogger(SalesforceUserService.class);
        private IStoredSettings settings;
-
+       
+       protected AccountType getAccountType() {
+               return AccountType.SALESFORCE;
+       }
+       
        @Override
        public void setup(IStoredSettings settings) {
                this.settings = settings;