Author: emuckenhuber Date: 2007-09-11 12:10:40 -0400 (Tue, 11 Sep 2007) New Revision: 8232 Modified: 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/resources/portal-identity-sar/conf/processes/custom.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml Log: - update missing changes Modified: 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/EditProfileAction.java 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 16:10:40 UTC (rev 8232) @@ -75,6 +75,7 @@ /** . */ private static final Logger log = Logger.getLogger(EditProfileAction.class); + /** The EditProfileAction constructor */ public EditProfileAction() { FacesContext ctx = FacesContext.getCurrentInstance(); @@ -191,6 +192,7 @@ ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); this.currentUser = (String) params.get("currentUser"); + this.windowState = null; if (this.currentUser == null) { this.currentUser = ectx.getRemoteUser(); @@ -201,6 +203,7 @@ public String updateProfile() { + FacesContext ctx = FacesContext.getCurrentInstance(); try { User user = identityUserBean.findUserByUserName(this.currentUser); @@ -209,17 +212,29 @@ } catch (RuntimeException e) { - ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR"))); log.error("",e); } catch (IdentityException e) { - ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR"))); log.error("",e); } - return "editProfile"; + if ( windowState != null) + { + try + { + JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse(); + response.setWindowState(windowState); + } + catch(Exception e) + { + log.error("", e); + } + } + return "start"; } public String changePassword() Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE process-definition PUBLIC - "-//jBpm/jBpm Mapping DTD 2.0//EN" - "http://jbpm.org/dtd/processdefinition-2.0.dtd"> - -<process-definition name="custom"> +<process-definition name="custom" + xmlns="urn:jbpm.org:jpdl-3.1"> <start-state> <transition to="end"> <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -21,11 +21,9 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE process-definition PUBLIC - "-//jBpm/jBpm Mapping DTD 2.0//EN" - "http://jbpm.org/dtd/processdefinition-2.0.dtd"> - +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Schema for correct timer usage broken in jBPM 3.1.x + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <process-definition name="jbp_identity_validate_email"> <start-state> <transition to="validate_email"> @@ -40,4 +38,4 @@ <transition name="timedOut" to="end"/> </state> <end-state name="end"/> -</process-definition> \ No newline at end of file +</process-definition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -21,11 +21,9 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE process-definition PUBLIC - "-//jBpm/jBpm Mapping DTD 2.0//EN" - "http://jbpm.org/dtd/processdefinition-2.0.dtd"> - +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Schema for correct timer usage broken in jBPM 3.1.x + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <process-definition name="jbp_identity_validation_approval_workflow"> <start-state> <transition to="validate_email"> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -21,11 +21,9 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE process-definition PUBLIC - "-//jBpm/jBpm Mapping DTD 2.0//EN" - "http://jbpm.org/dtd/processdefinition-2.0.dtd"> - +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Schema for correct timer usage broken in jBPM 3.1.x + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <process-definition name="jbp_identity_validation_workflow"> <start-state> <transition to="validate_email"> @@ -33,11 +31,11 @@ </transition> </start-state> <state name="validate_email"> - <timer name="time_to_expire" duedate="2 days" transition="timedOut" /> + <timer name="time_to_expire" duedate="2 days" transition="timedOut" /> <transition name="validated" to="end"> <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/> </transition> <transition name="timedOut" to="end"/> </state> <end-state name="end"/> -</process-definition> \ No newline at end of file +</process-definition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -331,19 +331,25 @@ <from-outcome>adminChangePassword</from-outcome> <to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <navigation-case> <from-action>#{editprofilemgr.adminEditProfile}</from-action> <from-outcome>editProfile</from-outcome> <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> </navigation-case> - <navigation-case> - <from-action>#{editprofilemgr.updateProfile}</from-action> - <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> @@ -424,7 +430,18 @@ <from-action>#{lostpasswordmgr.doomed}</from-action> <from-outcome>lostPassword</from-outcome> <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> - </navigation-case> - </navigation-rule> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>searchUsers</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> </faces-config> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -27,7 +27,7 @@ <portlet-app> <portlet> - <portlet-name>CoreIdentityUserPortlet</portlet-name> + <portlet-name>IdentityUserPortlet</portlet-name> <ajax> <partial-refresh>false</partial-refresh> </ajax> @@ -39,7 +39,7 @@ </header-content> </portlet> <portlet> - <portlet-name>CoreIdentityAdminPortlet</portlet-name> + <portlet-name>IdentityAdminPortlet</portlet-name> <ajax> <partial-refresh>false</partial-refresh> </ajax> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -19,7 +19,8 @@ <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> </h:selectManyCheckbox> <hr/> - <h:commandButton value="Submit" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -7,7 +7,9 @@ class="identity-ui"> <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> -<ui:define name="title"/> +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> +</ui:define> <ui:define name="content"> <h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -22,7 +22,8 @@ <h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/> </h:panelGrid> <hr/> - <h:commandButton value="Submit" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/> </h:form> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -22,7 +22,8 @@ <h:inputText value="#{editrolemgr.uiRole.displayName}"/> </h:panelGrid> <hr/> - <h:commandButton value="Submit" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/> </h:form> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -44,7 +44,7 @@ <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> - <h:commandLink action="#{editprofilemgr.editProfile}"> + <h:commandLink action="#{editprofilemgr.adminEditProfile}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> | Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -7,7 +7,9 @@ class="identity-ui"> <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> -<ui:define name="title" /> +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> +</ui:define> <ui:define name="content"> <h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -32,6 +32,7 @@ </h:panelGrid> <hr/> + <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -19,7 +19,8 @@ <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> </h:selectManyCheckbox> <hr/> - <h:commandButton value="Submit" action="register" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -17,6 +17,7 @@ <h:form> <p><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" /></p> <hr/> + <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandLink action="#{lostpasswordmgr.doomed}"> <h:outputText value="#{bundle.IDENTITY_BUTTON_SUBMIT}" /> <f:param name="currentUser" value="#{editprofilemgr.uiUser.username}" /> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -29,6 +29,7 @@ </c:if> <h:messages /> <hr/> + <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/> <h:commandButton id="#{subscriptionMode}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" actionListener="#{manager.register}" action="registered" styleClass="portlet-form-button"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -36,7 +36,7 @@ <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> - <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> + <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> <f:selectItems value="#{metadataservice.locale.values}" /> </h:selectOneMenu> <h:panelGroup /> @@ -148,6 +148,7 @@ </h:panelGrid> <hr/> + <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -42,6 +42,7 @@ <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> <hr/> + <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/> </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -24,7 +24,8 @@ <!-- include captcha --> <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> - <hr/> + <hr/> + <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{lostpasswordmgr.doomed}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -17,7 +17,7 @@ <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/> </li> <li id="currentTab"> - <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/> + <h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD}" /> </li> </ul> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -30,6 +30,7 @@ <h:message for="email" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:panelGrid> <hr/> + <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -38,6 +38,7 @@ </h:panelGrid> <hr/> + <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -19,21 +19,21 @@ <h:outputText value="#{bundle.IDENTITY_USERNAME}:"/> <h:outputText value="#{editprofilemgr.uiUser.username}"/> - <h:outputText value="#{bundle.IDENTITY_EMAIL}:"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.email}"/> + <h:outputText value="#{bundle.IDENTITY_EMAIL}:" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.email}" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/> - <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}"/> + <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/> - <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}"/> - - <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}"/> + <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/> - <h:outputText value="#{bundle.IDENTITY_LOCATION}:"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.location}"/> + <h:outputText value="#{bundle.IDENTITY_LOCATION}:" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.location}" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/> + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/> + </h:panelGrid> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 16:10:40 UTC (rev 8232) @@ -11,7 +11,7 @@ <h:form> <ul class="topnav"> <li id="currentTab"> - <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/> + <h:outputText value="#{bundle.IDENTITY_WELCOME}"/> </li> <li> <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -29,14 +29,14 @@ <deployments> <deployment> <instance> - <instance-id>CoreIdentityUserPortletInstance</instance-id> - <portlet-ref>CoreIdentityUserPortlet</portlet-ref> + <instance-id>IdentityUserPortletInstance</instance-id> + <portlet-ref>IdentityUserPortlet</portlet-ref> </instance> </deployment> <deployment> <instance> - <instance-id>CoreIdentityAdminPortletInstance</instance-id> - <portlet-ref>CoreIdentityAdminPortlet</portlet-ref> + <instance-id>IdentityAdminPortletInstance</instance-id> + <portlet-ref>IdentityAdminPortlet</portlet-ref> <security-constraint> <policy-permission> <role-name>Admin</role-name> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-11 15:46:48 UTC (rev 8231) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-11 16:10:40 UTC (rev 8232) @@ -30,7 +30,7 @@ <portlet> <description>User portlet</description> - <portlet-name>CoreIdentityUserPortlet</portlet-name> + <portlet-name>IdentityUserPortlet</portlet-name> <display-name>User portlet</display-name> <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> <init-param> @@ -65,7 +65,7 @@ <portlet> <description>User and role management portlet</description> - <portlet-name>CoreIdentityAdminPortlet</portlet-name> + <portlet-name>IdentityAdminPortlet</portlet-name> <display-name>User management portlet</display-name> <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> <init-param>