[jboss-svn-commits] JBL Code SVN: r33639 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth: dao and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 25 07:56:40 EDT 2010
Author: lkrzyzanek
Date: 2010-06-25 07:56:40 -0400 (Fri, 25 Jun 2010)
New Revision: 33639
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java
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/dao/DbNukesUserDAOImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java
Log:
Added creating Nukes User
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java 2010-06-25 10:04:36 UTC (rev 33638)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java 2010-06-25 11:56:40 UTC (rev 33639)
@@ -67,6 +67,13 @@
public NukesUser getAccountByUsername(String username);
/**
+ * Create nukes user based on SBS USer
+ *
+ * @param sbsUser
+ */
+ public void createNukesUser(User sbsUser);
+
+ /**
* Update nukes password
*
* @param username
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-06-25 10:04:36 UTC (rev 33638)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java 2010-06-25 11:56:40 UTC (rev 33639)
@@ -81,6 +81,19 @@
}
@Override
+ public void createNukesUser(User sbsUser) {
+ if (log.isInfoEnabled()) {
+ log.info("Create Nukes Account. SBS User: " + sbsUser);
+ }
+
+ NukesUser nukesUser = convertToNukesAccount(sbsUser, false);
+ if (log.isDebugEnabled()) {
+ log.debug("Converted nukesUser: " + nukesUser);
+ }
+ nukesUserDAO.createNukesUser(nukesUser);
+ }
+
+ @Override
public NukesUser getAccountByUsername(String username) {
return nukesUserDAO.getNukesUser(username);
}
@@ -103,6 +116,9 @@
@Override
public void updateLastLoggedIn(String username, Date date) {
+ if (log.isDebugEnabled()) {
+ log.debug("Update last logged in. username: " + username + ", date: " + date);
+ }
nukesUserDAO.updateLastLoggedIn(username, date);
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java 2010-06-25 10:04:36 UTC (rev 33638)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java 2010-06-25 11:56:40 UTC (rev 33639)
@@ -46,11 +46,18 @@
private static final String UPDATE_LAST_LOGGEDIN = "UPDATE nuke_users SET pn_last_visit = ? WHERE pn_uname = ?";
private static final String UPDATE_USER = "UPDATE nuke_users SET"
- + " pn_email = ?, pn_last_visit = ?, pn_fname = ?, pn_lname = ?, pn_name = ?, pn_phone = ?, pn_femail = ?, pn_user_icq = ?"
+ + " pn_email = ?, pn_fname = ?, pn_lname = ?, pn_name = ?, pn_phone = ?, pn_femail = ?, pn_user_icq = ?"
+ ", pn_user_aim = ?, pn_user_yim = ?, pn_user_msnm = ?, pn_user_occ = ?, pn_user_intrest = ?, pn_cname = ?, pn_title = ?"
+ ", pn_companysize = ?, pn_url = ?, pn_bio = ?, pn_usertype = ?, pn_globally_disabled = ?"
+ " WHERE pn_uname = ?";
+ private static final String INSERT_USER = "INSERT INTO nuke_users "
+ + " (pn_uname, pn_user_regdate, pn_user_viewemail, pn_email, pn_last_visit, pn_fname, pn_lname, pn_name, pn_phone, pn_femail, pn_user_icq"
+ + ", pn_user_aim, pn_user_yim, pn_user_msnm, pn_user_occ, pn_user_intrest, pn_cname, pn_title"
+ + ", pn_companysize, pn_url, pn_bio, pn_usertype, pn_globally_disabled, pn_timezone_offset, pn_user_avatar, pn_user_from, pn_user_sig"
+ + ", pn_theme, pn_umode, pn_question, pn_answer, pn_enabled)"
+ + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
@Override
public NukesUser getNukesUser(String username) {
try {
@@ -66,6 +73,48 @@
}
@Override
+ public void createNukesUser(NukesUser user) {
+ List<Object> args = new LinkedList<Object>();
+
+ args.add(user.getUsername());
+ args.add(user.getCreationDate());
+ args.add(user.isEmailVisible());
+ args.add(shrink(user.getEmail(), 60));
+ args.add(user.getCreationDate());
+ args.add(shrink(user.getFirstName(), 60));
+ args.add(shrink(user.getLastName(), 60));
+ args.add(""); // pn_name
+
+ Map<Long, String> profile = user.getProfile();
+ args.add(shrink(profile.get(NukesUserMapper.PHONE_NUMBER), 30));
+ args.add(shrink(profile.get(NukesUserMapper.ALTERNATE_EMAIL), 60));
+ args.add(shrink(profile.get(NukesUserMapper.YOUR_ICQ_NUMBER), 15));
+ args.add(shrink(profile.get(NukesUserMapper.YOUR_AIM_ADDRESS), 18));
+ args.add(shrink(profile.get(NukesUserMapper.YOUR_YIM_NUMBER), 25));
+ args.add(shrink(profile.get(NukesUserMapper.YOUR_MSN_MESSANGER), 25));
+ args.add(shrink(profile.get(NukesUserMapper.OCCUPATION), 100));
+ args.add(shrink(profile.get(NukesUserMapper.EXPERTISE), 150));
+ args.add(shrink(profile.get(NukesUserMapper.COMPANY_NAME), 80));
+ args.add(shrink(profile.get(NukesUserMapper.TITLE), 50));
+ args.add(shrink(profile.get(NukesUserMapper.COMPANY_SIZE), 10));
+ args.add(shrink(profile.get(NukesUserMapper.URL), 254));
+ args.add(shrink(profile.get(NukesUserMapper.BIOGRAPHY), 255));
+ args.add(shrink(profile.get(NukesUserMapper.TYPE_OF_COMPANY), 20));
+ args.add(true);
+ args.add(0); // pn_timezone_offset
+ args.add(""); // pn_user_avatar
+ args.add(""); // pn_user_from
+ args.add(""); // pn_user_sig
+ args.add(""); // pn_theme
+ args.add(""); // pn_umode
+ args.add(""); // pn_question
+ args.add(""); // pn_answer
+ args.add(true); // pn_enabled
+
+ getJdbcTemplate().update(INSERT_USER, args.toArray());
+ }
+
+ @Override
public boolean updatePassword(String username, String passwordHash) {
return updatePassword(username, passwordHash, null);
}
@@ -97,7 +146,6 @@
List<Object> args = new LinkedList<Object>();
args.add(shrink(user.getEmail(), 60));
- args.add(user.getLastLoggedIn());
args.add(shrink(user.getFirstName(), 60));
args.add(shrink(user.getLastName(), 60));
args.add(""); // pn_name
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java 2010-06-25 10:04:36 UTC (rev 33638)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java 2010-06-25 11:56:40 UTC (rev 33639)
@@ -49,6 +49,13 @@
public List<NukesUser> getNukesUsersByEmail(String email);
/**
+ * Create Nukes user
+ *
+ * @param user
+ */
+ public void createNukesUser(NukesUser user);
+
+ /**
* Update password hash
*
* @param username
@@ -76,7 +83,11 @@
/**
* Update nukes account and his duplicates accounts.<br>
- * Password is not updated.
+ * These fields are not updated:
+ * <ul>
+ * <li>password
+ * <li>last logged in
+ * </ul>
*
* @param user
* @param duplicateUsernames if null then only user is updated
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java 2010-06-25 10:04:36 UTC (rev 33638)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java 2010-06-25 11:56:40 UTC (rev 33639)
@@ -86,6 +86,10 @@
List<String> duplicateUsernames = sbsAccountManager.getDuplicateAccountUsernames(user);
nukesAccountManager.updateNukesAccounts(user, duplicateUsernames);
}
+ if (UserEvent.Type.CREATED.compareTo(e.getType()) == 0) {
+ User user = e.getPayload();
+ nukesAccountManager.createNukesUser(user);
+ }
}
More information about the jboss-svn-commits
mailing list