[portal-commits] JBoss Portal SVN: r8267 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/services and 19 other directories.

Author: emuckenhuber Date: 2007-09-14 10:37:36 -0400 (Fri, 14 Sep 2007) New Revision: 8267 Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml Removed: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/test/validators/ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.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/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.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/jsf/admin/assignRoles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.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/deleteRole.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/roles/roleTemplate.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/createUser.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.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/admin/user/searchUsers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.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/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/editProfileTemplate.xhtml Log: merge with trunk - ui improvements - localization for dynamic values - added configuration exception Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -84,7 +84,7 @@ public static final String DEFAULT_ROLE = "User"; /** Bundle prefix for dynamic value localization */ - public static final String DYNAMIC_VALUE_PREFIX = "IDENTIY_DYNAMIC_VALUE_"; + public static final String DYNAMIC_VALUE_PREFIX = "IDENTITY_DYNAMIC_VALUE_"; } Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -0,0 +1,52 @@ +/****************************************************************************** + * 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.services.metadata; + +/** + * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @version $Revision$ + */ +public class CoreIdentityConfigurationException extends Exception +{ + + public CoreIdentityConfigurationException() + { + super(); + } + + public CoreIdentityConfigurationException(Throwable cause) + { + super(cause); + } + + public CoreIdentityConfigurationException(String message) + { + super(message); + } + + public CoreIdentityConfigurationException(String message, Throwable cause) + { + super(message, cause); + } +} + Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -28,7 +28,6 @@ import java.util.Map; import javax.naming.InitialContext; -import javax.naming.NamingException; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.core.identity.services.IdentityConstants; @@ -110,11 +109,11 @@ this.createJBPMContext(subscriptionMode); this.createJBPMContext(adminSubscriptionMode); - log.info("jBPM worfklow started ..."); + log.info("jBPM workflow started ..."); } else { - throw new RuntimeException("processName cannot be null."); + throw new CoreIdentityConfigurationException("WorkflowService or processName must not be null."); } } else @@ -124,8 +123,9 @@ } catch (Exception e) { - log.error("Error while starting core identity services ...", e); + log.error("Error while starting core identity services ..."); super.stopService(); + throw new CoreIdentityConfigurationException(e); } if (this.jndiName != null) @@ -214,117 +214,150 @@ return workflowService; } - private void createJBPMContext(String processName) throws NamingException + private void createJBPMContext(String processName) throws CoreIdentityConfigurationException { if (!IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC.equals(processName)) { String fileName = "conf/processes/" + processName + ".xml"; + JbpmContext jbpmContext = null; + + try + { + jbpmContext = this.getWorkflowService().getJbpmConfiguration().createJbpmContext(); - JbpmContext jbpmContext = this.getWorkflowService().getJbpmConfiguration().createJbpmContext(); - - ProcessDefinition processDefinition = jbpmContext.getGraphSession().findLatestProcessDefinition(processName); - if (processDefinition == null) + ProcessDefinition processDefinition = jbpmContext.getGraphSession().findLatestProcessDefinition(processName); + if (processDefinition == null) + { + processDefinition = ProcessDefinition.parseXmlResource(fileName); + jbpmContext.deployProcessDefinition(processDefinition); + log.debug("deloying process definition: " + processName); + } + else + { + if (this.configuration.isOverwriteWorkflow()) + { + ProcessDefinition fromConfig = ProcessDefinition.parseXmlResource(fileName); + jbpmContext.deployProcessDefinition(fromConfig); + log.debug("overwriting process definition: " + processName); + } + } + } + catch(Exception e) { - processDefinition = ProcessDefinition.parseXmlResource(fileName); - jbpmContext.deployProcessDefinition(processDefinition); + throw new CoreIdentityConfigurationException("I don't like your subscription mode! Please make sure that the file and the process name match - also check the syntax."); } - else + finally { - if (this.configuration.isOverwriteWorkflow()) - { - ProcessDefinition fromConfig = ProcessDefinition.parseXmlResource(fileName); - jbpmContext.deployProcessDefinition(fromConfig); - } + // Closing JbpmContext + IOTools.safeClose(jbpmContext); } - // Closing JbpmContext - IOTools.safeClose(jbpmContext); } } - private IdentityUIConfiguration createConfiguration() throws IOException, JBossXBException + private IdentityUIConfiguration createConfiguration() throws CoreIdentityConfigurationException { - SchemaBinding schema = XsdBinder.bind(getURL(schemaLocation).toString()); - schema.setIgnoreUnresolvedFieldOrClass(false); - - TermBeforeSetParentCallback componentCallback = new TermBeforeSetParentCallback() + try { - public Object beforeSetParent(Object o, UnmarshallingContext ctx) + SchemaBinding schema = XsdBinder.bind(getURL(schemaLocation).toString()); + schema.setIgnoreUnresolvedFieldOrClass(false); + + TermBeforeSetParentCallback componentCallback = new TermBeforeSetParentCallback() { - UIComponentConfiguration uiComponent = null; - ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm(); - String localPart = eb.getQName().getLocalPart(); - if ("ui-component".equals(localPart)) + public Object beforeSetParent(Object o, UnmarshallingContext ctx) { - uiComponent = (UIComponentConfiguration) o; - try + UIComponentConfiguration uiComponent = null; + ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm(); + String localPart = eb.getQName().getLocalPart(); + if ("ui-component".equals(localPart)) { - // Getting property reference - PropertyInfo propertyInfo = getUserProfileModule().getProfileInfo().getPropertyInfo( - uiComponent.getPropertyRef()); - uiComponent.setPropertyInfo(propertyInfo); + uiComponent = (UIComponentConfiguration) o; + try + { + // Getting property reference + PropertyInfo propertyInfo = getUserProfileModule().getProfileInfo().getPropertyInfo( + uiComponent.getPropertyRef()); + uiComponent.setPropertyInfo(propertyInfo); + } + catch (IdentityException e) + { + uiComponent = null; + throw new IllegalArgumentException("cannot resolve property: " + uiComponent.getPropertyRef()); + } } - catch (IdentityException e) - { - uiComponent = null; - throw new RuntimeException("cannot resolve property: " + uiComponent.getPropertyRef(), e); - } + return uiComponent; } - return uiComponent; - } - }; - - // Adding callback for ui-components - TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent")); - cb.setBeforeSetParentCallback(componentCallback); - - TermBeforeSetParentCallback valueCallback = new TermBeforeSetParentCallback() - { - public Object beforeSetParent(Object o, UnmarshallingContext ctx) + }; + + // Adding callback for ui-components + TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent")); + cb.setBeforeSetParentCallback(componentCallback); + + TermBeforeSetParentCallback valueCallback = new TermBeforeSetParentCallback() { - - ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm(); - String localPart = eb.getQName().getLocalPart(); - Map m = (Map) o; - if ("values".equals(localPart)) + public Object beforeSetParent(Object o, UnmarshallingContext ctx) { - UIComponentConfiguration uiComponent = (UIComponentConfiguration) ctx.getParentValue(); - if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_LOCALE) ) + + ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm(); + String localPart = eb.getQName().getLocalPart(); + Map m = (Map) o; + if ("values".equals(localPart)) { - uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_LOCALE); - m.remove(IdentityConstants.COMPONENT_VALUE_LOCALE); + UIComponentConfiguration uiComponent = (UIComponentConfiguration) ctx.getParentValue(); + if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_LOCALE) ) + { + uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_LOCALE); + m.remove(IdentityConstants.COMPONENT_VALUE_LOCALE); + } + else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_THEME)) + { + uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_THEME); + m.remove(IdentityConstants.COMPONENT_VALUE_THEME); + } + else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_TIMEZONE)) + { + uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_TIMEZONE); + m.remove(IdentityConstants.COMPONENT_VALUE_TIMEZONE); + } } - else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_THEME)) - { - uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_THEME); - m.remove(IdentityConstants.COMPONENT_VALUE_THEME); - } - else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_TIMEZONE)) - { - uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_TIMEZONE); - m.remove(IdentityConstants.COMPONENT_VALUE_TIMEZONE); - } + return m; } - return m; - } - }; - - // Adding callback for ui-component values - TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues")); - vb.setBeforeSetParentCallback(valueCallback); - - // Unmarshalling && creating configuration - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - return (IdentityUIConfiguration) unmarshaller.unmarshal(getResource(xmlLocation), schema); + }; + + // Adding callback for ui-component values + TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues")); + vb.setBeforeSetParentCallback(valueCallback); + + // Unmarshalling && creating configuration + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + return (IdentityUIConfiguration) unmarshaller.unmarshal(getResource(xmlLocation), schema); + } + catch (IOException e) + { + throw new CoreIdentityConfigurationException("Could not find configuration file or schema."); + } + catch (JBossXBException e) + { + throw new CoreIdentityConfigurationException("Could not parse configuration file."); + } + catch (Exception e) + { + throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or less please check the reference Guide."); + } } - private InputStream getResource(String path) throws IOException + protected InputStream getResource(String path) throws IOException { URL url = Thread.currentThread().getContextClassLoader().getResource(path); + if (url == null) + throw new IOException(); return url.openStream(); } private URL getURL(String path) throws IOException { - return Thread.currentThread().getContextClassLoader().getResource(path); + URL url = Thread.currentThread().getContextClassLoader().getResource(path); + if (url == null) + throw new IOException(); + return url; } } Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -33,14 +33,50 @@ public interface RegistrationService { + /** + * Start the registration process for a new user + * + * @param portalURL + * @param username + * @param password + * @param profileMap + * @param roles + * @param locale + * @param adminFlag + * @return + */ String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag); + /** + * Approve or reject a registration + * + * @param id + * @param approve + * @return + */ String approve(String id, boolean approve); + /** + * Get pending users + * + * @param nodeName + * @return + */ List getPendingUsers(String nodeName); + /** + * Check for a existing username in the jBPM context + * + * @param username + * @return + */ boolean checkUsername(String username); + /** + * Get pending users count + * + * @return + */ int getPendingCount(); } Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -51,6 +51,9 @@ /** The assigned roles */ private List roles; + + /** Is selected */ + private boolean selected = false; /** The current node */ private String currentNode; @@ -117,7 +120,17 @@ { this.roles = roles; } - + + public boolean isSelected() + { + return selected; + } + + public void setSelected(boolean selected) + { + this.selected = selected; + } + public String getCurrentNode() { return currentNode; Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -290,16 +290,20 @@ count = !instance.hasEnded() ? count + 1 : count; } } - List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode); - if (adminProcessInstances != null && adminProcessInstances.size() > 0) + if (! this.adminSubscriptionMode.equals(this.subscriptionMode) + && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC)) { - Iterator i = adminProcessInstances.iterator(); - while (i.hasNext()) + List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode); + if (adminProcessInstances != null && adminProcessInstances.size() > 0) { - ProcessInstance instance = (ProcessInstance) i.next(); - Node node = instance.getRootToken().getNode(); - if (IdentityConstants.JBPM_NODE_APPROVAL.equals(node.getName())) - count = !instance.hasEnded() ? count + 1 : count; + Iterator i = adminProcessInstances.iterator(); + while (i.hasNext()) + { + ProcessInstance instance = (ProcessInstance) i.next(); + Node node = instance.getRootToken().getNode(); + if (IdentityConstants.JBPM_NODE_APPROVAL.equals(node.getName())) + count = !instance.hasEnded() ? count + 1 : count; + } } } } @@ -326,10 +330,14 @@ queue.addAll(this.getPendingUser(userProcessInstances, nodeName)); } - List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode); - if (adminProcessInstances != null && adminProcessInstances.size() > 0) + if (! this.adminSubscriptionMode.equals(this.subscriptionMode) + && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC)) { - queue.addAll(this.getPendingUser(adminProcessInstances, nodeName)); + List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode); + if (adminProcessInstances != null && adminProcessInstances.size() > 0) + { + queue.addAll(this.getPendingUser(adminProcessInstances, nodeName)); + } } } catch (NamingException e) @@ -392,18 +400,21 @@ try { List userProcessInstances = this.getProcessInstances(jbpmContext, this.subscriptionMode); - List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode); - if (userProcessInstances != null && userProcessInstances.size() > 0) { if (this.checkUsername(userProcessInstances, username)) return true; } - - if (adminProcessInstances != null && adminProcessInstances.size() > 0) + + if (! this.adminSubscriptionMode.equals(this.subscriptionMode) + && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC)) { - if (this.checkUsername(adminProcessInstances, username)) - return true; + List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode); + if (adminProcessInstances != null && adminProcessInstances.size() > 0) + { + if (this.checkUsername(adminProcessInstances, username)) + return true; + } } } catch (NamingException e) @@ -454,7 +465,8 @@ } GraphSession graphSession = jbpmContext.getGraphSession(); ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition(processName); - processInstances = graphSession.findProcessInstances(processDefinition.getId()); + if ( processDefinition != null ) + processInstances = graphSession.findProcessInstances(processDefinition.getId()); } return processInstances; } Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -92,7 +92,8 @@ // ok on user register } } - return new PropertyValue(propertyValue); + + return new PropertyValue(identityUserBean.getLocalizedValue((String)propertyName, propertyValue)); } public boolean setValue(Object propertyName, Object value) throws IllegalArgumentException Modified: 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/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -31,10 +32,12 @@ import javax.faces.context.FacesContext; import javax.faces.model.DataModel; import javax.faces.model.ListDataModel; +import javax.portlet.PortletException; import org.jboss.logging.Logger; import org.jboss.portal.core.identity.services.IdentityConstants; import org.jboss.portal.core.identity.services.workflow.RegistrationService; +import org.jboss.portal.core.identity.services.workflow.UserContainer; 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; @@ -69,12 +72,21 @@ /** . */ private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL; + + /** . */ + private List pendingUsers = null; + + /** . */ + private List pendingActionList = null; + + /** . */ + private String pendingUserAction = null; /** . */ private IdentityUIUser uiUser; /** . */ - private String searchString = null; + private String searchString = ""; /** . */ private IdentityUserBean identityUserBean; @@ -153,14 +165,14 @@ return identityUserBean; } - public String getDisplayNode() + public String getPendingUserAction() { - return displayNode; + return pendingUserAction; } - - public void setDisplayNode(String displayNode) + + public List getPendingActionList() { - this.displayNode = displayNode; + return pendingActionList; } public void setIdentityUserBean(IdentityUserBean identityUserBean) @@ -281,10 +293,9 @@ public List getPendingUsers() { - List list = new ArrayList(); - if ( this.registrationService != null) - list = this.registrationService.getPendingUsers(displayNode); - return list; + if ( this.registrationService != null ) + this.pendingUsers = this.registrationService.getPendingUsers(displayNode); + return pendingUsers; } public String deleteUser() @@ -347,7 +358,64 @@ this.registrationService.approve(processId, false); } } + this.pendingUsers = null; return "pendingUsers"; } - + + public String approveList() + { + this.pendingUserAction = "approve"; + this.pendingActionList = new ArrayList(); + for(Iterator i = pendingUsers.iterator(); i.hasNext(); ) + { + UserContainer user = (UserContainer) i.next(); + if ( user.isSelected() ) + { + this.pendingActionList.add(user); + } + } + if (this.pendingActionList.size() >0) + { + return "confirmPendingAction"; + } + return "pendingUsers"; + } + + public String rejectList() + { + this.pendingUserAction = "reject"; + this.pendingActionList = new ArrayList(); + for(Iterator i = pendingUsers.iterator(); i.hasNext(); ) + { + UserContainer user = (UserContainer) i.next(); + if ( user.isSelected() ) + { + this.pendingActionList.add(user); + } + } + if (this.pendingActionList.size() > 0) + { + return "confirmPendingAction"; + } + return "pendingUsers"; + } + + public String confirmPendingAction() + { + for(Iterator i = pendingActionList.iterator(); i.hasNext(); ) + { + UserContainer user = (UserContainer) i.next(); + if (this.pendingUserAction.equals("approve")) + { + this.registrationService.approve(user.getProcessId(), true); + } + else if (this.pendingUserAction.equals("reject")) + { + this.registrationService.approve(user.getProcessId(), false); + } + } + this.pendingActionList = null; + this.pendingUsers = null; + return "success"; + } } Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -28,9 +28,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.ResourceBundle; import java.util.Set; +import javax.faces.context.FacesContext; + import org.jboss.logging.Logger; +import org.jboss.portal.core.identity.services.IdentityConstants; import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration; import org.jboss.portal.core.identity.ui.IdentityUIUser; import org.jboss.portal.identity.IdentityException; @@ -161,6 +165,26 @@ user.updatePassword(password); } + public Object getLocalizedValue(String propertyName, Object value) + { + UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject(); + if( uiComponent.getValues() != null + && value instanceof String + && uiComponent.getValues().size() > 0) + { + try + { + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); + return bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + ((String)value).toUpperCase()); + } + catch (Exception e) + { + return value; + } + } + return value; + } + public Class getPropertyType(String propertyName) throws IdentityException, ClassNotFoundException { UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject(); Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-14 14:37:36 UTC (rev 8267) @@ -28,6 +28,8 @@ import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; +import javax.portlet.PortletException; +import javax.portlet.UnavailableException; import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration; import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService; @@ -49,7 +51,7 @@ /** . */ private IdentityUIConfigurationService identityUIConfigurationService; - public MetaDataServiceBean() + public MetaDataServiceBean() throws UnavailableException { try { @@ -57,9 +59,9 @@ IdentityUIConfiguration cf = identityUIConfigurationService.getConfiguration(); this.map = cf.getUiComponents(); } - catch (NamingException e) + catch (Exception e) { - throw new RuntimeException(e); + throw new UnavailableException("Configuration service not available. Please check your configuration files and the logs."); } } Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/test) Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/test/core) Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/test/core/identity) Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-14 14:37:36 UTC (rev 8267) @@ -58,6 +58,7 @@ <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> portal:service=Module,type=IdentityServiceController </depends> + <depends>portal:service=Workflow,type=WorkflowService</depends> <attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute> </mbean> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-14 14:37:36 UTC (rev 8267) @@ -118,6 +118,10 @@ IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user: IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users +IDENTITY_MANAGEMENT_APPROVE_ALL=Approve selected +IDENTITY_MANAGEMENT_REJECT_ALL=Reject selected +IDENTITY_MANAGEMENT_SELECT_ALL=select all +IDENTITY_MANAGEMENT_UNSELECT_ALL=unselect all IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id @@ -125,7 +129,7 @@ IDENTITY_MANAGEMENT_PENDING_REJECT=reject IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha -IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object +IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password @@ -150,5 +154,5 @@ IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect # Example usage for dynamic values -#IDENTIY_DYNAMIC_VALUE_TEST=test label -#IDENTIY_DYNAMIC_VALUE_TEST2=test label2 \ No newline at end of file +IDENTITY_DYNAMIC_VALUE_TEST=test label +IDENTITY_DYNAMIC_VALUE_TEST2=test label2 \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-14 14:37:36 UTC (rev 8267) @@ -76,6 +76,10 @@ </ui-component> <ui-component name="interests"> <property-ref>portal.user.interests</property-ref> + <values> + <value key="test">testing</value> + <value key="test2">testing2</value> + </values> </ui-component> <ui-component name="icq"> <property-ref>portal.user.im.icq</property-ref> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-14 14:37:36 UTC (rev 8267) @@ -319,6 +319,28 @@ </navigation-case> </navigation-rule> <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</from-view-id> + <navigation-case> + <from-outcome>confirmPendingAction</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>cancel</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</from-view-id> + <navigation-case> + <from-outcome>revise</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>success</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> <from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id> <navigation-case> <from-outcome>deleteUser</from-outcome> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,8 +9,17 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> - <h:outputText value="#{assignrolemgr.uiUser.username}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> + <h:outputText value="#{assignrolemgr.uiUser.username}" /> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -19,9 +28,10 @@ <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> </h:selectManyCheckbox> <hr/> + <p style="text-align: right;"> <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"/> - + </p> </h:form> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -8,7 +8,21 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> -<ui:define name="title" /> +<ui:define name="title"> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> + </li> + </ul> +</h:form> +</ui:define> <ui:define name="content"> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -8,7 +8,11 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + <ul class="objectpath"> + <li> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + </ul> </ui:define> <ui:define name="content"> Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -1,25 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core" - class="identity-ui"> - -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> - -<ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> -</ui:define> - -<ui:define name="content"> - - <ui:decorate template="/WEB-INF/jsf/common/register.xhtml"> - <ui:param name="manager" value="#{userregistermgr}"/> - <ui:param name="showCaptcha" value="false" /> - </ui:decorate> - -</ui:define> - -</ui:composition> -</div> \ No newline at end of file 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,7 +9,16 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -22,8 +31,10 @@ <h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/> </h:panelGrid> <hr/> + <p style="text-align: right;"> <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:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/> + </p> </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/deleteRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -10,7 +10,17 @@ <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> + <h:outputText value="#{rolemanagementbean.uiRole.name}"/> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -24,8 +34,10 @@ </h:panelGrid> <h:messages /> <hr/> + <p style="text-align: right;"> <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" styleClass="portlet-form-button"/> + </p> </h:form> </ui:define> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,7 +9,16 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -22,8 +31,10 @@ <h:inputText value="#{editrolemgr.uiRole.displayName}"/> </h:panelGrid> <hr/> + <p style="text-align: right;"> <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"/> + </p> </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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,7 +9,16 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -13,7 +13,7 @@ <li> <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/> </li> - <li id="currentTab"><h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li> + <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li> </ul> </h:form> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -8,7 +8,11 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + <ul class="objectpath"> + <li> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + </ul> </ui:define> <ui:define name="content"> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -10,8 +10,17 @@ <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" /> - <h:outputText value="#{editprofilemgr.currentUser}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" /> + <h:outputText value="#{editprofilemgr.currentUser}" /> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -32,8 +41,10 @@ </h:panelGrid> <hr/> + <p style="text-align: right;"> <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"/> + </p> </h:form> </ui:define> Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml (from rev 8266, trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -0,0 +1,66 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + class="identity-ui"> + +<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> + +<ui:define name="title"> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" /> + </li> + </ul> +</h:form> +</ui:define> +<ui:define name="content"> +<h:form> +<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> + <h:column> + <h:selectBooleanCheckbox value="#{user.selected}" disabled="true" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_BPM_ID}"/> + </f:facet> + <h:outputText value="#{user.processId}" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> + </f:facet> + <h:outputText value="#{user.username}"/> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + </f:facet> + <h:outputText value="#{user.email}"/> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_REIGSTRATION_DATE}"/> + </f:facet> + <h:outputText value="#{user.registrationDate}"> + <f:convertDateTime dateStyle="medium" type="both" /> + </h:outputText> + </h:column> +</h:dataTable> + <p style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> + <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" /> + </p> +</h:form> +</ui:define> +</ui:composition> +</div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,7 +9,16 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -10,7 +10,17 @@ <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> + <h:outputText value="#{useradministrationbean.uiUser.username}"/> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -24,8 +34,10 @@ </h:panelGrid> <h:messages /> <hr/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/> + <p style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/> + </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,16 +9,49 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> + </li> + </ul> +</h:form> </ui:define> + <ui:define name="content"> -<h:form> +<f:verbatim> +<script> +// <![CDATA[ +function selectAll() { + var form=$('pending'); + var i=form.getElements('checkbox'); + i.each(function(item) { + item.checked=true + }); +} +function unSelectAll() { + var form=$('pending'); + var i=form.getElements('checkbox'); + i.each(function(item) { + item.checked=false + }); +} +// ]]> +</script> +</f:verbatim> +<h:form id="pending"> <h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> <h:column> + <h:selectBooleanCheckbox id="selected" value="#{user.selected}" /> + </h:column> + <h:column> <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_BPM_ID}"/> </f:facet> - <h:outputText value="#{user.processId}"/> + <h:outputText value="#{user.processId}" /> </h:column> <h:column> <f:facet name="header"> @@ -58,6 +91,19 @@ </h:commandLink> </h:column> </h:dataTable> +<table border="0" cellspacing="3" style="width: 100%;" > + <tr> + <td style="text-align: left;" > + <a href="#" onClick="selectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SELECT_ALL}" /></a> | + <a href="#" onClick="unSelectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_UNSELECT_ALL}" /></a> + </td> + <td style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/> + </td> + </tr> +</table> </h:form> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -10,7 +10,16 @@ <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> @@ -18,9 +27,6 @@ <ui:param name="show_roles" value="true"/> <ui:param name="subscriptionMode" value="admin" /> </ui:decorate> - - - </ui:define> </ui:composition> </div> \ No newline at end of file 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,8 +9,17 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> - <h:outputText value="#{userregistermgr.uiUser.username}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> + <h:outputText value="#{userregistermgr.uiUser.username}" /> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> @@ -19,9 +28,10 @@ <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> </h:selectManyCheckbox> <hr/> + <p style="text-align: right;"> <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"/> - + </p> </h:form> </ui:define> </ui:composition> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,8 +9,17 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " /> - <h:outoutText value="#{editprofilemgr.uiUser.username}" /> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " /> + <h:outoutText value="#{editprofilemgr.uiUser.username}" /> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -9,7 +9,16 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> +<h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li> + &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> + </li> + </ul> +</h:form> </ui:define> <ui:define name="content"> <h:form> @@ -84,9 +93,10 @@ </h:commandLink> </h:column> </h:dataTable> - + <p style="text-align: right;"> <h:commandLink value=" &#60; " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> <h:commandLink value=" &#62; " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> + </p> </h:form> <br/> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -10,7 +10,7 @@ <h:form> <ul class="topnav"> - <li id="currentTab"><h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li> + <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li> <li> <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/> </li> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -29,9 +29,11 @@ </c:if> <h:messages /> <hr/> +<p style="text-align: right;"> <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"/> +</p> </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/profile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -148,7 +148,9 @@ </h:panelGrid> <hr/> +<p style="text-align: right;"> <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"/> +</p> </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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -42,7 +42,9 @@ <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> <hr/> + <p style="text-align: right;"> <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"/> +</p> </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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -25,8 +25,10 @@ <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> <hr/> + <p style="text-align: right;"> <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"/> + </p> </h:form> </ui:define> </ui:composition> 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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -30,8 +30,10 @@ <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"/> + <p style="text-align: right;"> + <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/> + </p> </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-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -38,8 +38,10 @@ </h:panelGrid> <hr/> - <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <p style="text-align: right;"> + <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> + </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-14 14:37:36 UTC (rev 8267) @@ -11,7 +11,7 @@ <h:form> <ul class="topnav"> <li> - <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="#{editprofilemgr.viewStart}"/> + <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/> </li> <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li> </ul>