From portal-commits at lists.jboss.org Thu Nov 22 05:44:23 2007
Content-Type: multipart/mixed; boundary="===============4464892167664786421=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9074 - in
 branches/JBoss_Portal_Branch_2_6/core-identity/src:
 main/org/jboss/portal/core/identity/ui/actions and 4 other directories.
Date: Thu, 22 Nov 2007 05:44:22 -0500
Message-ID: <E1Iv9Xi-0000yO-Ou@committer01.frg.pub.inap.atl.jboss.com>

--===============4464892167664786421==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: emuckenhuber
Date: 2007-11-22 05:44:22 -0500 (Thu, 22 Nov 2007)
New Revision: 9074

Modified:
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/IdentityUIUser.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/actions/AssignRoleAction.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/actions/EditProfileAction.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/actions/EditRoleAction.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/actions/LostPasswordAction.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/admin/RoleManagementBean.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal=
/core/identity/ui/admin/UserAdministrationBean.java
   branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-iden=
tity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
   branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-iden=
tity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
   branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-iden=
tity-war/WEB-INF/jsf/common/userInfo.xhtml
Log:
JBPORTAL-1732: utf8 encoding for params

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/IdentityUIUser.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/IdentityUIUser.java	2007-11-22 09:24:02 UTC (rev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/IdentityUIUser.java	2007-11-22 10:44:22 UTC (rev 9074)
@@ -22,6 +22,8 @@
  *************************************************************************=
*****/
 package org.jboss.portal.core.identity.ui;
 =

+import org.jboss.portal.common.text.FastURLEncoder;
+
 /**
  * @author <a href=3D"mailto:emuckenh(a)redhat.com">Emanuel Muckenhuber</a>
  * @version $Revision$
@@ -74,13 +76,8 @@
       return attribute;
    }
    =

-   /**
-    * Used for GET parameters - username does never contain a escape char
-    * =

-    * @return double escaped username
-    */
-   public String getEscapedUsername()
+   public String getUTF8Username()
    {
-      return username.replace("\\", "\\\\");
+      return FastURLEncoder.getUTF8Instance().encode(username);
    }
 }

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/actions/AssignRoleAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/AssignRoleAction.java	2007-11-22 09:24:02 UTC (r=
ev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/AssignRoleAction.java	2007-11-22 10:44:22 UTC (r=
ev 9074)
@@ -30,6 +30,7 @@
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 =

+import org.jboss.portal.common.text.FastURLDecoder;
 import org.jboss.portal.core.identity.ui.IdentityUIUser;
 import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
 import org.jboss.portal.core.identity.ui.common.IdentityUserBean;
@@ -56,6 +57,9 @@
 =

    /** .*/
    private IdentityRoleBean identityRoleBean;
+   =

+   /** . */
+   private final static FastURLDecoder decoder =3D FastURLDecoder.getUTF8I=
nstance();
 =

    public IdentityUIUser getUiUser()
    {
@@ -102,7 +106,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.currentUser =3D (String) params.get("currentUser");
+      this.currentUser =3D decoder.encode((String) params.get("currentUser=
"));
       if (this.currentUser !=3D null)
       {
          this.uiUser =3D new IdentityUIUser(this.currentUser);

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/actions/EditProfileAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/EditProfileAction.java	2007-11-22 09:24:02 UTC (=
rev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/EditProfileAction.java	2007-11-22 10:44:22 UTC (=
rev 9074)
@@ -35,6 +35,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.PortalNodeURL;
+import org.jboss.portal.common.text.FastURLDecoder;
 import org.jboss.portal.core.identity.services.IdentityConstants;
 import org.jboss.portal.core.identity.services.workflow.ValidateEmailServi=
ce;
 import org.jboss.portal.core.identity.ui.IdentityUIUser;
@@ -72,6 +73,8 @@
    =

    /** . */ =

    private ValidateEmailService validateEmailService;
+   =

+   private final static FastURLDecoder decoder =3D FastURLDecoder.getUTF8I=
nstance();
 =

    /** . */
    private static final Logger log =3D Logger.getLogger(EditProfileAction.=
class);
@@ -201,7 +204,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.currentUser =3D (String) params.get("currentUser");
+      this.currentUser =3D decoder.encode((String) params.get("currentUser=
"));
       this.windowState =3D null;
       if (this.currentUser =3D=3D null)
       {
@@ -267,7 +270,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.currentUser =3D (String) params.get("currentUser");
+      this.currentUser =3D decoder.encode((String) params.get("currentUser=
"));
       =

      return "adminChangePassword";
    }

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/actions/EditRoleAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/EditRoleAction.java	2007-11-22 09:24:02 UTC (rev=
 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/EditRoleAction.java	2007-11-22 10:44:22 UTC (rev=
 9074)
@@ -27,6 +27,7 @@
 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;
 =

@@ -45,6 +46,9 @@
 =

    /** .*/
    private IdentityRoleBean identityRoleBean;
+   =

+   /** . */
+   private static final FastURLDecoder decoder =3D FastURLDecoder.getUTF8I=
nstance();
 =

    public UIRole getUiRole()
    {
@@ -71,7 +75,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.currentRole =3D (String) params.get("currentRole");
+      this.currentRole =3D decoder.encode((String) params.get("currentRole=
"));
       try
       {
          this.uiRole =3D identityRoleBean.getUIRole(this.currentRole);

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/actions/LostPasswordAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/LostPasswordAction.java	2007-11-22 09:24:02 UTC =
(rev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/actions/LostPasswordAction.java	2007-11-22 10:44:22 UTC =
(rev 9074)
@@ -34,6 +34,7 @@
 import javax.faces.context.FacesContext;
 =

 import org.jboss.logging.Logger;
+import org.jboss.portal.common.text.FastURLDecoder;
 import org.jboss.portal.core.identity.services.IdentityConstants;
 import org.jboss.portal.core.identity.services.IdentityMailService;
 import org.jboss.portal.core.identity.ui.IdentityUIUser;
@@ -64,6 +65,9 @@
 =

    /** . */
    private static final Logger log =3D Logger.getLogger(LostPasswordAction=
.class);
+   =

+   /** . */
+   private static final FastURLDecoder decoder =3D FastURLDecoder.getUTF8I=
nstance();
 =

    public String getUsername()
    {
@@ -185,7 +189,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.username =3D  (String) params.get("currentUser");
+      this.username =3D  decoder.encode((String) params.get("currentUser")=
);
       return "resetPassword";
    }
 =


Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/admin/RoleManagementBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/admin/RoleManagementBean.java	2007-11-22 09:24:02 UTC (r=
ev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/admin/RoleManagementBean.java	2007-11-22 10:44:22 UTC (r=
ev 9074)
@@ -36,6 +36,7 @@
 import javax.faces.model.ListDataModel;
 =

 import org.jboss.logging.Logger;
+import org.jboss.portal.common.text.FastURLDecoder;
 import org.jboss.portal.core.identity.ui.IdentityUIUser;
 import org.jboss.portal.core.identity.ui.UIRole;
 import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
@@ -72,6 +73,9 @@
    =

    /** The logger */
    private static final Logger log =3D Logger.getLogger(RoleManagementBean=
.class);
+   =

+   /** The decoder */
+   private static final FastURLDecoder decoder =3D FastURLDecoder.getUTF8I=
nstance();
 =

    public IdentityRoleBean getIdentityRoleBean()
    {
@@ -150,7 +154,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      String role =3D (String) params.get("currentRole");
+      String role =3D decoder.encode((String) params.get("currentRole"));
       this.currentRole =3D role !=3D null ? role : this.currentRole;
       try
       {
@@ -207,7 +211,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.currentRole =3D (String) params.get("currentRole");
+      this.currentRole =3D decoder.encode((String) params.get("currentRole=
"));
       if (this.currentRole !=3D null)
       {
          try

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss=
/portal/core/identity/ui/admin/UserAdministrationBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/admin/UserAdministrationBean.java	2007-11-22 09:24:02 UT=
C (rev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/porta=
l/core/identity/ui/admin/UserAdministrationBean.java	2007-11-22 10:44:22 UT=
C (rev 9074)
@@ -36,6 +36,7 @@
 import javax.faces.model.ListDataModel;
 =

 import org.jboss.logging.Logger;
+import org.jboss.portal.common.text.FastURLDecoder;
 import org.jboss.portal.core.identity.services.IdentityConstants;
 import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfig=
urationException;
 import org.jboss.portal.core.identity.services.workflow.RegistrationServic=
e;
@@ -105,6 +106,9 @@
 =

    /** . */
    private static final Logger log =3D Logger.getLogger(UserAdministration=
Bean.class);
+   =

+   /** The decoder */
+   private static final FastURLDecoder decoder =3D FastURLDecoder.getUTF8I=
nstance();
 =

    public UserAdministrationBean()
    {
@@ -257,7 +261,7 @@
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
       String action =3D (String) params.get("enableAction");
-      this.currentUser =3D (String) params.get("currentUser");
+      this.currentUser =3D decoder.encode((String) params.get("currentUser=
"));
       =

       // TODO - do something better than .equals("admin")
       if (this.currentUser !=3D null && action !=3D null && ! this.current=
User.equals("admin"))
@@ -344,7 +348,7 @@
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       ExternalContext ectx =3D ctx.getExternalContext();
       Map params =3D ectx.getRequestParameterMap();
-      this.currentUser =3D (String) params.get("currentUser");
+      this.currentUser =3D decoder.encode((String) params.get("currentUser=
"));
       if (this.currentUser !=3D null)
       {
          this.uiUser =3D new IdentityUIUser(this.currentUser);

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/port=
al-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-ide=
ntity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml	2007-11-22 09:24:02 UTC=
 (rev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-ide=
ntity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml	2007-11-22 10:44:22 UTC=
 (rev 9074)
@@ -64,11 +64,11 @@
 		</f:facet>
 		<h:commandLink action=3D"#{editprofilemgr.adminEditProfile}" styleClass=
=3D"actionRename">
 			<h:outputText value=3D"#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=
}"/>
-			<f:param name=3D"currentUser" value=3D"#{uiUser.escapedUsername}"/>
+			<f:param name=3D"currentUser" value=3D"#{uiUser.UTF8Username}"/>
 		</h:commandLink> | =

 		<h:commandLink action=3D"#{assignrolemgr.assignRoles}" styleClass=3D"act=
ionPreferences">
 			<h:outputText value=3D"#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
-			<f:param name=3D"currentUser" value=3D"#{uiUser.escapedUsername}"/>
+			<f:param name=3D"currentUser" value=3D"#{uiUser.UTF8Username}"/>
 	    </h:commandLink>
 	</h:column>
 	</h:dataTable>

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/port=
al-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-ide=
ntity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml	2007-11-22 09:24:02 UTC =
(rev 9073)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-ide=
ntity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml	2007-11-22 10:44:22 UTC =
(rev 9074)
@@ -74,20 +74,20 @@
 		</f:facet>
 		<h:commandLink action=3D"#{editprofilemgr.adminEditProfile}" styleClass=
=3D"actionRename">
 			<h:outputText value=3D"#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=
}"/>
-			<f:param name=3D"currentUser" value=3D"#{uiUser.escapedUsername}"/>
+			<f:param name=3D"currentUser" value=3D"#{uiUser.UTF8Username}"/>
 		</h:commandLink> | =

 		<h:commandLink action=3D"#{assignrolemgr.assignRoles}" styleClass=3D"act=
ionProperties">
 			<h:outputText value=3D"#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
-			<f:param name=3D"currentUser" value=3D"#{uiUser.escapedUsername}"/>
+			<f:param name=3D"currentUser" value=3D"#{uiUser.UTF8Username}"/>
 	    </h:commandLink> | =

 		<h:commandLink action=3D"#{useradministrationbean.enableUser}" styleClas=
s=3D"#{uiUser.attribute.enabled =3D=3D true ? 'actionDefault' : 'actionMake=
Default'}">
 			<h:outputText value=3D"#{uiUser.attribute.enabled =3D=3D true ? bundle.=
IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" />
-			<f:param name=3D"currentUser" value=3D"#{uiUser.escapedUsername}"/>
+			<f:param name=3D"currentUser" value=3D"#{uiUser.UTF8Username}"/>
 			<f:param name=3D"enableAction" value=3D"#{uiUser.attribute.enabled =3D=
=3D true ? 'disable' : 'enable'}" />
 		</h:commandLink> | =

 	    <h:commandLink action=3D"#{useradministrationbean.deleteUser}" styleC=
lass=3D"actionDelete">
 	    	<h:outputText value=3D"#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
-	    	<f:param name=3D"currentUser" value=3D"#{uiUser.escapedUsername}"/>
+	    	<f:param name=3D"currentUser" value=3D"#{uiUser.UTF8Username}"/>
 	    </h:commandLink>
 	</h:column>
 	</h:dataTable>

Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/port=
al-identity-war/WEB-INF/jsf/common/userInfo.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-ide=
ntity-war/WEB-INF/jsf/common/userInfo.xhtml	2007-11-22 09:24:02 UTC (rev 90=
73)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-ide=
ntity-war/WEB-INF/jsf/common/userInfo.xhtml	2007-11-22 10:44:22 UTC (rev 90=
74)
@@ -50,7 +50,7 @@
 			  	<h:outputText value=3D"#{bundle.IDENTITY_PASSWORD}"/>
 				<h:commandLink action=3D"#{lostpasswordmgr.adminResetPassword}">
 					<h:outputText value=3D"#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" =
/>
-					<f:param name=3D"currentUser" value=3D"#{manager.uiUser.escapedUserna=
me}" />
+					<f:param name=3D"currentUser" value=3D"#{manager.uiUser.UTF8Username}=
" />
 				</h:commandLink> =

 				<h:panelGroup />
 			</c:when>
@@ -58,7 +58,7 @@
 			  	<h:outputText value=3D"#{bundle.IDENTITY_PASSWORD}"/>
 				<h:commandLink action=3D"#{manager.adminChangePassword}">
 					<h:outputText value=3D"#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
-					<f:param name=3D"currentUser" value=3D"#{manager.uiUser.escapedUserna=
me}" />
+					<f:param name=3D"currentUser" value=3D"#{manager.uiUser.UTF8Username}=
" />
 				</h:commandLink>
 				<h:panelGroup />						=

 			</c:otherwise>
@@ -81,7 +81,7 @@
 		  	<h:outputText value=3D"#{bundle.IDENTITY_PASSWORD}"/>
 			<h:commandLink action=3D"changePassword">
 				<h:outputText value=3D"#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
-				<f:param name=3D"currentUser" value=3D"#{manager.uiUser.escapedUsernam=
e}" />
+				<f:param name=3D"currentUser" value=3D"#{manager.uiUser.UTF8Username}"=
 />
 			</h:commandLink>
 			<h:panelGroup />	=

 	</c:otherwise>


--===============4464892167664786421==--