[portal-commits] JBoss Portal SVN: r8183 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/ui/common and 4 other directories.

Author: emuckenhuber Date: 2007-09-06 08:06:46 -0400 (Thu, 06 Sep 2007) New Revision: 8183 Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityRoleBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml Log: - UI enhancements - internationalization - minor fixes Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-06 12:06:46 UTC (rev 8183) @@ -28,7 +28,6 @@ import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; import org.jboss.logging.Logger; import org.jboss.portal.api.node.PortalNode; Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityRoleBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityRoleBean.java 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityRoleBean.java 2007-09-06 12:06:46 UTC (rev 8183) @@ -44,10 +44,10 @@ */ public class IdentityRoleBean { - /** . */ + /** The identity role module */ private RoleModule roleModule; - /** . */ + /** The identity memebershipModule */ private MembershipModule membershipModule; public RoleModule getRoleModule() Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-06 12:06:46 UTC (rev 8183) @@ -46,16 +46,16 @@ public class IdentityUserBean { - /** . */ + /** The identity user module */ private UserModule userModule; - /** . */ + /** The user profile module */ private UserProfileModule userProfileModule; - /** . */ + /** The core-identity meta data service */ private MetaDataServiceBean metaDataService; - /** . */ + /** the logger */ private static final Logger log = Logger.getLogger(IdentityUserBean.class); public UserModule getUserModule() Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-06 12:06:46 UTC (rev 8183) @@ -43,7 +43,7 @@ */ public class MetaDataServiceBean implements DynamicBean { - /** . */ + /** The map */ Map map = null; /** . */ Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2007-09-06 12:06:46 UTC (rev 8183) @@ -64,7 +64,6 @@ return list; } - /** * Generates a list of available themes * @@ -122,8 +121,6 @@ } return compare; } - } - } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-06 12:06:46 UTC (rev 8183) @@ -23,7 +23,6 @@ package org.jboss.portal.core.identity.ui.validators; import java.util.ResourceBundle; -import java.util.regex.Pattern; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -71,7 +70,7 @@ User u = userModule.findUserByUserName(username); // User found so this nickname is already taken - throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN") + username)); + throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN") + u.getUserName())); } catch (NoSuchUserException e) { Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-06 12:06:46 UTC (rev 8183) @@ -46,13 +46,13 @@ </f:facet> <h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/> <!-- #{user.currentNode == 'adminApproval'} --> - <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'adminApproval'}"> + <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/> <f:param name="processId" value="#{user.processId}" /> <f:param name="action" value="approve" /> </h:commandLink> <h:outputText value=" | " rendered="#{user.currentNode == 'admin_approval'}" /> - <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'adminApproval'}"> + <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/> <f:param name="processId" value="#{user.processId}" /> <f:param name="action" value="reject" /> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-06 04:59:08 UTC (rev 8182) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-06 12:06:46 UTC (rev 8183) @@ -42,10 +42,6 @@ <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> </supports> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>EDIT</portlet-mode> - </supports> <portlet-info> <title>User portlet</title> <keywords>management,user</keywords> @@ -54,7 +50,7 @@ <preference> <!-- Use captcha verification --> <name>captcha</name> - <value>false</value> + <value>true</value> </preference> <preference> <!--