[jboss-svn-commits] JBL Code SVN: r23423 - labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace.

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

Author: szimano
Date: 2008-10-10 08:21:45 -0400 (Fri, 10 Oct 2008)
New Revision: 23423

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java
Log:
name/email import fixed

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java	2008-10-10 11:06:28 UTC (rev 23422)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java	2008-10-10 12:21:45 UTC (rev 23423)
@@ -160,7 +160,7 @@
 	}
 
 	private boolean empty(String s) {
-		return s == null || s.length() == 0;
+		return s == null || s.trim().length() == 0;
 	}
 
 	public LabsUser(ResultSet rs) throws SQLException {
@@ -191,6 +191,10 @@
 				}
 			}
 		}
+		
+		if (empty(name)) {
+			name = firstName + " " + lastName;
+		}
 
 		profile = new HashMap<String, String>();
 

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java	2008-10-10 11:06:28 UTC (rev 23422)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java	2008-10-10 12:21:45 UTC (rev 23423)
@@ -215,8 +215,12 @@
 						if (updateProfile) {
 							ut = mapDetails(ut, nukeUser);
 						} else {
-							// just update pass hash
+							// just update pass hash, name, firstname, lastname and email
 							ut.setPasswordHash(nukeUser.getPasswordHash());
+							ut.setName(nukeUser.getName());
+							ut.setLastName(nukeUser.getLastName());
+							ut.setFirstName(nukeUser.getFirstName());
+							ut.setEmail(nukeUser.getEmail());
 						}
 
 						final UserTemplate toUpdate = ut;