[jboss-svn-commits] JBL Code SVN: r33218 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: java/org/jboss/labs/sbs/plugin/nukesauth/dao and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 31 10:36:03 EDT 2010
Author: lkrzyzanek
Date: 2010-05-31 10:36:02 -0400 (Mon, 31 May 2010)
New Revision: 33218
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
Log:
ORG-606: Added Creating SBS account if not exists (only Nukes account)
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java 2010-05-31 14:36:02 UTC (rev 33218)
@@ -44,7 +44,7 @@
@Override
public void authenticateNukesUser(String username, String password) throws UsernameNotFoundException,
BadCredentialsException {
- NukesUser nukesUser = nukesUserDAO.getNukesUser(username);
+ NukesUser nukesUser = getAccountByUsername(username);
if (nukesUser == null) {
throw new UsernameNotFoundException("User '" + username + "' not found.");
}
@@ -58,8 +58,7 @@
@Override
public NukesUser getAccountByUsername(String username) {
- // TODO Auto-generated method stub
- return new NukesUser();
+ return nukesUserDAO.getNukesUser(username);
}
@Override
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java 2010-05-31 14:36:02 UTC (rev 33218)
@@ -23,6 +23,8 @@
import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
+import com.jivesoftware.base.EmailAlreadyExistsException;
+import com.jivesoftware.base.UserAlreadyExistsException;
import com.jivesoftware.base.UserNotFoundException;
/**
@@ -34,8 +36,15 @@
/**
* Create SBS Account based on Nukes user
+ *
+ * @param nukesUser
+ * @param password
+ *
+ * @throws EmailAlreadyExistsException
+ * @throws UserAlreadyExistsException
*/
- public void createAccount(NukesUser nukesUser);
+ public void createAccount(NukesUser nukesUser, String password) throws UserAlreadyExistsException,
+ EmailAlreadyExistsException;
/**
* Update password.
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java 2010-05-31 14:36:02 UTC (rev 33218)
@@ -21,16 +21,27 @@
*/
package org.jboss.labs.sbs.plugin.nukesauth;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
+import com.jivesoftware.base.EmailAlreadyExistsException;
import com.jivesoftware.base.User;
import com.jivesoftware.base.UserAlreadyExistsException;
import com.jivesoftware.base.UserManager;
import com.jivesoftware.base.UserNotFoundException;
import com.jivesoftware.base.UserTemplate;
import com.jivesoftware.community.JiveRuntimeException;
+import com.jivesoftware.community.user.profile.ProfileField;
+import com.jivesoftware.community.user.profile.ProfileFieldManager;
+import com.jivesoftware.community.user.profile.ProfileFieldValue;
+import com.jivesoftware.community.user.profile.ProfileManager;
/**
* Implementation of SBS Account manager
@@ -41,10 +52,78 @@
private static final Logger log = LogManager.getLogger(SbsAccountManagerImpl.class);
private UserManager userManager;
+ private ProfileFieldManager profileFieldManager;
+
+ private ProfileManager profileManager;
+
+ private UserTemplate mapDetails(UserTemplate ut, NukesUser nukeUser) {
+ ut.setFirstName(nukeUser.getFirstName());
+ ut.setLastName(nukeUser.getLastName());
+ ut.setPasswordHash(null);
+ // ut.setProperties(nukeUser.getProperties());
+ ut.setCreationDate(nukeUser.getCreationDate());
+ ut.setModificationDate(nukeUser.getCreationDate());
+ ut.setLastProfileUpdate(nukeUser.getCreationDate());
+ ut.setLastLoggedIn(nukeUser.getLastLoggedIn());
+ ut.setEmailVisible(nukeUser.isEmailVisible());
+ return ut;
+ }
+
+ private void mapProfile(Map<Long, String> profile, Collection<ProfileFieldValue> pfvSet) {
+ List<ProfileField> fields = profileFieldManager.getProfileFields();
+
+ for (ProfileField pf : fields) {
+
+ if (profile.containsKey(pf.getID())) {
+ String value = profile.get(pf.getID());
+ if (value != null && value.trim().length() > 0) {
+ ProfileFieldValue pfv = new ProfileFieldValue(pf);
+ pfv.setValue(profile.get(pf.getID()));
+
+ pfvSet.add(pfv);
+ }
+
+ // remove field as added
+ profile.remove(pf.getID());
+ }
+ }
+ }
+
@Override
- public void createAccount(NukesUser nukesUser) {
- // TODO Auto-generated method stub
+ public void createAccount(NukesUser nukesUser, String password) throws UserAlreadyExistsException,
+ EmailAlreadyExistsException {
+ if (log.isInfoEnabled()) {
+ log.info("Going to create SBS user from nukes: " + nukesUser);
+ }
+ UserTemplate ut = new UserTemplate(nukesUser.getUsername(), password, nukesUser.getEmail());
+ ut.setFederated(false);
+ ut = mapDetails(ut, nukesUser);
+ userManager.createApplicationUser(ut);
+
+ // update profile
+ User u;
+ try {
+ u = userManager.getUser(nukesUser.getUsername());
+ } catch (UserNotFoundException e) {
+ throw new RuntimeException("Cannot get user which has been just created. Username: " + nukesUser.getUsername(), e);
+ }
+
+ Set<ProfileFieldValue> pfvSet = new HashSet<ProfileFieldValue>();
+
+ Map<Long, String> profile = nukesUser.getProfile();
+ // map fields
+ mapProfile(profile, pfvSet);
+
+ if (!profile.isEmpty()) {
+ for (Long key : profile.keySet()) {
+ log.error("Couldn't set profile field, id: " + key + ", value: " + profile.get(key));
+ }
+ }
+
+ if (!pfvSet.isEmpty()) {
+ profileManager.setProfile(u, pfvSet);
+ }
}
@Override
@@ -65,4 +144,12 @@
this.userManager = userManager;
}
+ public void setProfileManager(ProfileManager profileManager) {
+ this.profileManager = profileManager;
+ }
+
+ public void setProfileFieldManager(ProfileFieldManager profileFieldManager) {
+ this.profileFieldManager = profileFieldManager;
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java 2010-05-31 14:36:02 UTC (rev 33218)
@@ -21,6 +21,9 @@
*/
package org.jboss.labs.sbs.plugin.nukesauth.dao;
+import java.util.Date;
+import java.util.Map;
+
/**
* Nukes User value object
*
@@ -31,11 +34,23 @@
private String username;
private String email;
-
- private String password;
-
+
private String passwordHash;
+ private Date creationDate;
+
+ private Date lastLoggedIn;
+
+ private Date modifDate;
+
+ private String firstName;
+
+ private String lastName;
+
+ private Map<Long, String> profile;
+
+ private boolean emailVisible;
+
public String getUsername() {
return username;
}
@@ -52,14 +67,6 @@
this.email = email;
}
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getPassword() {
- return password;
- }
-
public void setPasswordHash(String passwordHash) {
this.passwordHash = passwordHash;
}
@@ -68,4 +75,92 @@
return passwordHash;
}
+ public Date getCreationDate() {
+ return creationDate;
+ }
+
+ public void setCreationDate(Date creationDate) {
+ this.creationDate = creationDate;
+ }
+
+ public Date getLastLoggedIn() {
+ return lastLoggedIn;
+ }
+
+ public void setLastLoggedIn(Date lastLoggedIn) {
+ this.lastLoggedIn = lastLoggedIn;
+ }
+
+ public Date getModifDate() {
+ return modifDate;
+ }
+
+ public void setModifDate(Date modifDate) {
+ this.modifDate = modifDate;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public Map<Long, String> getProfile() {
+ return profile;
+ }
+
+ public void setProfile(Map<Long, String> profile) {
+ this.profile = profile;
+ }
+
+ public boolean isEmailVisible() {
+ return emailVisible;
+ }
+
+ public void setEmailVisible(boolean emailVisible) {
+ this.emailVisible = emailVisible;
+ }
+
+ @Override
+ public String toString() {
+ return "NukesUser [username=" + username + ", email=" + email + ", firstName=" + firstName + ", lastName="
+ + lastName + ", passwordHash=" + passwordHash + ", emailVisible=" + emailVisible + ", lastLoggedIn="
+ + lastLoggedIn + ", creationDate=" + creationDate + ", modifDate=" + modifDate + ", profile=" + profile + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((username == null) ? 0 : username.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ NukesUser other = (NukesUser) obj;
+ if (username == null) {
+ if (other.username != null)
+ return false;
+ } else if (!username.equals(other.username))
+ return false;
+ return true;
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java 2010-05-31 14:36:02 UTC (rev 33218)
@@ -21,8 +21,12 @@
*/
package org.jboss.labs.sbs.plugin.nukesauth.dao;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
@@ -33,6 +37,129 @@
*/
public class NukesUserMapper implements ParameterizedRowMapper<NukesUser> {
+ public static final long CLICK_HERE_FOR_JBOSS_NEWSLETTER = 5022;
+
+ public static final long ADDRESS = 3;
+
+ public static final long TYPE_OF_COMPANY = 5029;
+
+ public static final long BIOGRAPHY = 11;
+
+ public static final long URL = 9;
+
+ public static final long COMPANY_SIZE = 5023;
+
+ public static final long TITLE = 1;
+
+ public static final long COMPANY_NAME = 5001;
+
+ public static final long EXPERTISE = 12;
+
+ public static final long OCCUPATION = 5009;
+
+ public static final long YOUR_MSN_MESSANGER = 5016;
+
+ public static final long YOUR_YIM_NUMBER = 5015;
+
+ public static final long YOUR_AIM_ADDRESS = 5012;
+
+ public static final long YOUR_ICQ_NUMBER = 5004;
+
+ public static final long ALTERNATE_EMAIL = 13;
+
+ public static final long PHONE_NUMBER = 4;
+
+ public static final long HOME_ADDRESS = 14;
+
+ public static final long TIME_ZONE = 5028;
+
+ public static final long OPT_OUT = 5002;
+
+ public static final long CONTACTED = 5003;
+
+ private static Map<Long, Map<String, String>> profileDict;
+
+ static {
+ profileDict = new HashMap<Long, Map<String, String>>();
+ addDict(CLICK_HERE_FOR_JBOSS_NEWSLETTER, "0", "No", "1", "Yes");
+ addDict(CONTACTED, "0", "No", "1", "Yes");
+ addDict(OPT_OUT, "0", "No", "1", "Yes");
+ addDict(COMPANY_SIZE, "100_999", "100-999", "_20", "-20", "21_100", "21-100", "1000_", "1000-");
+ addDict(TIME_ZONE, "0", "(GMT -12:00 hours) Eniwetok, Kwajalein", "2", "(GMT -11:00 hours) Midway Island, Samoa",
+ "4", "(GMT -10:00 hours) Hawaii", "6", "(GMT -9:00 hours) Alaska", "8", "(GMT -8:00 hours) Pacific Time (US ",
+ "10", "(GMT -7:00 hours) Mountain Time (US ", "12", "(GMT -6:00 hours) Central Time (US ", "14",
+ "(GMT -5:00 hours) Eastern Time (US ", "16", "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz", "17",
+ "(GMT -3:30 hours) Newfoundland", "18", "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown", "20",
+ "(GMT -2:00 hours) Mid-Atlantic", "22", "(GMT -1:00 hours) Azores, Cape Verde Islands", "24",
+ "(GMT) Western Europe Time, London, Lisbon, Casablanca, Monrovia", "26", "selected", "28",
+ "(GMT +2:00 hours) EET(Eastern Europe Time), Kaliningrad, South Africa", "30",
+ "(GMT +3:00 hours) Baghdad, Kuwait, Riyadh, Moscow, St", "31", "(GMT +3:30 hours) Tehran", "32",
+ "(GMT +4:00 hours) Abu Dhabi, Muscat, Baku, Tbilisi", "33", "(GMT +4:30 hours) Kabul", "34",
+ "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent", "35",
+ "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi", "36", "(GMT +6:00 hours) Almaty, Dhaka, Colombo",
+ "38", "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta", "40",
+ "(GMT +8:00 hours) Beijing, Perth, Singapore, Hong Kong, Chongqing, Urumqi, Taipei", "42",
+ "(GMT +9:00 hours) Tokyo, Seoul, Osaka, Sapporo, Yakutsk", "43", "(GMT +9:30 hours) Adelaide, Darwin", "44",
+ "(GMT +10:00 hours) EAST(East Australian Standard)", "46",
+ "(GMT +11:00 hours) Magadan, Solomon Islands, New Caledonia", "48",
+ "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island");
+ }
+
+ private static void addDict(Long field, String... fields) {
+ if (fields.length % 2 == 1) {
+ throw new IllegalArgumentException("Wrong nomber of fields for dict (must be even): " + fields.length);
+ }
+
+ Map<String, String> oneDict = new HashMap<String, String>();
+ for (int i = 0; i < fields.length; i += 2) {
+ oneDict.put(fields[i], fields[i + 1]);
+ }
+
+ profileDict.put(field, oneDict);
+ }
+
+ private Map<Long, String> translateProfileFields(Map<Long, String> profile) {
+ Map<Long, String> newProfile = new HashMap<Long, String>();
+
+ for (Long key : profile.keySet()) {
+ String translatedField;
+ if (profileDict.get(key) != null && ((translatedField = profileDict.get(key).get(profile.get(key))) != null)) {
+
+ newProfile.put(key, translatedField);
+ } else {
+ newProfile.put(key, profile.get(key));
+ }
+ }
+
+ return newProfile;
+ }
+
+ private boolean isEmpty(String s) {
+ return s == null || s.trim().length() == 0;
+ }
+
+ /**
+ * Normalize String representation of URL to valid URL
+ *
+ * @param url
+ * @return if URL is not valid then null is returned.
+ */
+ private String normalizeURL(String url) {
+ if (url == null || url.length() < 1) {
+ return url;
+ }
+ if (!url.startsWith("http://")) {
+ url = "http://" + url;
+ }
+ try {
+ new URL(url);
+ return url;
+ } catch (MalformedURLException e) {
+ // not valid URL
+ return null;
+ }
+ }
+
@Override
public NukesUser mapRow(ResultSet rs, int rowNum) throws SQLException {
NukesUser bean = new NukesUser();
@@ -41,6 +168,80 @@
bean.setEmail(rs.getString("pn_email"));
bean.setPasswordHash(rs.getString("pn_pass"));
+ bean.setCreationDate(rs.getDate("pn_user_regdate"));
+ bean.setLastLoggedIn(rs.getDate("pn_last_visit"));
+ bean.setModifDate(bean.getCreationDate());
+ bean.setEmailVisible(rs.getBoolean("pn_user_viewemail"));
+
+ bean.setFirstName(rs.getString("pn_fname"));
+ bean.setLastName(rs.getString("pn_lname"));
+
+ if (isEmpty(bean.getFirstName()) || isEmpty(bean.getLastName())) {
+ final String name = rs.getString("pn_name");
+
+ if (!isEmpty(name)) {
+ String[] tokens = name.split("\\s");
+
+ if (isEmpty(bean.getFirstName())) {
+ bean.setFirstName(tokens[0]);
+ }
+
+ if (isEmpty(bean.getLastName())) {
+ bean.setLastName(tokens[tokens.length - 1]);
+ }
+ }
+ }
+
+ Map<Long, String> profile = new HashMap<Long, String>();
+
+ profile.put(PHONE_NUMBER, rs.getString("pn_phone"));
+
+ profile.put(ALTERNATE_EMAIL, rs.getString("pn_femail"));
+ profile.put(YOUR_ICQ_NUMBER, rs.getString("pn_user_icq"));
+ profile.put(YOUR_AIM_ADDRESS, rs.getString("pn_user_aim"));
+ profile.put(YOUR_YIM_NUMBER, rs.getString("pn_user_yim"));
+ profile.put(YOUR_MSN_MESSANGER, rs.getString("pn_user_msnm"));
+ profile.put(HOME_ADDRESS, rs.getString("pn_user_from"));
+
+ profile.put(OCCUPATION, rs.getString("pn_user_occ"));
+ profile.put(EXPERTISE, rs.getString("pn_user_intrest"));
+
+ profile.put(COMPANY_NAME, rs.getString("pn_cname"));
+ profile.put(TITLE, rs.getString("pn_title"));
+
+ profile.put(COMPANY_SIZE, rs.getString("pn_companysize"));
+
+ // bug fix URL must be valid URL. If not it's not showed and logged
+ // exception
+ profile.put(URL, normalizeURL(rs.getString("pn_url")));
+
+ profile.put(BIOGRAPHY, rs.getString("pn_bio"));
+
+ profile.put(TYPE_OF_COMPANY, rs.getString("pn_usertype"));
+
+ profile.put(ADDRESS, "street1:" + rs.getString("pn_street") + ",street2:,city:" + rs.getString("pn_city")
+ + ",state:" + rs.getString("pn_state") + ",country:" + rs.getString("pn_country") + ",zip:"
+ + rs.getString("pn_zip") + ",type:WORK");
+
+ profile.put(CLICK_HERE_FOR_JBOSS_NEWSLETTER, rs.getString("pn_newsletter"));
+
+ profile.put(TIME_ZONE, rs.getString("pn_timezone_offset"));
+
+ profile.put(CONTACTED, rs.getString("pn_supportcontact"));
+
+ profile.put(OPT_OUT, rs.getString("pn_salescontact"));
+
+ Map<Long, String> profileIt = new HashMap<Long, String>(profile);
+
+ // remove all null values associated to keys
+ for (Long key : profileIt.keySet()) {
+ if (profile.get(key) == null) {
+ profile.remove(key);
+ }
+ }
+
+ bean.setProfile(translateProfileFields(profile));
+
return bean;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java 2010-05-31 14:36:02 UTC (rev 33218)
@@ -148,8 +148,9 @@
if (dupliciteAccounts.size() > 1) {
// TODO: Handle No SBS account and duplicate Nukes accounts.
} else {
- log.info("No SBS accoutn and one nukes account. Going to create SBS account");
- sbsAccountManager.createAccount(nukesUser);
+ log.info("No SBS account and one nukes account. Going to create SBS account");
+ sbsAccountManager.createAccount(nukesUser, password);
+ user = userManager.getUser(username);
}
}
} catch (Exception e) {
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml 2010-05-31 14:35:59 UTC (rev 33217)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml 2010-05-31 14:36:02 UTC (rev 33218)
@@ -34,9 +34,10 @@
<bean id="sbsAccountManager"
class="org.jboss.labs.sbs.plugin.nukesauth.SbsAccountManagerImpl">
<property name="userManager" ref="userManagerImpl" />
+ <property name="profileManager" ref="profileManagerImpl" />
+ <property name="profileFieldManager" ref="profileFieldManagerImpl" />
</bean>
-
<bean id="nukesUserDAO"
class="org.jboss.labs.sbs.plugin.nukesauth.dao.DbNukesUserDAOImpl">
<property name="dataSource" ref="nukesUsersDataSource" />
More information about the jboss-svn-commits
mailing list