[jboss-svn-commits] JBL Code SVN: r33536 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src: main/java/org/jboss/labs/sbs/plugin/nukesauth/dao and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 17 08:19:59 EDT 2010
Author: lkrzyzanek
Date: 2010-06-17 08:19:57 -0400 (Thu, 17 Jun 2010)
New Revision: 33536
Added:
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/dao/
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapperTest.java
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/NukesUserMapper.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/update-master-account.ftl
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
Log:
Improved form for update master account
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-17 07:17:39 UTC (rev 33535)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java 2010-06-17 12:19:57 UTC (rev 33536)
@@ -125,10 +125,12 @@
* {@link NukesUserMapper#isTranslatedField(Long)}
*
* @param sbsUser
+ * @param consolidateSbsValues if true then fields that contains data from
+ * more than on fields e.g. Address are consolidated to be readable.
* @return
* @see NukesUserMapper#isTranslatedField(Long)
*/
- public NukesUser convertToNukesAccount(User sbsUser);
+ public NukesUser convertToNukesAccount(User sbsUser, boolean consolidateSbsValues);
/**
* Send password reset token
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-17 07:17:39 UTC (rev 33535)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java 2010-06-17 12:19:57 UTC (rev 33536)
@@ -124,7 +124,7 @@
log.info("Duplicate usernames: " + duplicateUsernames);
}
- NukesUser nukesUser = convertToNukesAccount(sbsUser);
+ NukesUser nukesUser = convertToNukesAccount(sbsUser, false);
if (duplicateUsernames != null) {
nukesUserDAO.updateNukesAccounts(nukesUser, duplicateUsernames);
} else {
@@ -133,7 +133,7 @@
}
@Override
- public NukesUser convertToNukesAccount(User sbsUser) {
+ public NukesUser convertToNukesAccount(User sbsUser, boolean consolidateSbsValues) {
NukesUser bean = new NukesUser(sbsUser.getUsername());
bean.setEmail(sbsUser.getEmail());
@@ -147,18 +147,26 @@
Map<Long, ProfileFieldValue> profile = profileManager.getProfile(sbsUser);
- bean.setProfile(convertToValues(profile));
+ bean.setProfile(convertToValues(profile, consolidateSbsValues));
return bean;
}
- private Map<Long, String> convertToValues(Map<Long, ProfileFieldValue> profile) {
+ private Map<Long, String> convertToValues(Map<Long, ProfileFieldValue> profile, boolean consolidateSbsValues) {
Map<Long, String> values = new HashMap<Long, String>();
for (Long key : profile.keySet()) {
if (NukesUserMapper.isTranslatedField(key)) {
continue;
}
- values.put(key, profile.get(key).getSimpleValue());
+ String value = profile.get(key).getSimpleValue();
+
+ if (consolidateSbsValues) {
+ if (key == NukesUserMapper.ADDRESS || key == NukesUserMapper.HOME_ADDRESS) {
+ value = NukesUserMapper.consolidateAddress(value);
+ }
+ }
+
+ values.put(key, value);
}
return values;
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-17 07:17:39 UTC (rev 33535)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java 2010-06-17 12:19:57 UTC (rev 33536)
@@ -122,18 +122,38 @@
*
* @param fieldId SBS profile field ID
* @return true if profile key is translated between Nukes and SBS
- * @see #ADDRESS
* @see #CLICK_HERE_FOR_JBOSS_NEWSLETTER
*
*/
public static boolean isTranslatedField(Long fieldId) {
- if (fieldId == ADDRESS) {
- return true;
- }
return profileDict.containsKey(fieldId);
}
/**
+ * Consolidate sbs address to readable form
+ *
+ * @param sbsAddress
+ * @return
+ */
+ public static String consolidateAddress(String sbsAddress) {
+ 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");
+
+ String address = sbsAddress;
+ if (address.endsWith(",type:WORK")) {
+ address = sbsAddress.substring(0, address.indexOf(",type:WORK"));
+ }
+ address = address.replaceAll("(street1:|street2:,city:|state:|country:|zip:)", "");
+
+ return address;
+ }
+
+ /**
* Translate profile fields from Nukes values to SBS's values
*
* @param profile
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java 2010-06-17 07:17:39 UTC (rev 33535)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java 2010-06-17 12:19:57 UTC (rev 33536)
@@ -26,10 +26,10 @@
import org.jboss.labs.sbs.plugin.nukesauth.NukesAccountManager;
import org.jboss.labs.sbs.plugin.nukesauth.SbsAccountManager;
import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
+import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUserMapper;
import com.jivesoftware.community.action.JiveActionSupport;
import com.jivesoftware.community.web.struts.SetReferer;
-import com.opensymphony.xwork2.Preparable;
/**
* Action for updating The Master Account when user tries to login via not
@@ -38,9 +38,9 @@
* @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
*/
@SetReferer(false)
-public class UpdateMasterAccountAction extends JiveActionSupport implements Preparable {
+public class UpdateMasterAccountAction extends JiveActionSupport {
- private List<NukesUser> duplicateAccounts;
+ private List<NukesUser> accounts;
private NukesUser masterAccount;
@@ -49,17 +49,32 @@
private SbsAccountManager sbsAccountManager;
@Override
- public void prepare() throws Exception {
+ public String input() {
if (isGuest()) {
- throw new com.jivesoftware.base.UnauthorizedException("User must be authorized");
+ return UNAUTHENTICATED;
}
- duplicateAccounts = nukesAccountManager.getNukesAccountsByEmail(getUser().getEmail());
- }
+ masterAccount = nukesAccountManager.convertToNukesAccount(getUser(), true);
- @Override
- public String input() {
- masterAccount = nukesAccountManager.convertToNukesAccount(getUser());
+ accounts = nukesAccountManager.getNukesAccountsByEmail(getUser().getEmail());
+ int masterAccIndex = 0;
+ for (int i = 0; i < accounts.size(); i++) {
+ NukesUser acc = accounts.get(i);
+ String address = acc.getProfile().get(NukesUserMapper.ADDRESS);
+ acc.getProfile().put(NukesUserMapper.ADDRESS, NukesUserMapper.consolidateAddress(address));
+
+ String homeAddress = acc.getProfile().get(NukesUserMapper.HOME_ADDRESS);
+ acc.getProfile().put(NukesUserMapper.HOME_ADDRESS, NukesUserMapper.consolidateAddress(homeAddress));
+
+ if (acc.getUsername().equals(masterAccount.getUsername())) {
+ masterAccIndex = i;
+ }
+ }
+
+ // master account is now on first place.
+ accounts.remove(masterAccIndex);
+
+ accounts.add(0, masterAccount);
return INPUT;
}
@@ -88,12 +103,12 @@
return parameterName.contains("masterAccount.");
}
- public List<NukesUser> getDuplicateAccounts() {
- return duplicateAccounts;
+ public List<NukesUser> getAccounts() {
+ return accounts;
}
- public void setDuplicateAccounts(List<NukesUser> duplicateAccounts) {
- this.duplicateAccounts = duplicateAccounts;
+ public void setAccounts(List<NukesUser> accounts) {
+ this.accounts = accounts;
}
public void setNukesAccountManager(NukesAccountManager nukesAccountManager) {
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/update-master-account.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/update-master-account.ftl 2010-06-17 07:17:39 UTC (rev 33535)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/update-master-account.ftl 2010-06-17 12:19:57 UTC (rev 33536)
@@ -27,7 +27,7 @@
<table cellspacing="2px" cellpadding="2px" border="1px solid gray">
<tr>
<td></td>
- <@s.iterator value="duplicateAccounts">
+ <@s.iterator value="accounts">
<td>
<@s.if test="username == user.username">
<@s.text name="plugin.nukesauth.updateaccount.master" />
@@ -41,58 +41,162 @@
<tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.username" />:</td>
- <@s.iterator value="duplicateAccounts">
+ <@s.iterator value="accounts">
<td><@s.property value="username" /></td>
</@s.iterator>
</tr>
<tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.firstname" />:</td>
- <@s.iterator value="duplicateAccounts">
+ <@s.iterator value="accounts" status="index">
<td>
- <@s.radio theme="simple" name="masterAccount.firstName" list="{firstName}"/>
+<input type="radio" value="<@s.property value="#index.count" />" id="firstname-<@s.property value="#index.count" />" name="masterAccount.firstName" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="firstname-<@s.property value="#index.count" />"><@s.property value="firstName" /></label>
</td>
</@s.iterator>
</tr>
<tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.lastname" />:</td>
- <@s.iterator value="duplicateAccounts">
+ <@s.iterator value="accounts" status="index">
<td>
- <@s.radio theme="simple" name="masterAccount.lastName" list="{lastName}"/>
+<input type="radio" value="<@s.property value="#index.count" />" id="lastName-<@s.property value="#index.count" />" name="masterAccount.lastName" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="lastName-<@s.property value="#index.count" />"><@s.property value="lastName" /></label>
</td>
</@s.iterator>
</tr>
<tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.address" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="address-<@s.property value="#index.count" />" name="masterAccount.profile[3]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="address-<@s.property value="#index.count" />"><@s.property value="profile[3]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.email" />:</td>
- <@s.iterator value="duplicateAccounts">
- <td><@s.property value="email" /></td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<@s.property value="email" />
+ </td>
</@s.iterator>
</tr>
<tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.phone" />:</td>
- <@s.iterator value="duplicateAccounts">
+ <@s.iterator value="accounts" status="index">
<td>
- <@s.radio theme="simple" name="masterAccount.profile[4]" list="{profile[4]}"/>
+<input type="radio" value="<@s.property value="#index.count" />" id="phone-<@s.property value="#index.count" />" name="masterAccount.profile[4]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="phone-<@s.property value="#index.count" />"><@s.property value="profile[4]" /></label>
</td>
</@s.iterator>
</tr>
<tr>
- <td><@s.text name="plugin.nukesauth.masteraccount.account.bio" />:</td>
- <@s.iterator value="duplicateAccounts">
- <td><@s.radio theme="simple" name="masterAccount.profile[11]" list="{profile[11]}"/></td>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.alternateemail" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="alternateemail-<@s.property value="#index.count" />" name="masterAccount.profile[13]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="alternateemail-<@s.property value="#index.count" />"><@s.property value="profile[13]" /></label>
+ </td>
</@s.iterator>
</tr>
<tr>
- <td><@s.text name="plugin.nukesauth.masteraccount.account.url" />:</td>
- <@s.iterator value="duplicateAccounts">
- <td><@s.radio theme="simple" name="masterAccount.profile[9]" list="{profile[9]}"/></td>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.icq" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="icq-<@s.property value="#index.count" />" name="masterAccount.profile[5004]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="icq-<@s.property value="#index.count" />"><@s.property value="profile[5004]" /></label>
+ </td>
</@s.iterator>
</tr>
<tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.aim" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="aim-<@s.property value="#index.count" />" name="masterAccount.profile[5012]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="aim-<@s.property value="#index.count" />"><@s.property value="profile[5012]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.yim" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="yim-<@s.property value="#index.count" />" name="masterAccount.profile[5015]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="yim-<@s.property value="#index.count" />"><@s.property value="profile[5015]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.homeaddress" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="homeaddress-<@s.property value="#index.count" />" name="masterAccount.profile[14]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="homeaddress-<@s.property value="#index.count" />"><@s.property value="profile[14]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.occupation" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="occupation-<@s.property value="#index.count" />" name="masterAccount.profile[5009]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="occupation-<@s.property value="#index.count" />"><@s.property value="profile[5009]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.expertise" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="expertise-<@s.property value="#index.count" />" name="masterAccount.profile[12]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="expertise-<@s.property value="#index.count" />"><@s.property value="profile[12]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.companyname" />:</td>
- <@s.iterator value="duplicateAccounts">
- <td><@s.radio theme="simple" name="masterAccount.profile[5001]" list="{profile[5001]}"/></td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="companyname-<@s.property value="#index.count" />" name="masterAccount.profile[5001]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="companyname-<@s.property value="#index.count" />"><@s.property value="profile[5001]" /></label>
+ </td>
</@s.iterator>
</tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.title" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="title-<@s.property value="#index.count" />" name="masterAccount.profile[1]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="title-<@s.property value="#index.count" />"><@s.property value="profile[1]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.url" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="url-<@s.property value="#index.count" />" name="masterAccount.profile[9]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="url-<@s.property value="#index.count" />"><@s.property value="profile[9]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td nowrap="nowrap"><@s.text name="plugin.nukesauth.masteraccount.account.typeofcompany" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="typeofcompany-<@s.property value="#index.count" />" name="masterAccount.profile[5029]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="typeofcompany-<@s.property value="#index.count" />"><@s.property value="profile[5029]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.bio" />:</td>
+ <@s.iterator value="accounts" status="index">
+ <td>
+<input type="radio" value="<@s.property value="#index.count" />" id="bio-<@s.property value="#index.count" />" name="masterAccount.profile[11]" <@s.if test="#index.count == 1">checked="checked"</@s.if>>
+<label for="bio-<@s.property value="#index.count" />"><@s.property value="profile[11]" /></label>
+ </td>
+ </@s.iterator>
+ </tr>
</table>
<p> </p>
<table>
@@ -103,8 +207,6 @@
<@s.submit key="plugin.nukesauth.updateaccount.cancel" method="cancel"/>
</td></tr>
</table>
- <@s.hidden name="masterAccount.username" />
- <@s.hidden name="masterAccount.email" />
</@s.form>
</div>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties 2010-06-17 07:17:39 UTC (rev 33535)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties 2010-06-17 12:19:57 UTC (rev 33536)
@@ -9,6 +9,18 @@
plugin.nukesauth.masteraccount.account.bio=Bio
plugin.nukesauth.masteraccount.account.url=URL
plugin.nukesauth.masteraccount.account.companyname=Company name
+plugin.nukesauth.masteraccount.account.title=Title
+plugin.nukesauth.masteraccount.account.companysize=Comapny size
+plugin.nukesauth.masteraccount.account.typeofcompany=Type of company
+plugin.nukesauth.masteraccount.account.alternateemail=Alternative e-mail
+plugin.nukesauth.masteraccount.account.icq=ICQ Number
+plugin.nukesauth.masteraccount.account.aim= AIM Number
+plugin.nukesauth.masteraccount.account.yim=YIM Number
+plugin.nukesauth.masteraccount.account.msn=MNS Number
+plugin.nukesauth.masteraccount.account.address=Address
+plugin.nukesauth.masteraccount.account.homeaddress=Home Address
+plugin.nukesauth.masteraccount.account.occupation=Occupation
+plugin.nukesauth.masteraccount.account.expertise=Expertise
plugin.nukesauth.masteraccount.masterpassword=Password
plugin.nukesauth.masteraccount.masterpassword.required=Password is required
Added: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapperTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapperTest.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapperTest.java 2010-06-17 12:19:57 UTC (rev 33536)
@@ -0,0 +1,17 @@
+package org.jboss.labs.sbs.plugin.nukesauth.dao;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class NukesUserMapperTest {
+
+ @Test
+ public void testConsolidateAddress() {
+ assertEquals(
+ "Purkynova 99,Brno,,CzechRepublic,612 45",
+ NukesUserMapper
+ .consolidateAddress("street1:Purkynova 99,street2:,city:Brno,state:,country:CzechRepublic,zip:612 45,type:WORK"));
+ }
+
+}
Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapperTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the jboss-svn-commits
mailing list