[portal-commits] JBoss Portal SVN: r13376 - in branches/JBoss_Portal_Branch_2_7/core-identity/src: main/org/jboss/portal/core/identity/ui/validators and 3 other directories.

Author: chris.laprun(a)jboss.com Date: 2009-05-15 08:10:05 -0400 (Fri, 15 May 2009) New Revision: 13376 Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java Removed: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml Log: - JBPORTAL-2390, JBPORTAL-2391: + Editable role and display names are now properly validated for XSS injection and handle duplicate error better + CreateRoleAction and EditRoleAction now inherit from BaseRoleAction which leverages ManagedBean functionality for input validation + Updated properties to add support for ManagedBean messages, removed duplicated key + Removed now unused RoleValidator and associated localization keys Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-15 12:10:05 UTC (rev 13376) @@ -0,0 +1,90 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ + +package org.jboss.portal.core.identity.ui.actions; + +import org.jboss.portal.faces.gui.ManagedBean; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.core.identity.ui.UIRole; +import org.jboss.portal.core.identity.ui.common.IdentityRoleBean; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class BaseRoleAction extends ManagedBean +{ + /** .*/ + protected UIRole uiRole; + /** .*/ + protected IdentityRoleBean identityRoleBean; + + protected String getObjectTypeName() + { + return "ROLE_TYPE"; + } + + public boolean isAlreadyExisting(String objectName) + { + try + { + return identityRoleBean.getRoleModule().findRoleByName(objectName) != null; + } + catch (IdentityException e) + { + // due to current design of identity module, findRoleByName throws an exception if the role is not found + // instead of returning null as would be traditionally expected... Pb is IdentityException is also used to + // wrap HibernateExceptions... + if (e.getMessage().contains("No such role")) + { + // ignore + } + else + { + log.error("Error validation rolename", e); + beanContext.createErrorMessageFrom(e); + } + return false; + } + } + + public UIRole getUiRole() + { + return uiRole; + } + + public void setUiRole(UIRole uiRole) + { + this.uiRole = uiRole; + } + + public IdentityRoleBean getIdentityRoleBean() + { + return identityRoleBean; + } + + public void setIdentityRoleBean(IdentityRoleBean identityRoleBean) + { + this.identityRoleBean = identityRoleBean; + } +} Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java 2009-05-15 12:10:05 UTC (rev 13376) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -23,52 +23,39 @@ package org.jboss.portal.core.identity.ui.actions; import org.jboss.portal.core.identity.ui.UIRole; -import org.jboss.portal.core.identity.ui.common.IdentityRoleBean; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -public class CreateRoleAction +public class CreateRoleAction extends BaseRoleAction { - - /** .*/ - private UIRole uiRole = new UIRole(); - - /** .*/ - private IdentityRoleBean identityRoleBean; - - public UIRole getUiRole() + public CreateRoleAction() { - return uiRole; + uiRole = new UIRole(); } - public void setUiRole(UIRole uiRole) - { - this.uiRole = uiRole; - } - - public IdentityRoleBean getIdentityRoleBean() - { - return identityRoleBean; - } - - public void setIdentityRoleBean(IdentityRoleBean identityRoleBean) - { - this.identityRoleBean = identityRoleBean; - } - public String createRole() { - try + String name = this.uiRole.getName(); + String displayName = this.uiRole.getDisplayName(); + name = checkNameValidity(name, "create-role-form:rolename"); + displayName = checkNameValidity(displayName, "create-role-form:roledisplayname", false); + + if (name != null && displayName != null) { - identityRoleBean.getRoleModule().createRole(this.uiRole.getName(), this.uiRole.getDisplayName()); + try + { + identityRoleBean.getRoleModule().createRole(name, displayName); + return "roleAdmin"; + } + catch (Exception e) + { + log.error("An error occurred during role creation", e); + beanContext.createErrorMessageFrom(e); + } } - catch (Exception e) - { - e.printStackTrace(); - } - return "roleAdmin"; - } + return null; + } } Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2009-05-15 12:10:05 UTC (rev 13376) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -22,83 +22,52 @@ ******************************************************************************/ package org.jboss.portal.core.identity.ui.actions; -import java.util.Map; - -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; - import org.jboss.portal.common.text.FastURLDecoder; -import org.jboss.portal.core.identity.ui.UIRole; -import org.jboss.portal.core.identity.ui.common.IdentityRoleBean; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -public class EditRoleAction +public class EditRoleAction extends BaseRoleAction { - /** .*/ - private String currentRole; - - /** .*/ - private UIRole uiRole; - - /** .*/ - private IdentityRoleBean identityRoleBean; - /** . */ private static final FastURLDecoder decoder = FastURLDecoder.getUTF8Instance(); - public UIRole getUiRole() - { - return uiRole; - } - - public void setUiRole(UIRole uiRole) - { - this.uiRole = uiRole; - } - - public IdentityRoleBean getIdentityRoleBean() - { - return identityRoleBean; - } - - public void setIdentityRoleBean(IdentityRoleBean identityRoleBean) - { - this.identityRoleBean = identityRoleBean; - } - public String editRole() { - FacesContext ctx = FacesContext.getCurrentInstance(); - ExternalContext ectx = ctx.getExternalContext(); - Map params = ectx.getRequestParameterMap(); - this.currentRole = params.get("currentRole") != null ? decoder.encode((String) params.get("currentRole")) : null; + String currentRole = beanContext.getParameter("currentRole"); + currentRole = (currentRole != null ? decoder.encode(currentRole) : null); try { - this.uiRole = identityRoleBean.getUIRole(this.currentRole); + this.uiRole = identityRoleBean.getUIRole(currentRole); return "editRole"; } catch (Exception e) { - e.printStackTrace(); + log.error("Couldn't edit role " + currentRole, e); + beanContext.createErrorMessageFrom(e); } return "roleAdmin"; } public String updateRole() { - try + String roleDisplayName = this.uiRole.getDisplayName(); + roleDisplayName = checkNameValidity(roleDisplayName, "edit-role-link:display-name", false); // do not check for duplicates + if (roleDisplayName != null) { - identityRoleBean.updateRoleDisplayName(this.uiRole.getName(), this.uiRole.getDisplayName()); + try + { + identityRoleBean.updateRoleDisplayName(this.uiRole.getName(), roleDisplayName); + return "roleAdmin"; + } + catch (Exception e) + { + beanContext.createErrorMessageFrom(e); + } } - catch (Exception e) - { - e.printStackTrace(); - } - return "roleAdmin"; + return null; } } Deleted: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java 2009-05-15 12:10:05 UTC (rev 13376) @@ -1,88 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.core.identity.ui.validators; - -import java.util.ResourceBundle; - -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; -import javax.portlet.PortletContext; - -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.Role; -import org.jboss.portal.identity.RoleModule; - -/** - * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> - * @version $Revision$ - */ - -public class RoleValidator implements Validator -{ - /** The role module */ - private RoleModule roleModule; - - /** The logger */ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(RoleValidator.class); - - public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException - { - String rolename = (String) value; - ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale()); - PortletContext portletContext = (PortletContext) context.getExternalContext().getContext(); - roleModule = (RoleModule) portletContext.getAttribute("RoleModule"); - - try - { - @SuppressWarnings("unused") - Role u = roleModule.findRoleByName(rolename); - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, - bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN"), - bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN"))); - } - catch (IllegalArgumentException e) - { - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, - bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"), - bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"))); - } - catch (IdentityException e) - { - // TODO: Throw a catchable error - if (e.getMessage().contains("No such role")) - { - // ignore - } - else - { - log.error("Error validation rolename", e); - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, - bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"), - bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"))); - } - } - } -} Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-15 12:10:05 UTC (rev 13376) @@ -116,7 +116,6 @@ IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Assigned roles IDENTITY_MANAGEMENT_CREATE_ROLE=Create new role IDENTITY_MANAGEMENT_EDIT_ROLE=Edit role -IDENTITY_MANAGEMENT_CREATE_ROLE=Create role IDENTITY_MANAGEMENT_DISABLE=Disable IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=User disabled IDENTITY_MANAGEMENT_ENABLE=Enable @@ -171,14 +170,16 @@ IDENTITY_VALIDATION_ERROR_REGISTRATION=Failed to register user. IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=This username is already taken. IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating the username. -IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=This role name is already taken. -IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Error while validating the role name. IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=The passwords doesn't match. IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Error while validating password. IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address. IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Invalid password IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect +ROLE_TYPE=role +INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c' +DUPLICATE_ERROR=A {1} named ''{0}'' already exists! + # Example usage for dynamic values IDENTITY_DYNAMIC_VALUE_TEST=test label IDENTITY_DYNAMIC_VALUE_TEST2=test label2 Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-15 12:10:05 UTC (rev 13376) @@ -24,7 +24,7 @@ IDENTITY_AIM = Identifiant AIM -IDENTITY_APPLICATION_NOT_AVAILABLE = Portlet non disponible. V\u00E9rifiez votre configuration et les journaux syst\u00E8me pour plus d'information. +IDENTITY_APPLICATION_NOT_AVAILABLE = Portlet non disponible. V\u00e9rifiez votre configuration et les journaux syst\u00e8me pour plus d'information. IDENTITY_BUTTON_CANCEL = Annuler @@ -32,19 +32,19 @@ IDENTITY_BUTTON_SUBMIT = Soumettre -IDENTITY_CATEGORY_ADDITIONAL = Information compl\u00E9mentaire +IDENTITY_CATEGORY_ADDITIONAL = Information compl\u00e9mentaire -IDENTITY_CATEGORY_ADDITIONAL_EXTRA = (255 caract\u00E8res max.) +IDENTITY_CATEGORY_ADDITIONAL_EXTRA = (255 caract\u00e8res max.) -IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE = (Signature de 255 caract\u00E8res max) +IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE = (Signature de 255 caract\u00e8res max) -IDENTITY_CATEGORY_GENERAL = Pr\u00E9f\u00E9rences g\u00E9n\u00E9rales +IDENTITY_CATEGORY_GENERAL = Pr\u00e9f\u00e9rences g\u00e9n\u00e9rales -IDENTITY_CATEGORY_INSTANT = Comptes de messagerie instantan\u00E9e +IDENTITY_CATEGORY_INSTANT = Comptes de messagerie instantan\u00e9e IDENTITY_CATEGORY_PERSONAL = Informations personnelles -IDENTITY_CREATE_ACCOUNT = Vous pouvez cr\u00E9er un compte. +IDENTITY_CREATE_ACCOUNT = Vous pouvez cr\u00e9er un compte. # Example usage for dynamic values IDENTITY_DYNAMIC_VALUE_TEST = test label @@ -55,15 +55,15 @@ IDENTITY_EDIT_CHANGE_EMAIL_ERROR = Impossible de changer l'adresse de courriel. -IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED = Votre adresse de courriel a \u00E9t\u00E9 mise \u00E0 jour. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED = Votre adresse de courriel a \u00e9t\u00e9 mise \u00e0 jour. -IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING = Un courriel a \u00E9t\u00E9 envoy\u00E9 \u00E0 l'adresse indiqu\u00E9e afin d'en confirmer la validit\u00E9. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING = Un courriel a \u00e9t\u00e9 envoy\u00e9 \u00e0 l'adresse indiqu\u00e9e afin d'en confirmer la validit\u00e9. IDENTITY_EDIT_CHANGE_PASSWORD = Changer mon mot de passe IDENTITY_EDIT_CHANGE_PASSWORD_ERROR = Impossible de changer votre mot de passe. -IDENTITY_EDIT_CHANGE_PASSWOR_STATUS = Votre mot de passe a \u00E9t\u00E9 modifi\u00E9. +IDENTITY_EDIT_CHANGE_PASSWOR_STATUS = Votre mot de passe a \u00e9t\u00e9 modifi\u00e9. IDENTITY_EDIT_EMAIL_NEW = Nouvelle adresse courriel @@ -73,39 +73,39 @@ IDENTITY_EDIT_PASSWORD_TITLE = Changer mon mot de passe -IDENTITY_EDIT_PROFILE_ERROR = Erreur lors de la mise \u00E0 jour de votre profil. +IDENTITY_EDIT_PROFILE_ERROR = Erreur lors de la mise \u00e0 jour de votre profil. IDENTITY_EDIT_PROFILE_TITLE = Modifier mon profil IDENTITY_EMAIL = Courriel -IDENTITY_ENABLED = Activ\u00E9 +IDENTITY_ENABLED = Activ\u00e9 IDENTITY_EXTRA = Extra IDENTITY_FAMILYNAME = Nom -IDENTITY_GIVENNAME = Pr\u00E9nom +IDENTITY_GIVENNAME = Pr\u00e9nom IDENTITY_HOMEPAGE = Page web -IDENTITY_ICQ = Num\u00E9ro Icq +IDENTITY_ICQ = Num\u00e9ro Icq -IDENTITY_INTERESTS = Centres d'int\u00E9r\u00EAts +IDENTITY_INTERESTS = Centres d'int\u00e9r\u00eats -IDENTITY_LAST_LOGIN = Derni\u00E8re visite +IDENTITY_LAST_LOGIN = Derni\u00e8re visite IDENTITY_LOCALE = Langue -IDENTITY_LOCATION = Lieu de r\u00E9sidence +IDENTITY_LOCATION = Lieu de r\u00e9sidence IDENTITY_LOST_PASSWORD = Mot de passe perdu -IDENTITY_LOST_PASSWORD_DESCRIPTION = Veuillez entrer votre identifiant afin de r\u00E9initialiser votre mot de passe. +IDENTITY_LOST_PASSWORD_DESCRIPTION = Veuillez entrer votre identifiant afin de r\u00e9initialiser votre mot de passe. -IDENTITY_LOST_PASSWORD_ERROR = \u00C9chec de r\u00E9initialisation de votre mot de passe. +IDENTITY_LOST_PASSWORD_ERROR = \u00c9chec de r\u00e9initialisation de votre mot de passe. -IDENTITY_LOST_PASSWORD_STATUS_404 = Aucun compte trouv\u00E9. +IDENTITY_LOST_PASSWORD_STATUS_404 = Aucun compte trouv\u00e9. IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL = Vous receverez sous peu via courriel votre nouveau mot de passe. @@ -115,7 +115,7 @@ IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL = Confirmer l'adresse de courriel -IDENTITY_MAIL_SUBJECT_LOST_PASSWORD = R\u00E9initialiser mon mot de passe +IDENTITY_MAIL_SUBJECT_LOST_PASSWORD = R\u00e9initialiser mon mot de passe IDENTITY_MAIL_SUBJECT_REGISTER = Confirmer mon enregistrement @@ -125,39 +125,39 @@ IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE = Modifier -IDENTITY_MANAGEMENT_ACTION_ROLES = R\u00F4les +IDENTITY_MANAGEMENT_ACTION_ROLES = R\u00f4les -IDENTITY_MANAGEMENT_APPROVE_ALL = Approuver la s\u00E9lection +IDENTITY_MANAGEMENT_APPROVE_ALL = Approuver la s\u00e9lection -IDENTITY_MANAGEMENT_ASSIGN_ROLES = Assigner un r\u00F4le +IDENTITY_MANAGEMENT_ASSIGN_ROLES = Assigner un r\u00f4le IDENTITY_MANAGEMENT_COUNT_PENDING_USERS = Comptes en attente d'approbation -IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS = Utilisateurs enregistr\u00E9s +IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS = Utilisateurs enregistr\u00e9s -IDENTITY_MANAGEMENT_CREATE_ROLE = Cr\u00E9er un nouveau r\u00F4le +IDENTITY_MANAGEMENT_CREATE_ROLE = Cr\u00e9er un nouveau r\u00f4le -IDENTITY_MANAGEMENT_CREATE_USER = Cr\u00E9er un nouveau compte utilisateur +IDENTITY_MANAGEMENT_CREATE_USER = Cr\u00e9er un nouveau compte utilisateur -IDENTITY_MANAGEMENT_CREATE_USER_CREATED = Compte cr\u00E9\u00E9 +IDENTITY_MANAGEMENT_CREATE_USER_CREATED = Compte cr\u00e9\u00e9 IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC = Automatique - pas de validation par courriel et pas d'approbation -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM = Mode d'abonnement personnalis\u00E9 +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM = Mode d'abonnement personnalis\u00e9 IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL = Validation par courriel et pas d'approbation IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN = Validation par courriel et approbation par un administrateur -IDENTITY_MANAGEMENT_DISABLE = D\u00E9sactiver +IDENTITY_MANAGEMENT_DISABLE = D\u00e9sactiver -IDENTITY_MANAGEMENT_EDIT_ROLE = Modifier le r\u00F4le +IDENTITY_MANAGEMENT_EDIT_ROLE = Modifier le r\u00f4le IDENTITY_MANAGEMENT_ENABLE = Activer -IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE = Impossible d'effectuer l'op\u00E9ration demand\u00E9e sur ce r\u00F4le. Consultez le journal syst\u00E8me pour plus de d\u00E9tails. +IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE = Impossible d'effectuer l'op\u00e9ration demand\u00e9e sur ce r\u00f4le. Consultez le journal syst\u00e8me pour plus de d\u00e9tails. -IDENTITY_MANAGEMENT_ERROR_ACTION_USER = Impossible d'effectuer l'op\u00E9ration demand\u00E9e sur ce compte. Consultez le journal syst\u00E8me pour plus de d\u00E9tails. +IDENTITY_MANAGEMENT_ERROR_ACTION_USER = Impossible d'effectuer l'op\u00e9ration demand\u00e9e sur ce compte. Consultez le journal syst\u00e8me pour plus de d\u00e9tails. IDENTITY_MANAGEMENT_MATRIX = Matrice @@ -169,27 +169,27 @@ IDENTITY_MANAGEMENT_PENDING_REJECT = rejeter -IDENTITY_MANAGEMENT_REJECT_ALL = Rejeter la s\u00E9lection +IDENTITY_MANAGEMENT_REJECT_ALL = Rejeter la s\u00e9lection -IDENTITY_MANAGEMENT_RESET_PASSWORD = R\u00E9initialiser le mot de passe +IDENTITY_MANAGEMENT_RESET_PASSWORD = R\u00e9initialiser le mot de passe -IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION = L'utilisateur recevera un nouveau mot de passe al\u00E9atoire envoy\u00E9 via courriel. +IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION = L'utilisateur recevera un nouveau mot de passe al\u00e9atoire envoy\u00e9 via courriel. -IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER = R\u00E9initialiser le mot de passe pour l'usager +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER = R\u00e9initialiser le mot de passe pour l'usager -IDENTITY_MANAGEMENT_ROLE = R\u00F4le +IDENTITY_MANAGEMENT_ROLE = R\u00f4le -IDENTITY_MANAGEMENT_ROLE_ASSIGNED = R\u00F4les assign\u00E9s +IDENTITY_MANAGEMENT_ROLE_ASSIGNED = R\u00f4les assign\u00e9s IDENTITY_MANAGEMENT_ROLE_DISPLAY = Nom courant -IDENTITY_MANAGEMENT_ROLE_MANAGEMENT = Gestion des r\u00F4les +IDENTITY_MANAGEMENT_ROLE_MANAGEMENT = Gestion des r\u00f4les IDENTITY_MANAGEMENT_ROLE_MEMBERS = Membres IDENTITY_MANAGEMENT_SEARCH_USER = Rechercher -IDENTITY_MANAGEMENT_SELECT_ALL = Tout s\u00E9lectionner +IDENTITY_MANAGEMENT_SELECT_ALL = Tout s\u00e9lectionner IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE = Administrer les modes d'abonnement @@ -197,17 +197,17 @@ IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES = Modes d'abonnement -IDENTITY_MANAGEMENT_UNSELECT_ALL = Tout d\u00E9s\u00E9lectionner +IDENTITY_MANAGEMENT_UNSELECT_ALL = Tout d\u00e9s\u00e9lectionner -IDENTITY_MANAGEMENT_USER_DELETED = Compte supprim\u00E9 +IDENTITY_MANAGEMENT_USER_DELETED = Compte supprim\u00e9 IDENTITY_MANAGEMENT_USER_MANAGEMENT = Gestion des utilisateurs IDENTITY_MSNM = Identifiant MSN -IDENTITY_NOT_LOGGED_IN = Vous n'\u00EAtes pas connect\u00E9. +IDENTITY_NOT_LOGGED_IN = Vous n'\u00eates pas connect\u00e9. -IDENTITY_OCCUPATION = M\u00E9tier +IDENTITY_OCCUPATION = M\u00e9tier IDENTITY_PASSWORD = Mot de passe @@ -217,33 +217,33 @@ IDENTITY_REGISTER_PASSWORD_CONFIRM = Confirmation de mot de passe -IDENTITY_REGISTER_PENDING_TITLE = Un courriel a \u00E9t\u00E9 envoy\u00E9 \u00E0 l'adresse indiqu\u00E9e afin de confirmer votre enregistrement. +IDENTITY_REGISTER_PENDING_TITLE = Un courriel a \u00e9t\u00e9 envoy\u00e9 \u00e0 l'adresse indiqu\u00e9e afin de confirmer votre enregistrement. IDENTITY_REGISTER_REQUIRED_INFORMATION = indique un champ obligatoire IDENTITY_REGISTER_STATUS_TITLE = Statut d'enregistrement -IDENTITY_REGISTER_SUCCESS_TITLE = Votre compte a \u00E9t\u00E9 cr\u00E9\u00E9 avec succ\u00E8s. Vous pouvez vous connecter. +IDENTITY_REGISTER_SUCCESS_TITLE = Votre compte a \u00e9t\u00e9 cr\u00e9\u00e9 avec succ\u00e8s. Vous pouvez vous connecter. -IDENTITY_REGISTER_TITLE = Informations g\u00E9n\u00E9rales +IDENTITY_REGISTER_TITLE = Informations g\u00e9n\u00e9rales IDENTITY_REGISTER_TITLE_CONFIRM = Confirmation IDENTITY_REGISTER_TITLE_CONFIRM_DELETE = Confirmation : supprimer -IDENTITY_REGISTER_VERIFY_CAPTCHA = V\u00E9rification visuelle +IDENTITY_REGISTER_VERIFY_CAPTCHA = V\u00e9rification visuelle -IDENTITY_REGISTRATION_DATE = Enregistr\u00E9 le +IDENTITY_REGISTRATION_DATE = Enregistr\u00e9 le -IDENTITY_SECURITY_ANSWER = R\u00E9ponse \u00E0 votre question de s\u00E9curit\u00E9 +IDENTITY_SECURITY_ANSWER = R\u00e9ponse \u00e0 votre question de s\u00e9curit\u00e9 -IDENTITY_SECURITY_QUESTION = Question de s\u00E9curit\u00E9 +IDENTITY_SECURITY_QUESTION = Question de s\u00e9curit\u00e9 IDENTITY_SIGNATURE = Signature -IDENTITY_SKYPE = Num\u00E9ro Skype +IDENTITY_SKYPE = Num\u00e9ro Skype -IDENTITY_THEME = Th\u00E8me +IDENTITY_THEME = Th\u00e8me IDENTITY_TIMEZONE = Fuseau horaire @@ -253,7 +253,7 @@ IDENTITY_VALIDATION_ERROR_INVALID_EMAIL = Adresse de courriel invalide. -IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD = Mot de passe erron\u00E9. +IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD = Mot de passe erron\u00e9. IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH = Vos mots de passe ne correspondent pas. @@ -263,7 +263,7 @@ IDENTITY_VALIDATION_ERROR_USERNAME_ERROR = Erreur lors de la validation du nom d'utilisateur. -IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN = Ce nom d'utilisateur est d\u00E9j\u00E0 utilis\u00E9. +IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN = Ce nom d'utilisateur est d\u00e9j\u00e0 utilis\u00e9. IDENTITY_VERIFICATION_LOGIN = Connexion @@ -273,17 +273,17 @@ IDENTITY_VERIFICATION_STATUS_FAILED = Impossible de valider cette adresse de courriel. -IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL = Votre adresse de courriel a \u00E9t\u00E9 v\u00E9rifi\u00E9e, mais votre compte doit \u00EAtre approuv\u00E9 par un administrateur. +IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL = Votre adresse de courriel a \u00e9t\u00e9 v\u00e9rifi\u00e9e, mais votre compte doit \u00eatre approuv\u00e9 par un administrateur. -IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM = Votre compte a \u00E9t\u00E9 activ\u00E9. Vous pouvez vous connecter. +IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM = Votre compte a \u00e9t\u00e9 activ\u00e9. Vous pouvez vous connecter. -IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS = Votre compte a \u00E9t\u00E9 activ\u00E9. Vous pouvez vous connecter. +IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS = Votre compte a \u00e9t\u00e9 activ\u00e9. Vous pouvez vous connecter. -IDENTITY_VERIFICATION_STATUS_VALIDATED = Adresse de courriel valid\u00E9e. +IDENTITY_VERIFICATION_STATUS_VALIDATED = Adresse de courriel valid\u00e9e. IDENTITY_VIEW_PROFILE_TITLE = Voir mon profil -IDENTITY_WARNING_CONFIRM_DELETE_ROLE = Attention ! Vous allez supprimer le r\u00F4le +IDENTITY_WARNING_CONFIRM_DELETE_ROLE = Attention ! Vous allez supprimer le r\u00f4le IDENTITY_WARNING_CONFIRM_DELETE_USER = Attention ! Vous allez supprimer le compte @@ -295,3 +295,7 @@ javax.portlet.title=Utilisateur javax.faces.component.UIInput.REQUIRED=Valeur requise + +ROLE_TYPE=r\u00f4le +DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0! +INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '\\', '<', '>', '(', ')', '=' ou '%5c' Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-05-15 12:10:05 UTC (rev 13376) @@ -116,7 +116,6 @@ IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Ruoli assegnati IDENTITY_MANAGEMENT_CREATE_ROLE=Crea un nuovo ruolo IDENTITY_MANAGEMENT_EDIT_ROLE=Modifica il ruolo -IDENTITY_MANAGEMENT_CREATE_ROLE=Crea il ruolo IDENTITY_MANAGEMENT_DISABLE=Disabilita IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Utente disabilitato IDENTITY_MANAGEMENT_ENABLE=Abilita @@ -171,8 +170,6 @@ IDENTITY_VALIDATION_ERROR_REGISTRATION=Fallita la registrazione dell'utente. IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Il nome utente esiste gi\u00e0. IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Errore durante la validazione del nome utente. -IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=Il nome del ruolo esiste gi\u00e0. -IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Errore durante la validazione del nome del ruolo. IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=Le passwords non coincidono. IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Errore durante la validazione della password. IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Indirizzo e-mail non valido. @@ -187,3 +184,7 @@ javax.portlet.keywords=amministrazione,utente javax.faces.component.UIInput.REQUIRED=Il valore \u00e8 richiesto + +ROLE_TYPE=ruolo +INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '\\', '<', '>', '(', ')', '=' o '%5c' +DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0! \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties 2009-05-15 12:10:05 UTC (rev 13376) @@ -114,7 +114,6 @@ IDENTITY_MANAGEMENT_ROLE_ASSIGNED=\u30a2\u30b5\u30a4\u30f3\u30ed\u30fc\u30eb IDENTITY_MANAGEMENT_CREATE_ROLE=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u306e\u4f5c\u6210 IDENTITY_MANAGEMENT_EDIT_ROLE=\u30ed\u30fc\u30eb\u306e\u7de8\u96c6 -IDENTITY_MANAGEMENT_CREATE_ROLE=\u30ed\u30fc\u30eb\u306e\u4f5c\u6210 IDENTITY_MANAGEMENT_DISABLE=\u7121\u52b9 IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=\u7121\u52b9\u306b\u306a\u3063\u305f\u30e6\u30fc\u30b6 IDENTITY_MANAGEMENT_ENABLE=\u6709\u52b9 @@ -169,8 +168,6 @@ IDENTITY_VALIDATION_ERROR_REGISTRATION=\u30e6\u30fc\u30b6\u306e\u767b\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=\u3053\u306e\u30e6\u30fc\u30b6\u540d\u306f\u65e2\u306b\u4f7f\u308f\u308c\u3066\u3044\u307e\u3059\u3002 IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=\u30e6\u30fc\u30b6\u540d\u306e\u30a8\u30e9\u30fc\u3002 -IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=\u3053\u306e\u30ed\u30fc\u30eb\u540d\u306f\u65e2\u306b\u4f7f\u308f\u308c\u3066\u3044\u307e\u3059. -IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=\u30ed\u30fc\u30eb\u59ea\u306e\u30a8\u30e9\u30fc\u3002 IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002 IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u30a8\u30e9\u30fc\u3002 IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=\u7121\u52b9\u306aE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u3059\u3002 @@ -185,3 +182,5 @@ javax.portlet.keywords=\u7ba1\u7406,\u30e6\u30fc\u30b6 javax.faces.component.UIInput.REQUIRED=\u5fc5\u9808\u5024\u3067\u3059 + +ROLE_TYPE=\u30ed\u30fc\u30eb\u306e \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-05-15 12:10:05 UTC (rev 13376) @@ -21,31 +21,31 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -javax.faces.validator.LengthValidator.MINIMUM= Entrada \u00E9 muito curta (m\u00EDnimo de {0} caracteres). +javax.faces.validator.LengthValidator.MINIMUM= Entrada \u00e9 muito curta (m\u00ednimo de {0} caracteres). -IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet n\u00E3o dispon\u00EDvel. Verifique sua configura\u00E7\u00E3o e log de erro para mais informa\u00E7\u00F5es. +IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet n\u00e3o dispon\u00edvel. Verifique sua configura\u00e7\u00e3o e log de erro para mais informa\u00e7\u00f5es. IDENTITY_WELCOME=Bem-vindo IDENTITY_REGISTER=Registrar-se IDENTITY_LOST_PASSWORD=Esqueceu Senha -IDENTITY_NOT_LOGGED_IN=Voc\u00EA n\u00E3o est\u00E1 autenticado no portal. -IDENTITY_CREATE_ACCOUNT=Voc\u00EA pode criar uma conta. +IDENTITY_NOT_LOGGED_IN=Voc\u00ea n\u00e3o est\u00e1 autenticado no portal. +IDENTITY_CREATE_ACCOUNT=Voc\u00ea pode criar uma conta. IDENTITY_BUTTON_SUBMIT=Enviar IDENTITY_BUTTON_EDIT=Editar IDENTITY_BUTTON_CANCEL=Cancelar -IDENTITY_REGISTER_TITLE=Informa\u00E7\u00F5es b\u00E1sicas do usu\u00E1rio -IDENTITY_REGISTER_TITLE_CONFIRM=Confirma\u00E7\u00E3o +IDENTITY_REGISTER_TITLE=Informa\u00e7\u00f5es b\u00e1sicas do usu\u00e1rio +IDENTITY_REGISTER_TITLE_CONFIRM=Confirma\u00e7\u00e3o IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirme a Senha IDENTITY_REGISTER_STATUS_TITLE=Status do registro -IDENTITY_REGISTER_SUCCESS_TITLE=Sua conta foi criada com \u00EAxito. Voc\u00EA pode autenticar-se agora. -IDENTITY_REGISTER_PENDING_TITLE=Um e-mail foi enviado ao seu endere\u00E7o de e-mail para confirmar o seu registro. -IDENTITY_REGISTER_REQUIRED_INFORMATION=indica um campo obrigat\u00F3rio. +IDENTITY_REGISTER_SUCCESS_TITLE=Sua conta foi criada com \u00eaxito. Voc\u00ea pode autenticar-se agora. +IDENTITY_REGISTER_PENDING_TITLE=Um e-mail foi enviado ao seu endere\u00e7o de e-mail para confirmar o seu registro. +IDENTITY_REGISTER_REQUIRED_INFORMATION=indica um campo obrigat\u00f3rio. IDENTITY_LOST_PASSWORD_TITLE=Esqueceu seu dados de login? -IDENTITY_LOST_PASSWORD_DESCRIPTION=Digite seu usu\u00E1rio para redefinir sua senha. -IDENTITY_LOST_PASSWORD_ERROR=Falha na redefini\u00E7\u00E3o de senha. -IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Voc\u00EA receber\u00E1 um e-mail com sua nova senha. +IDENTITY_LOST_PASSWORD_DESCRIPTION=Digite seu usu\u00e1rio para redefinir sua senha. +IDENTITY_LOST_PASSWORD_ERROR=Falha na redefini\u00e7\u00e3o de senha. +IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Voc\u00ea receber\u00e1 um e-mail com sua nova senha. IDENTITY_LOST_PASSWORD_STATUS_404=Nenhuma conta encontrada. IDENTITY_LOST_PASSWORD_STATUS_TITLE=Esqueceu senha @@ -53,27 +53,27 @@ IDENTITY_EDIT_PASSWORD_TITLE=Altere a sua senha IDENTITY_EDIT_PASSWORD_CURRENT=Senha atual IDENTITY_EDIT_CHANGE_PASSWORD=Alterar senha -IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=N\u00E3o foi poss\u00EDvel alterar a senha. +IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=N\u00e3o foi poss\u00edvel alterar a senha. IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=A senha foi atualizada. -IDENTITY_EDIT_EMAIL_TITLE=Alterar o seu endere\u00E7o de e-mail -IDENTITY_EDIT_EMAIL_NEW=Novo endere\u00E7o de e-mail +IDENTITY_EDIT_EMAIL_TITLE=Alterar o seu endere\u00e7o de e-mail +IDENTITY_EDIT_EMAIL_NEW=Novo endere\u00e7o de e-mail IDENTITY_EDIT_CHANGE_EMAIL=Alterar e-mail -IDENTITY_EDIT_CHANGE_EMAIL_ERROR=N\u00E3o foi poss\u00EDvel alterar o endere\u00E7o de e-mail -IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Uma valida\u00E7\u00E3o de e-mail foi enviada ao seu endere\u00E7o. -IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Seu endere\u00E7o de e-mail foi alterado. +IDENTITY_EDIT_CHANGE_EMAIL_ERROR=N\u00e3o foi poss\u00edvel alterar o endere\u00e7o de e-mail +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Uma valida\u00e7\u00e3o de e-mail foi enviada ao seu endere\u00e7o. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Seu endere\u00e7o de e-mail foi alterado. IDENTITY_EDIT_PROFILE_TITLE=Editar perfil IDENTITY_VIEW_PROFILE_TITLE=Visualizar perfil -IDENTITY_USERNAME=Usu\u00E1rio +IDENTITY_USERNAME=Usu\u00e1rio IDENTITY_PASSWORD=Senha IDENTITY_EMAIL=E-Mail IDENTITY_GIVENNAME=Primeiro nome -IDENTITY_FAMILYNAME=\u00DAltimo nome +IDENTITY_FAMILYNAME=\u00daltimo nome IDENTITY_SKYPE=Identificador Skype IDENTITY_LOCATION=Local -IDENTITY_OCCUPATION=Ocupa\u00E7\u00E3o +IDENTITY_OCCUPATION=Ocupa\u00e7\u00e3o IDENTITY_EXTRA=Adicional IDENTITY_SIGNATURE=Assinatura IDENTITY_INTERESTS=Interesses @@ -83,49 +83,49 @@ IDENTITY_MSNM=Identificador MSN messenger IDENTITY_YIM=Identificador Yahoo IDENTITY_XMMP=Identificador Xmmp -IDENTITY_HOMEPAGE=P\u00E1gina inicial -IDENTITY_TIMEZONE=Fuso hor\u00E1rio +IDENTITY_HOMEPAGE=P\u00e1gina inicial +IDENTITY_TIMEZONE=Fuso hor\u00e1rio IDENTITY_THEME=Tema -IDENTITY_SECURITY_QUESTION=Pergunta de seguran\u00E7a -IDENTITY_SECURITY_ANSWER=Resposta de seguran\u00E7a -IDENTITY_LAST_LOGIN=\u00DAltimo acesso +IDENTITY_SECURITY_QUESTION=Pergunta de seguran\u00e7a +IDENTITY_SECURITY_ANSWER=Resposta de seguran\u00e7a +IDENTITY_LAST_LOGIN=\u00daltimo acesso IDENTITY_REIGSTRATION_DATE=Data de Registro IDENTITY_ENABLED=Ativado -IDENTITY_CATEGORY_GENERAL=Prefer\u00EAncias Gerais -IDENTITY_CATEGORY_PERSONAL=Informa\u00E7\u00F5es Pessoais -IDENTITY_CATEGORY_INSTANT=Identidades de Mensagens Instant\u00E2neas -IDENTITY_CATEGORY_ADDITIONAL=Informa\u00E7\u00F5es Adicionais +IDENTITY_CATEGORY_GENERAL=Prefer\u00eancias Gerais +IDENTITY_CATEGORY_PERSONAL=Informa\u00e7\u00f5es Pessoais +IDENTITY_CATEGORY_INSTANT=Identidades de Mensagens Instant\u00e2neas +IDENTITY_CATEGORY_ADDITIONAL=Informa\u00e7\u00f5es Adicionais -IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Assinatura de ,no m\u00E1ximo, 255 caracteres) -IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(m\u00E1ximo de 255 caracteres) +IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Assinatura de ,no m\u00e1ximo, 255 caracteres) +IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(m\u00e1ximo de 255 caracteres) -IDENTITY_MANAGEMENT_ACTION=A\u00E7\u00F5es -IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Editar usu\u00E1rio +IDENTITY_MANAGEMENT_ACTION=A\u00e7\u00f5es +IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Editar usu\u00e1rio IDENTITY_MANAGEMENT_ACTION_ROLES=Perfis IDENTITY_MANAGEMENT_ACTION_DELETE=Excluir -IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gerenciamento de usu\u00E1rios +IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gerenciamento de usu\u00e1rios IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gerenciamento de perfis -IDENTITY_MANAGEMENT_SEARCH_USER=Pesquisar usu\u00E1rios -IDENTITY_MANAGEMENT_CREATE_USER=Criar uma nova conta de usu\u00E1rio -IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Usu\u00E1rio criado -IDENTITY_MANAGEMENT_USER_DELETED=Usu\u00E1rio exclu\u00EDdo +IDENTITY_MANAGEMENT_SEARCH_USER=Pesquisar usu\u00e1rios +IDENTITY_MANAGEMENT_CREATE_USER=Criar uma nova conta de usu\u00e1rio +IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Usu\u00e1rio criado +IDENTITY_MANAGEMENT_USER_DELETED=Usu\u00e1rio exclu\u00eddo IDENTITY_MANAGEMENT_ROLE=Perfil -IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome de exibi\u00E7\u00E3o -IDENTITY_MANAGEMENT_ROLE_MEMBERS=Usu\u00E1rios -IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Perfis atribu\u00EDdos +IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome de exibi\u00e7\u00e3o +IDENTITY_MANAGEMENT_ROLE_MEMBERS=Usu\u00e1rios +IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Perfis atribu\u00eddos IDENTITY_MANAGEMENT_CREATE_ROLE=Criar perfil IDENTITY_MANAGEMENT_EDIT_ROLE=Editar perfil IDENTITY_MANAGEMENT_DISABLE=Desabilitar IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Usua\u0155io desabilitado IDENTITY_MANAGEMENT_ENABLE=Habilitar -IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Usu\u00E1rio habilitado +IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Usu\u00e1rio habilitado IDENTITY_MANAGEMENT_RESET_PASSWORD=Redefinir senha -IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Redefinir senha para o usu\u00E1rio -IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=O usu\u00E1rio receber\u00E1 uma senha aleat\u00F3ria enviada ao seu endere\u00E7o de e-mail. +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Redefinir senha para o usu\u00e1rio +IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=O usu\u00e1rio receber\u00e1 uma senha aleat\u00f3ria enviada ao seu endere\u00e7o de e-mail. IDENTITY_MANAGEMENT_ASSIGN_ROLES=Atribuir perfis -IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Usu\u00E1rios pendentes -IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Usu\u00E1rios registrados +IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Usu\u00e1rios pendentes +IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Usu\u00e1rios registrados IDENTITY_MANAGEMENT_APPROVE_ALL=Aprovar selecionados IDENTITY_MANAGEMENT_REJECT_ALL=Rejeitar selecionados IDENTITY_MANAGEMENT_SELECT_ALL=Selecionar todos @@ -141,48 +141,50 @@ IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Modo de assinatura IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Administrador Modo de assinatura IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Modo de assinatura personalizado. -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Autom\u00E1tica - nenhuma valida\u00E7\u00E3o de e-mail, nenhuma aprova\u00E7\u00E3o do administrador. -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Valida\u00E7\u00E3o de e-mail, nenhuma aprova\u00E7\u00E3o do administrador. -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Valida\u00E7\u00E3o de e-mail, e aprova\u00E7\u00E3o do administrador. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Autom\u00e1tica - nenhuma valida\u00e7\u00e3o de e-mail, nenhuma aprova\u00e7\u00e3o do administrador. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Valida\u00e7\u00e3o de e-mail, nenhuma aprova\u00e7\u00e3o do administrador. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Valida\u00e7\u00e3o de e-mail, e aprova\u00e7\u00e3o do administrador. -IDENTITY_REGISTER_VERIFY_CAPTCHA=Digite a imagem de seguran\u00E7a -IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirma\u00E7\u00E3o\: Excluir -IDENTITY_WARNING_CONFIRM_DELETE_USER=Aten\u00E7\u00E3o\! Deseja excluir o usu\u00E1rio -IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Aten\u00E7\u00E3o\! Deseja excluir o perfil -IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirme a sua inscri\u00E7\u00E3o +IDENTITY_REGISTER_VERIFY_CAPTCHA=Digite a imagem de seguran\u00e7a +IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirma\u00e7\u00e3o\: Excluir +IDENTITY_WARNING_CONFIRM_DELETE_USER=Aten\u00e7\u00e3o\! Deseja excluir o usu\u00e1rio +IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Aten\u00e7\u00e3o\! Deseja excluir o perfil +IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirme a sua inscri\u00e7\u00e3o IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Redefinir a sua senha -IDENTITY_MAIL_SUBJECT_REGISTER=Confirmar inscri\u00E7\u00E3o -IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmar endere\u00E7o de e-mail +IDENTITY_MAIL_SUBJECT_REGISTER=Confirmar inscri\u00e7\u00e3o +IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmar endere\u00e7o de e-mail -IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=N\u00E3o foi poss\u00EDvel executar a a\u00E7\u00E3o nesse perfil. Por favor, verifique o arquivo de log para mais informa\u00E7\u00F5es. -IDENTITY_MANAGEMENT_ERROR_ACTION_USER=N\u00E3o foi poss\u00EDvel executar a a\u00E7\u00E3o nesse usu\u00E1rio. Por favor, verifique o arquivo de log para mais informa\u00E7\u00F5es. +IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=N\u00e3o foi poss\u00edvel executar a a\u00e7\u00e3o nesse perfil. Por favor, verifique o arquivo de log para mais informa\u00e7\u00f5es. +IDENTITY_MANAGEMENT_ERROR_ACTION_USER=N\u00e3o foi poss\u00edvel executar a a\u00e7\u00e3o nesse usu\u00e1rio. Por favor, verifique o arquivo de log para mais informa\u00e7\u00f5es. IDENTITY_VERIFICATION_RETURN=Voltar ao portal IDENTITY_VERIFICATION_LOGIN=Entrar -IDENTITY_VERIFICATION_STATUS_EROOR=Erro durante a valida\u00E7\u00E3o de endere\u00E7o de e-mail. -IDENTITY_VERIFICATION_STATUS_FAILED=N\u00E3o \u00E9 poss\u00EDvel validar o endere\u00E7o de e-mail. +IDENTITY_VERIFICATION_STATUS_EROOR=Erro durante a valida\u00e7\u00e3o de endere\u00e7o de e-mail. +IDENTITY_VERIFICATION_STATUS_FAILED=N\u00e3o \u00e9 poss\u00edvel validar o endere\u00e7o de e-mail. IDENTITY_VERIFICATION_STATUS_VALIDATED=E-mail validado. -IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Sua conta foi ativada. Voc\u00EA poder\u00E1 entrar agora. -IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Seu endere\u00E7o de e-mail foi validado, mas sua conta precisa ser aprovada pelo administrador. -IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Sua conta foi ativada. Voc\u00EA poder\u00E1 entrar agora. +IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Sua conta foi ativada. Voc\u00ea poder\u00e1 entrar agora. +IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Seu endere\u00e7o de e-mail foi validado, mas sua conta precisa ser aprovada pelo administrador. +IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Sua conta foi ativada. Voc\u00ea poder\u00e1 entrar agora. -IDENTITY_VALIDATION_ERROR_REGISTRATION=Falha no registro do usu\u00E1rio. -IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Esse usu\u00E1rio j\u00E1 est\u00E1 em uso. -IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erro ao validar o usu\u00E1rio. -IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=Esse perfil j\u00E1 est\u00E1 em uso. -IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Erro ao validar o nome do perfil. -IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=As senhas n\u00E3o conferem. -IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erro durante a valida\u00E7\u00E3o de senha. -IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=E-mail inv\u00E1lido. -IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Senha inv\u00E1lida -IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Imagem de seguran\u00E7a inv\u00E1lida +IDENTITY_VALIDATION_ERROR_REGISTRATION=Falha no registro do usu\u00e1rio. +IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Esse usu\u00e1rio j\u00e1 est\u00e1 em uso. +IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erro ao validar o usu\u00e1rio. +IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=As senhas n\u00e3o conferem. +IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erro durante a valida\u00e7\u00e3o de senha. +IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=E-mail inv\u00e1lido. +IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Senha inv\u00e1lida +IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Imagem de seguran\u00e7a inv\u00e1lida # Example usage for dynamic values IDENTITY_DYNAMIC_VALUE_TEST=test label IDENTITY_DYNAMIC_VALUE_TEST2=test label2 -javax.portlet.title=Perfil do Usu\u00E1rio +javax.portlet.title=Perfil do Usu\u00e1rio javax.portlet.keywords=management,user -javax.faces.component.UIInput.REQUIRED=Valor obrigat\u00F3rio \ No newline at end of file +javax.faces.component.UIInput.REQUIRED=Valor obrigat\u00f3rio + +ROLE_TYPE=perfil +INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\: n\u00e3o deve ser nulo, vazio ou conter os caracteres '\\', '<', '>', '(', ')', '=' ou '%5c' +DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00e1 existe\! \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2009-05-15 12:10:05 UTC (rev 13376) @@ -114,7 +114,6 @@ IDENTITY_MANAGEMENT_ROLE_ASSIGNED=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435 \u0440\u043e\u043b\u0438 IDENTITY_MANAGEMENT_CREATE_ROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u0440\u043e\u043b\u044c IDENTITY_MANAGEMENT_EDIT_ROLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0440\u043e\u043b\u044c -IDENTITY_MANAGEMENT_CREATE_ROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0440\u043e\u043b\u044c IDENTITY_MANAGEMENT_DISABLE=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c IDENTITY_MANAGEMENT_ENABLE=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c IDENTITY_MANAGEMENT_RESET_PASSWORD=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c @@ -176,3 +175,5 @@ # Example usage for dynamic values IDENTITY_DYNAMIC_VALUE_TEST=test label IDENTITY_DYNAMIC_VALUE_TEST2=test label2 + +ROLE_TYPE=\u0440\u043e\u043b\u044c \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-05-15 12:10:05 UTC (rev 13376) @@ -30,9 +30,9 @@ <application> <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver> - <property-resolver>org.jboss.portal.core.identity.ui.faces.PortletDelegatingPropertyResolver</property-resolver> + <property-resolver>org.jboss.portal.core.identity.ui.faces.PortletDelegatingPropertyResolver</property-resolver> <view-handler> - org.jboss.portletbridge.application.PortletViewHandler + org.jboss.portletbridge.application.PortletViewHandler </view-handler> <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> <locale-config> @@ -45,459 +45,476 @@ </locale-config> <message-bundle>conf.bundles.Identity</message-bundle> </application> - - <managed-bean> - <managed-bean-name>configurationbean</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - <managed-property> - <property-name>identityUIConfigurationService</property-name> - <value>#{applicationScope.IdentityUIConfigurationService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>metadataservice</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.common.MetaDataServiceBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>identityrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityRoleBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - <managed-property> - <property-name>roleModule</property-name> - <value>#{applicationScope.RoleModule}</value> - </managed-property> - <managed-property> - <property-name>membershipModule</property-name> - <value>#{applicationScope.MembershipModule}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>identityusermgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityUserBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - <managed-property> - <property-name>userModule</property-name> - <value>#{applicationScope.UserModule}</value> - </managed-property> - <managed-property> - <property-name>userProfileModule</property-name> - <value>#{applicationScope.UserProfileModule}</value> - </managed-property> - <managed-property> - <property-name>metaDataService</property-name> - <value>#{metadataservice}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>editprofilemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditProfileAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>validateEmailService</property-name> - <value>#{applicationScope.ValidateEmailService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>userregistermgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateUserAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>defaultRoles</property-name> - <value>#{configurationbean.configuration.defaultRoles}</value> - </managed-property> - <managed-property> - <property-name>registrationService</property-name> - <value>#{applicationScope.RegistrationService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>assignrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.AssignRoleAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>useradministrationbean</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>subscriptionMode</property-name> - <value>#{configurationbean.configuration.subscriptionMode}</value> - </managed-property> - <managed-property> - <property-name>adminSubscriptionMode</property-name> - <value>#{configurationbean.configuration.adminSubscriptionMode}</value> - </managed-property> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - <managed-property> - <property-name>registrationService</property-name> - <value>#{applicationScope.RegistrationService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>rolemanagementbean</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.admin.RoleManagementBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>editrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditRoleAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>lostpasswordmgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.LostPasswordAction</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>passwordCharacters</property-name> - <value>#{configurationbean.configuration.passwordGenerationCharacters}</value> - </managed-property> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>identityMailService</property-name> - <value>#{applicationScope.IdentityMailService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>createrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateRoleAction</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - - <validator> - <validator-id>EmailValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.EmailValidator</validator-class> - </validator> - <validator> - <validator-id>UsernameValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.UsernameValidator</validator-class> - </validator> + <!-- bean context for managed beans --> + <managed-bean> + <managed-bean-name>beanContext</managed-bean-name> + <managed-bean-class>org.jboss.portal.faces.gui.JSFBeanContext</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>resourceName</property-name> + <value>conf.bundles.Identity</value> + </managed-property> + </managed-bean> + + <managed-bean> + <managed-bean-name>configurationbean</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>identityUIConfigurationService</property-name> + <value>#{applicationScope.IdentityUIConfigurationService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>metadataservice</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.MetaDataServiceBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>identityrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityRoleBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>roleModule</property-name> + <value>#{applicationScope.RoleModule}</value> + </managed-property> + <managed-property> + <property-name>membershipModule</property-name> + <value>#{applicationScope.MembershipModule}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>identityusermgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityUserBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>userModule</property-name> + <value>#{applicationScope.UserModule}</value> + </managed-property> + <managed-property> + <property-name>userProfileModule</property-name> + <value>#{applicationScope.UserProfileModule}</value> + </managed-property> + <managed-property> + <property-name>metaDataService</property-name> + <value>#{metadataservice}</value> + </managed-property> + </managed-bean> + + <managed-bean> + <managed-bean-name>editprofilemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditProfileAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>validateEmailService</property-name> + <value>#{applicationScope.ValidateEmailService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>userregistermgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateUserAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>defaultRoles</property-name> + <value>#{configurationbean.configuration.defaultRoles}</value> + </managed-property> + <managed-property> + <property-name>registrationService</property-name> + <value>#{applicationScope.RegistrationService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>assignrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.AssignRoleAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>useradministrationbean</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>subscriptionMode</property-name> + <value>#{configurationbean.configuration.subscriptionMode}</value> + </managed-property> + <managed-property> + <property-name>adminSubscriptionMode</property-name> + <value>#{configurationbean.configuration.adminSubscriptionMode}</value> + </managed-property> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + <managed-property> + <property-name>registrationService</property-name> + <value>#{applicationScope.RegistrationService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>rolemanagementbean</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.admin.RoleManagementBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>editrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditRoleAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>lostpasswordmgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.LostPasswordAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>passwordCharacters</property-name> + <value>#{configurationbean.configuration.passwordGenerationCharacters}</value> + </managed-property> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>identityMailService</property-name> + <value>#{applicationScope.IdentityMailService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>createrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateRoleAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> + </managed-bean> + <validator> - <validator-id>RoleValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.RoleValidator</validator-class> + <validator-id>EmailValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.EmailValidator</validator-class> </validator> - <validator> - <validator-id>PasswordValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.PasswordValidator</validator-class> - </validator> - <validator> - <validator-id>CurrentPasswordValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.CurrentPasswordValidator</validator-class> - </validator> - <validator> - <validator-id>CaptchaValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.CaptchaValidator</validator-class> - </validator> - - <navigation-rule> - <navigation-case> - <from-outcome>start</from-outcome> - <to-view-id>/jsf/index.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>lostPassword</from-outcome> - <to-view-id>/jsf/lostPassword/lost.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/lostPassword/lost.xhtml</from-view-id> - <navigation-case> - <from-outcome>status</from-outcome> - <to-view-id>/jsf/lostPassword/status.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/jsf/register/register.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/register/register.xhtml</from-view-id> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/jsf/register/confirm.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/register/confirm.xhtml</from-view-id> - <navigation-case> - <from-outcome>revise</from-outcome> - <to-view-id>/jsf/register/register.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>registered</from-outcome> - <to-view-id>/jsf/register/success.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>changePassword</from-outcome> - <to-view-id>/jsf/profile/changePassword.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/profile/changePassword.xhtml</from-view-id> - <navigation-case> - <from-outcome>status</from-outcome> - <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>changeEmail</from-outcome> - <to-view-id>/jsf/profile/changeEmail.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/profile/changeEmail.xhtml</from-view-id> - <navigation-case> - <from-outcome>status</from-outcome> - <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/index.xhtml</from-view-id> - <navigation-case> - <from-outcome>editProfile</from-outcome> - <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/profile/*</from-view-id> - <navigation-case> - <from-outcome>editProfile</from-outcome> - <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - - <navigation-rule> - <from-view-id>/jsf/admin/*</from-view-id> - <navigation-case> - <from-outcome>userAdmin</from-outcome> - <to-view-id>/jsf/admin/index.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>start</from-outcome> - <to-view-id>/jsf/admin/index.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/*</from-view-id> - <navigation-case> - <from-outcome>roleAdmin</from-outcome> - <to-view-id>/jsf/admin/roles.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/index.xhtml</from-view-id> - <navigation-case> - <from-outcome>createUser</from-outcome> - <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/*</from-view-id> - <navigation-case> - <from-outcome>searchUsers</from-outcome> - <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/index.xhtml</from-view-id> - <navigation-case> - <from-outcome>showPendingUsers</from-outcome> - <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/pendingUsers.xhtml</from-view-id> - <navigation-case> - <from-outcome>confirmPendingAction</from-outcome> - <to-view-id>/jsf/admin/user/confirmPendingAction.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>cancel</from-outcome> - <to-view-id>/jsf/admin/index.xthml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/confirmPendingAction.xhtml</from-view-id> - <navigation-case> - <from-outcome>revise</from-outcome> - <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>success</from-outcome> - <to-view-id>/jsf/admin/index.xthml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/searchUsers.xhtml</from-view-id> - <navigation-case> - <from-outcome>deleteUser</from-outcome> - <to-view-id>/jsf/admin/user/deleteUser.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id> - <navigation-case> - <from-outcome>adminChangePassword</from-outcome> - <to-view-id>/jsf/admin/user/changePassword.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>start</from-outcome> - <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/*</from-view-id> - <navigation-case> - <from-outcome>start</from-outcome> - <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/*</from-view-id> - <navigation-case> - <from-action>#{editprofilemgr.adminEditProfile}</from-action> - <from-outcome>editProfile</from-outcome> - <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/*</from-view-id> - <navigation-case> - <from-action>#{assignrolemgr.assignRoles}</from-action> - <from-outcome>assignRoles</from-outcome> - <to-view-id>/jsf/admin/assignRoles.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/createUser.xhtml</from-view-id> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/jsf/admin/user/registerRoles.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/registerRoles.xhtml</from-view-id> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/jsf/admin/user/registerConfirm.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/registerConfirm.xhtml</from-view-id> - <navigation-case> - <from-outcome>revise</from-outcome> - <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>registered</from-outcome> - <to-view-id>/jsf/admin/index.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>createRole</from-outcome> - <to-view-id>/jsf/admin/roles/createRole.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>editRole</from-outcome> - <to-view-id>/jsf/admin/roles/editRole.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>viewMembers</from-outcome> - <to-view-id>/jsf/admin/roles/roleMembers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>deleteRole</from-outcome> - <to-view-id>/jsf/admin/roles/deleteRole.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id> - <navigation-case> - <from-outcome>resetPassword</from-outcome> - <to-view-id>/jsf/admin/user/resetPassword.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/resetPassword.xhtml</from-view-id> - <navigation-case> - <from-action>#{lostpasswordmgr.doomed}</from-action> - <from-outcome>status</from-outcome> - <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-action>#{lostpasswordmgr.doomed}</from-action> - <from-outcome>lostPassword</from-outcome> - <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/jsf/admin/user/changePassword.xhtml</from-view-id> - <navigation-case> - <from-outcome>status</from-outcome> - <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>searchUsers</from-outcome> - <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - + <validator> + <validator-id>UsernameValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.UsernameValidator</validator-class> + </validator> + <validator> + <validator-id>PasswordValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.PasswordValidator</validator-class> + </validator> + <validator> + <validator-id>CurrentPasswordValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.CurrentPasswordValidator</validator-class> + </validator> + <validator> + <validator-id>CaptchaValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.CaptchaValidator</validator-class> + </validator> + + <navigation-rule> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/jsf/index.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>lostPassword</from-outcome> + <to-view-id>/jsf/lostPassword/lost.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/lostPassword/lost.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/jsf/lostPassword/status.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/jsf/register/register.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/register/register.xhtml</from-view-id> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/jsf/register/confirm.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/register/confirm.xhtml</from-view-id> + <navigation-case> + <from-outcome>revise</from-outcome> + <to-view-id>/jsf/register/register.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>registered</from-outcome> + <to-view-id>/jsf/register/success.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>changePassword</from-outcome> + <to-view-id>/jsf/profile/changePassword.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/profile/changePassword.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>changeEmail</from-outcome> + <to-view-id>/jsf/profile/changeEmail.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/profile/changeEmail.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/index.xhtml</from-view-id> + <navigation-case> + <from-outcome>editProfile</from-outcome> + <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/profile/*</from-view-id> + <navigation-case> + <from-outcome>editProfile</from-outcome> + <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + + <navigation-rule> + <from-view-id>/jsf/admin/*</from-view-id> + <navigation-case> + <from-outcome>userAdmin</from-outcome> + <to-view-id>/jsf/admin/index.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/jsf/admin/index.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/*</from-view-id> + <navigation-case> + <from-outcome>roleAdmin</from-outcome> + <to-view-id>/jsf/admin/roles.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/index.xhtml</from-view-id> + <navigation-case> + <from-outcome>createUser</from-outcome> + <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/*</from-view-id> + <navigation-case> + <from-outcome>searchUsers</from-outcome> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/index.xhtml</from-view-id> + <navigation-case> + <from-outcome>showPendingUsers</from-outcome> + <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/pendingUsers.xhtml</from-view-id> + <navigation-case> + <from-outcome>confirmPendingAction</from-outcome> + <to-view-id>/jsf/admin/user/confirmPendingAction.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>cancel</from-outcome> + <to-view-id>/jsf/admin/index.xthml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/confirmPendingAction.xhtml</from-view-id> + <navigation-case> + <from-outcome>revise</from-outcome> + <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>success</from-outcome> + <to-view-id>/jsf/admin/index.xthml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/searchUsers.xhtml</from-view-id> + <navigation-case> + <from-outcome>deleteUser</from-outcome> + <to-view-id>/jsf/admin/user/deleteUser.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id> + <navigation-case> + <from-outcome>adminChangePassword</from-outcome> + <to-view-id>/jsf/admin/user/changePassword.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/*</from-view-id> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/*</from-view-id> + <navigation-case> + <from-action>#{editprofilemgr.adminEditProfile}</from-action> + <from-outcome>editProfile</from-outcome> + <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/*</from-view-id> + <navigation-case> + <from-action>#{assignrolemgr.assignRoles}</from-action> + <from-outcome>assignRoles</from-outcome> + <to-view-id>/jsf/admin/assignRoles.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/createUser.xhtml</from-view-id> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/jsf/admin/user/registerRoles.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/registerRoles.xhtml</from-view-id> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/jsf/admin/user/registerConfirm.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/registerConfirm.xhtml</from-view-id> + <navigation-case> + <from-outcome>revise</from-outcome> + <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>registered</from-outcome> + <to-view-id>/jsf/admin/index.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>createRole</from-outcome> + <to-view-id>/jsf/admin/roles/createRole.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>editRole</from-outcome> + <to-view-id>/jsf/admin/roles/editRole.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>viewMembers</from-outcome> + <to-view-id>/jsf/admin/roles/roleMembers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>deleteRole</from-outcome> + <to-view-id>/jsf/admin/roles/deleteRole.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id> + <navigation-case> + <from-outcome>resetPassword</from-outcome> + <to-view-id>/jsf/admin/user/resetPassword.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/resetPassword.xhtml</from-view-id> + <navigation-case> + <from-action>#{lostpasswordmgr.doomed}</from-action> + <from-outcome>status</from-outcome> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-action>#{lostpasswordmgr.doomed}</from-action> + <from-outcome>lostPassword</from-outcome> + <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/jsf/admin/user/changePassword.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>searchUsers</from-outcome> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + </faces-config> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2009-05-15 12:10:05 UTC (rev 13376) @@ -22,9 +22,7 @@ <h:form id="create-role-form"> <h:panelGrid columns="3"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/> - <h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true"> - <f:validator validatorId="RoleValidator"/> - </h:inputText> + <h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true"/> <h:message for="rolename" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2009-05-15 11:39:02 UTC (rev 13375) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2009-05-15 12:10:05 UTC (rev 13376) @@ -18,18 +18,22 @@ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> <h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" /> - </li> + </li> </ui:define> <ui:define name="content"> <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/></h3> <h:form id="edit-role-link"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/> <h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" /> - + <h:message for="rolename" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/> <h:inputText id="display-name" value="#{editrolemgr.uiRole.displayName}"/> + <h:message for="display-name" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:panelGrid> <hr/> <p style="text-align: right;">