[jboss-svn-commits] JBL Code SVN: r33603 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth: dao and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-06-23 08:14:38 -0400 (Wed, 23 Jun 2010)
New Revision: 33603

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/dao/DbNukesUserDAOImpl.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
Log:
Added new field - is account globally disabled.

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-23 07:17:46 UTC (rev 33602)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java	2010-06-23 12:14:38 UTC (rev 33603)
@@ -125,6 +125,9 @@
     }
 
     NukesUser nukesUser = convertToNukesAccount(sbsUser, false);
+    if (log.isDebugEnabled()) {
+      log.debug("Converted nukesUser: " + nukesUser);
+    }
     if (duplicateUsernames != null) {
       nukesUserDAO.updateNukesAccounts(nukesUser, duplicateUsernames);
     } else {
@@ -144,6 +147,7 @@
 
     bean.setFirstName(sbsUser.getFirstName());
     bean.setLastName(sbsUser.getLastName());
+    bean.setGloballyDisabled(!sbsUser.isEnabled());
 
     Map<Long, ProfileFieldValue> profile = profileManager.getProfile(sbsUser);
 
@@ -159,13 +163,13 @@
         continue;
       }
       String value = profile.get(key).getSimpleValue();
-      
+
       if (consolidateSbsValues) {
         if (key == NukesUserMapper.ADDRESS || key == NukesUserMapper.HOME_ADDRESS) {
           value = NukesUserMapper.consolidateAddress(value);
         }
       }
-      
+
       values.put(key, value);
     }
 

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-23 07:17:46 UTC (rev 33602)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java	2010-06-23 12:14:38 UTC (rev 33603)
@@ -48,7 +48,8 @@
   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_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 = ?" + " WHERE pn_uname = ?";
+      + ", pn_companysize = ?, pn_url = ?, pn_bio = ?, pn_usertype = ?, pn_globally_disabled = ?"
+      + " WHERE pn_uname = ?";
 
   @Override
   public NukesUser getNukesUser(String username) {
@@ -116,6 +117,7 @@
     args.add(nullToEmptyString(profile.get(NukesUserMapper.URL)));
     args.add(shrink(profile.get(NukesUserMapper.BIOGRAPHY), 255));
     args.add(nullToEmptyString(profile.get(NukesUserMapper.TYPE_OF_COMPANY)));
+    args.add(user.isGloballyDisabled());
     // TODO CHeck nullability of nukes columns with SBS nullability
     // TODO check length of each column.
 

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-06-23 07:17:46 UTC (rev 33602)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java	2010-06-23 12:14:38 UTC (rev 33603)
@@ -58,6 +58,8 @@
 
   private Long passwordResetLastSent;
 
+  private boolean globallyDisabled;
+
   public NukesUser() {
   }
 
@@ -162,7 +164,8 @@
   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 + "]";
+        + lastLoggedIn + ", creationDate=" + creationDate + ", modifDate=" + modifDate + ", globallyDisabled="
+        + globallyDisabled + ", profile=" + profile + "]";
   }
 
   @Override
@@ -214,4 +217,12 @@
     return passwordResetToken;
   }
 
+  public boolean isGloballyDisabled() {
+    return globallyDisabled;
+  }
+
+  public void setGloballyDisabled(boolean globallyDisabled) {
+    this.globallyDisabled = globallyDisabled;
+  }
+
 }

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-06-23 07:17:46 UTC (rev 33602)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java	2010-06-23 12:14:38 UTC (rev 33603)
@@ -139,11 +139,13 @@
     if (sbsAddress == null) {
       return null;
     }
-    
-//    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(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");
+
     String address = sbsAddress;
     if (address.endsWith(",type:WORK")) {
       address = sbsAddress.substring(0, address.indexOf(",type:WORK"));
@@ -217,6 +219,7 @@
     bean.setPasswordResetToken(rs.getString("pn_pass_reset_token"));
     bean.setPasswordResetTimestamp(rs.getLong("pn_pass_reset_timestamp"));
     bean.setPasswordResetLastSent(rs.getLong("pn_pass_reset_last_sent"));
+    bean.setGloballyDisabled(rs.getBoolean("pn_globally_disabled"));
 
     if (isEmpty(bean.getFirstName()) || isEmpty(bean.getLastName())) {
       final String name = rs.getString("pn_name");