Author: chris.laprun(a)jboss.com Date: 2009-04-28 19:53:54 -0400 (Tue, 28 Apr 2009) New Revision: 13282 Added: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/HasDisplayName.java branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/test/faces/ManagedBeanTestCase.java Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/instance/Instance.java branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java Log: - JBEPP-66: Added more validation to prevent creating or renaming objects with invalid names. See JBPORTAL-2317 for more details of changes. Added: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/HasDisplayName.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/HasDisplayName.java (rev 0) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/HasDisplayName.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ + +package org.jboss.portal.core.model; + +import org.jboss.portal.common.i18n.LocalizedString; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public interface HasDisplayName +{ + /** + * Return the localized string used to represent that object. + * + * @return the localized display name + */ + LocalizedString getDisplayName(); + + /** + * Set the localized string used to represent that object. + * + * @param localizedString the localized display name + */ + void setDisplayName(LocalizedString localizedString); +} Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/instance/Instance.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/instance/Instance.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/instance/Instance.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance; -import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.model.HasDisplayName; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -38,7 +38,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public interface Instance +public interface Instance extends HasDisplayName { /** The attribute name under which the instance id can be accessed. */ String INSTANCE_ID_ATTRIBUTE = "instanceid"; @@ -51,20 +51,6 @@ String getId(); /** - * Return the display name - * - * @return the display name - */ - LocalizedString getDisplayName(); - - /** - * Set the display name - * - * @param localizedString - */ - void setDisplayName(LocalizedString localizedString); - - /** * Return the runtime metadata for this portlet. * * @return the info Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal; -import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.model.HasDisplayName; import java.util.Collection; import java.util.Map; @@ -33,7 +33,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public interface PortalObject extends Comparable +public interface PortalObject extends Comparable, HasDisplayName { /** Portal property name that indicates the name of the default portal to lookup. */ @@ -86,22 +86,8 @@ * @return the object name */ String getName(); - - /** - * Return the localized string used to represent that object. - * - * @return the localized display name - */ - LocalizedString getDisplayName(); /** - * Set the localized string used to represent that object. - * - * @param localizedString the localized display name - */ - void setDisplayName(LocalizedString localizedString); - - /** * Returns the listener id or null if there is none. * * @return the listener @@ -146,7 +132,7 @@ /** * Returns the child of the specified type and with the given name or <code>null</code> if it cannot be found. * - * @param name the child's name + * @param name the child's name * @param expectedType the expected type of the child to be retrieved * @param <T> a class extending PortalObject * @return the named child or <code>null</code> if it cannot be found Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,6 +20,7 @@ * 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.admin.ui; import org.jboss.portal.api.content.SelectedContent; @@ -44,6 +45,7 @@ import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.faces.component.portlet.PortletEventEvent; +import org.jboss.portal.faces.gui.JSFBeanContext; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvoker; @@ -468,7 +470,7 @@ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Success", - "'" + name + "' " + typeName + " was successfully set as default " + typeName); + "'" + name + "' " + typeName + " was successfully set as default " + typeName); FacesContext.getCurrentInstance().addMessage("status", message); } } @@ -541,7 +543,7 @@ // set the state from the id PortalObjectId portalObjectId = null; - if(id != null) + if (id != null) { portalObjectId = PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT); } @@ -653,7 +655,9 @@ { if (pageManager == null) { + // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext pageManager = new PageManagerBean(layoutService, portletDefinitionInvoker); + pageManager.setBeanContext(new JSFBeanContext()); } pageManager.page = (Page)selectedObject; } @@ -661,7 +665,10 @@ // selectedProperties = new PropertiesBean(this); controlProperties = new ControlPropertiesBean(this); + + // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext propertyAction = new PropertyAction(this); + propertyAction.setBeanContext(new JSFBeanContext()); // theme = new ThemeBean(selectedObject); @@ -758,10 +765,10 @@ public SelectItem[] getAvailableActions() { return new SelectItem[]{ - new SelectItem("view", "View"), - new SelectItem("viewrecursive", "View Recursive"), - new SelectItem("personalize", "Personalize"), - new SelectItem("personalizerecursive", "Personalize Recursive") + new SelectItem("view", "View"), + new SelectItem("viewrecursive", "View Recursive"), + new SelectItem("personalize", "Personalize"), + new SelectItem("personalizerecursive", "Personalize Recursive") }; } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,37 +20,24 @@ * 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.admin.ui.actions; import org.jboss.logging.Logger; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PageContainer; +import org.jboss.portal.faces.gui.ManagedBean; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class AddPageAction +public class AddPageAction extends ManagedBean { /** . */ private static final Logger log = Logger.getLogger(AddPageAction.class); - /** . */ - private static final String ERROR_DUPE_NAME = "Duplicate Page name found on this portal!"; - - /** . */ - private static final String ERROR_EMPTY_NAME = "Page name cannot be blank!"; - - /** . */ - private static final String ERROR_NO_NAME = "Page name not specified!"; - - /** . */ - private static final String ERROR_INTERNAL_ERROR = "An internal error happened!"; - /** The page container that will create the child. */ public PageContainer pageContainer; @@ -62,34 +49,13 @@ /** The message id when an error happens. */ public String messageTarget; + protected static final String PAGE_TYPE = "PAGE_TYPE"; public void execute() { - FacesMessage message = null; - - // - if (pageName == null) + pageName = checkNameValidity(pageName, messageTarget); + if (pageName != null) { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_NO_NAME, ERROR_NO_NAME); - } - else - { - pageName = pageName.trim(); - - // - if (pageName.length() == 0) - { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_EMPTY_NAME, ERROR_EMPTY_NAME); - } - else if (pageContainer.getChild(pageName) != null) - { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_DUPE_NAME, ERROR_DUPE_NAME); - } - } - - // - if (message == null) - { try { Page page = pageContainer.createPage(pageName); @@ -102,16 +68,10 @@ } catch (Exception e) { - log.error("An error happened during page creation", e); - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_INTERNAL_ERROR, ERROR_INTERNAL_ERROR); + log.error("An error occurred during page creation", e); + beanContext.createErrorMessageFrom(messageTarget, e); } } - - // - if (message != null && messageTarget != null) - { - FacesContext.getCurrentInstance().addMessage(messageTarget, message); - } } public interface Listener @@ -148,4 +108,14 @@ { this.listener = listener; } + + protected String getObjectTypeName() + { + return PAGE_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return pageContainer.getChild(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,19 +20,19 @@ * 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.admin.ui.actions; import org.jboss.portal.core.admin.ui.InstanceManagerBean; import org.jboss.portal.core.admin.ui.PortletManagerBean; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import java.util.Collections; import java.util.Set; @@ -40,7 +40,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class CreateInstanceAction +public class CreateInstanceAction extends ManagedBean { /** . */ @@ -51,6 +51,8 @@ /** . */ private InstanceManagerBean instanceMgr; + private static final String MESSAGE_TARGET = "add_instance_form:instanceId"; + protected static final String INSTANCE_TYPE = "INSTANCE_TYPE"; public String getInstanceId() { @@ -84,40 +86,10 @@ public String execute() { - FacesContext faces = FacesContext.getCurrentInstance(); - // Validate instance id + instanceId = checkNameValidity(instanceId, MESSAGE_TARGET); if (instanceId == null) { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No instance id!", null); - faces.addMessage("add_instance_form:instanceId", message); - } - else - { - // Trim name - instanceId = instanceId.trim(); - - // Check for empty string - if (instanceId.length() == 0) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Instance id cannot be blank!", null); - faces.addMessage("add_instance_form:instanceId", message); - } - else - { - // Check for duplicate instance - Instance instance = instanceMgr.getInstanceContainer().getDefinition(instanceId); - if (instance != null) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "An instance with the id " + instanceId + " already exist!", null); - faces.addMessage("add_instance_form:instanceId", message); - } - } - } - - // - if (faces.getMessages().hasNext()) - { return null; } @@ -125,8 +97,7 @@ Portlet portlet = portletMgr.getSelectedPortlet(); if (portlet == null) { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No portlet was selected!", null); - faces.addMessage("add_instance_form:instanceId", message); + beanContext.createTargetedErrorMessage(MESSAGE_TARGET, "NO_SELECTED_PORTLET_ERROR"); return null; } else @@ -152,10 +123,20 @@ } catch (Exception e) { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "An unexpected error happened!", null); - faces.addMessage("add_instance_form:instanceId", message); + log.error("An error occurred during instance creation.", e); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); return null; } } } + + protected String getObjectTypeName() + { + return INSTANCE_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return instanceMgr.getInstanceContainer().getDefinition(objectName) != null; + } } Copied: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java (from rev 12834, branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java) =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java (rev 0) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -0,0 +1,184 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ + +package org.jboss.portal.core.admin.ui.actions; + +import org.jboss.portal.common.i18n.LocaleFormat; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.util.ConversionException; +import org.jboss.portal.core.admin.ui.DisplayNameBean; +import org.jboss.portal.core.model.HasDisplayName; +import org.jboss.portal.faces.gui.ManagedBean; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.SortedMap; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public abstract class DisplayNameAction extends ManagedBean +{ + protected Object managerBean; + protected String newLocale; + protected String newText; + protected DisplayNameBean displayNameBean; + protected HasDisplayName target; + protected static final String DISPLAY_NAME_TYPE = "DISPLAY_NAME_TYPE"; + + public Object getManagerBean() + { + return managerBean; + } + + public void setManagerBean(Object managerBean) + { + checkManagerBean(managerBean); + this.managerBean = managerBean; + } + + public String getNewText() + { + return newText; + } + + public void setNewText(String newText) + { + this.newText = newText; + } + + public SortedMap getLocales() + { + return getDisplayNameBean().getLocales(); + } + + public String getNewLocale() + { + return newLocale; + } + + public void setNewLocale(String newLocale) + { + this.newLocale = newLocale; + } + + public DisplayNameBean getDisplayNameBean() + { + if (displayNameBean == null) + { + displayNameBean = new DisplayNameBean(); + } + return displayNameBean; + } + + public void setDisplayNameBean(DisplayNameBean displayNameBean) + { + this.displayNameBean = displayNameBean; + } + + public void addDisplayName() throws ConversionException + { + newText = checkNameValidity(newText, "display-names-view:add-display-name-form:newName"); + if (newText != null) + { + HasDisplayName hasDisplayName = getTarget(); + Map map = getDisplayNameBean().createLocalizedStringMap(LocaleFormat.DEFAULT.getLocale(newLocale), hasDisplayName.getDisplayName(), newText); + LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); + target.setDisplayName(newLocalizedString); + } + } + + public List<DisplayNameBean.Value> getCurrentLocales() + { + target = getTarget(); + if (target != null && target.getDisplayName() != null) + { + return (List<DisplayNameBean.Value>)getDisplayNameBean().populateCurrentLocales(target.getDisplayName().getValues()); + } + return null; + } + + public void editDisplayName() + { + String locale = beanContext.getParameter("locale"); + String editAction = beanContext.getParameter("editAction"); + + target = getTarget(); + LocalizedString displayName = target.getDisplayName(); + Map<Locale, String> map = new HashMap<Locale, String>(); + if (displayName != null) + { + Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); + Collection<LocalizedString.Value> values = oldMap.values(); + if (editAction.equals("delete")) + { + for (LocalizedString.Value value : values) + { + if (!value.getLocale().toString().equals(locale)) + { + map.put(value.getLocale(), value.getString()); + } + } + } + if (editAction.equals("rename")) + { + for (LocalizedString.Value value : values) + { + map.put(value.getLocale(), value.getString()); + if (value.getLocale().toString().equals(locale)) + { + newText = value.getString(); + newLocale = value.getLocale().getLanguage(); + } + } + } + } + LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); + target.setDisplayName(newLocalizedString); + } + + public String editDisplayNames() throws ConversionException + { + getTarget(); + getCurrentLocales(); + return "editDisplayNames"; + } + + protected String getObjectTypeName() + { + return DISPLAY_NAME_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return false; // we don't check for duplicates here + } + + protected abstract HasDisplayName getTarget(); + + protected abstract void checkManagerBean(Object managerBean); +} Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,10 +20,12 @@ * 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.admin.ui.actions; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Portal; @@ -31,15 +33,12 @@ import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.model.portal.PortalObjectPermission; +import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.theme.ThemeConstants; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.ValidatorException; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -49,7 +48,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PortalAction +public class PortalAction extends ManagedBean { /** . */ @@ -58,14 +57,9 @@ /** . */ private String portalName; - //private String defaultPageName; + private static final String MESSAGE_TARGET = "create-portal-form:name"; + protected static final String PORTAL_TYPE = "PORTAL_TYPE"; - /** . */ - private static final String ERROR_DUPE_NAME = "Duplicate Portal name found on this portal!"; - - /** . */ - private static final String ERROR_EMPTY_NAME = "Portal name cannot be blank!"; - public PortalObjectManagerBean getPortalObjectManager() { return pomgr; @@ -93,87 +87,73 @@ public void setDefaultObjectName(String defaultObjectName) { - if (defaultObjectName != null && !defaultObjectName.equals("")) + if (!ParameterValidation.isNullOrEmpty(defaultObjectName)) { pomgr.getSelectedObject().setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, defaultObjectName); } - else if (defaultObjectName == null || defaultObjectName.equals("")) + else { pomgr.getSelectedObject().setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, null); } } - - /** - * Checks for duplicate portal names on the portal instance. Blank page names are not allowed and are controlled by - * the required attribute in the presentation page. - * - * @param context - * @param toValidate - * @param value - */ - public void validatePortalName(FacesContext context, UIComponent toValidate, Object value) - { - String portalName = (String)value; - - // check for empty string - if (portalName.startsWith(" ")) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, PortalAction.ERROR_EMPTY_NAME, PortalAction.ERROR_EMPTY_NAME); - throw new ValidatorException(message); - } - - // Check for duplicate child name - if (pomgr.getSelectedObject().getChild(portalName) != null) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, PortalAction.ERROR_DUPE_NAME, PortalAction.ERROR_DUPE_NAME); - throw new ValidatorException(message); - } - } - public void addPortal() { try { PortalContainer portalContainer = (PortalContainer)pomgr.getSelectedObject(); - Portal portal = portalContainer.createPortal(portalName); - DomainConfigurator configurator = pomgr.getDomainConfigurator(); - // Initial portal permissions - Set actions = new HashSet(); - actions.add(PortalObjectPermission.VIEW_RECURSIVE_ACTION); - actions.add(PortalObjectPermission.PERSONALIZE_RECURSIVE_ACTION); - RoleSecurityBinding binding = new RoleSecurityBinding(actions, SecurityConstants.UNCHECKED_ROLE_NAME); - Set constraints = Collections.singleton(binding); - configurator.setSecurityBindings(portal.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); + portalName = checkNameValidity(portalName, MESSAGE_TARGET); + if (portalName != null) + { + Portal portal = portalContainer.createPortal(portalName); + DomainConfigurator configurator = pomgr.getDomainConfigurator(); - // We need to add initial layout sets to avoid problems... - portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, "generic"); - // portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME, "Nphalanx"); - portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, "divRenderer"); + // Initial portal permissions + Set actions = new HashSet(); + actions.add(PortalObjectPermission.VIEW_RECURSIVE_ACTION); + actions.add(PortalObjectPermission.PERSONALIZE_RECURSIVE_ACTION); + RoleSecurityBinding binding = new RoleSecurityBinding(actions, SecurityConstants.UNCHECKED_ROLE_NAME); + Set constraints = Collections.singleton(binding); + configurator.setSecurityBindings(portal.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); - // - portal.getSupportedWindowStates().add(WindowState.MAXIMIZED); - portal.getSupportedWindowStates().add(WindowState.MINIMIZED); - portal.getSupportedWindowStates().add(WindowState.NORMAL); + // We need to add initial layout sets to avoid problems... + portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, "generic"); + portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, "divRenderer"); - // - portal.getSupportedModes().add(Mode.EDIT); - portal.getSupportedModes().add(Mode.HELP); - portal.getSupportedModes().add(Mode.VIEW); + // + portal.getSupportedWindowStates().add(WindowState.MAXIMIZED); + portal.getSupportedWindowStates().add(WindowState.MINIMIZED); + portal.getSupportedWindowStates().add(WindowState.NORMAL); - // Create the default page - Page page = portal.createPage("default"); - constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME)); - configurator.setSecurityBindings(page.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); + // + portal.getSupportedModes().add(Mode.EDIT); + portal.getSupportedModes().add(Mode.HELP); + portal.getSupportedModes().add(Mode.VIEW); - portal.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, page.getName()); + // Create the default page + Page page = portal.createPage("default"); + constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME)); + configurator.setSecurityBindings(page.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); + portal.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, page.getName()); + } } catch (Exception e) { - e.printStackTrace(); + log.error("An error occurred during portal creation.", e); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); } } + + protected String getObjectTypeName() + { + return PORTAL_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return pomgr.getSelectedObject().getChild(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -22,199 +22,27 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.core.admin.ui.DisplayNameBean; import org.jboss.portal.core.admin.ui.InstanceManagerBean; -import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.HasDisplayName; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.SortedMap; - /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> * @version $Revision: 630 $ */ -public class PortalInstanceDisplayNameAction +public class PortalInstanceDisplayNameAction extends DisplayNameAction { - private Instance selectedInstance; - - public Object bean; - - private String newLocale; - - private String newText; - - private SortedMap locales; - - private String displayNameByLocale; - - private InstanceManagerBean instanceManager; - - private DisplayNameBean displayNameBean; - - public Object getBean() + protected HasDisplayName getTarget() { - return bean; - } + target = ((InstanceManagerBean)managerBean).getSelectedInstance(); - public void setBean(Object bean) - { - this.bean = bean; + return target; } - public void addDisplayName() throws ConversionException + protected void checkManagerBean(Object managerBean) { - if (newText != null) + if (!(managerBean instanceof InstanceManagerBean)) { - Instance instance = getSelectedInstance(); - Map map = getDisplayNameBean().createLocalizedStringMap(LocaleFormat.DEFAULT.getLocale(newLocale),instance.getDisplayName(),newText); - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - selectedInstance.setDisplayName(newLocalizedString); + throw new IllegalArgumentException("Illegal manager bean property for PortalInstanceDisplayNameAction. Expecting an InstanceManagerBean instance. Got " + managerBean); } - else - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "You must enter a name", "You must enter a name"); - FacesContext.getCurrentInstance().addMessage("status", message); - } } - - public Instance getSelectedInstance() - { - if (instanceManager instanceof InstanceManagerBean) - { - selectedInstance = instanceManager.getSelectedInstance(); - } - return selectedInstance; - } - - public void setSelectedInstance(Instance selectedInstance) - { - this.selectedInstance = selectedInstance; - } - - public String getNewText() - { - return newText; - } - - public void setNewText(String newText) - { - this.newText = newText; - } - - public SortedMap getLocales() - { - return getDisplayNameBean().getLocales(); - } - - public void setLocales(SortedMap locales) - { - this.locales = locales; - } - - public String getNewLocale() - { - return newLocale; - } - - public void setNewLocale(String newLocale) - { - this.newLocale = newLocale; - } - - public List<DisplayNameBean.Value> getCurrentLocales() - { - selectedInstance = getSelectedInstance(); - if (selectedInstance != null && selectedInstance.getDisplayName() != null) - { - List<DisplayNameBean.Value> currentLocales = getDisplayNameBean().populateCurrentLocales(selectedInstance.getDisplayName().getValues()); - - return currentLocales; - } - return null; - } - - public void editDisplayName() - { - String locale = getFacesParam("locale"); - String editAction = getFacesParam("editAction"); - - Instance selectedInstance = getSelectedInstance(); - LocalizedString displayName = selectedInstance.getDisplayName(); - Map<Locale, String> map = new HashMap<Locale, String>(); - if (displayName != null) - { - Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); - Collection<LocalizedString.Value> values = oldMap.values(); - if (editAction.equals("delete")) - { - for (LocalizedString.Value value : values) - { - if (!value.getLocale().toString().equals(locale.toString())) - { - map.put(value.getLocale(), value.getString()); - } - } - } - if (editAction.equals("rename")) - { - for (LocalizedString.Value value : values) - { - map.put(value.getLocale(), value.getString()); - if (value.getLocale().toString().equals(locale.toString())) - { - newText = value.getString(); - newLocale = value.getLocale().getLanguage(); - } - } - } - } - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - selectedInstance.setDisplayName(newLocalizedString); - } - - - public String getFacesParam(String param) - { - return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); - } - - - public String editDisplayNames() throws ConversionException - { - getSelectedInstance(); - getCurrentLocales(); - return "editDisplayNames"; - } - - public InstanceManagerBean getInstanceManager() - { - return instanceManager; - } - - public void setInstanceManager(InstanceManagerBean instanceManager) - { - this.instanceManager = instanceManager; - } - - public DisplayNameBean getDisplayNameBean() - { - if(displayNameBean == null){ - displayNameBean = new DisplayNameBean(); - } - return displayNameBean; - } - - public void setDisplayNameBean(DisplayNameBean displayNameBean) - { - this.displayNameBean = displayNameBean; - } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -22,188 +22,28 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.core.admin.ui.DisplayNameBean; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; -import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.HasDisplayName; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.SortedMap; - /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> * @version $Revision$ */ -public class PortalObjectDisplayNameAction { - - private PortalObject selectedObject; - - public Object bean; - - private String newLocale; - - private String newText; - - private SortedMap locales; - - private String displayNameByLocale; - - private DisplayNameBean displayNameBean; - - public Object getBean() +public class PortalObjectDisplayNameAction extends DisplayNameAction +{ + protected HasDisplayName getTarget() { - return bean; + target = ((PortalObjectManagerBean)managerBean).getSelectedObject(); + return target; } - public void setBean(Object bean) + protected void checkManagerBean(Object managerBean) { - this.bean = bean; - } - - public void addDisplayName() throws ConversionException - { - if (newText != null) + if (!(managerBean instanceof PortalObjectManagerBean)) { - PortalObject portalObject = getSelectedObject(); - Map map = getDisplayNameBean().createLocalizedStringMap(LocaleFormat.DEFAULT.getLocale(newLocale),portalObject.getDisplayName(),newText); - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - portalObject.setDisplayName(newLocalizedString); + throw new IllegalArgumentException("Illegal manager bean property for PortalObjectDisplayNameAction. Expecting a PortalObjectManagerBean instance. Got " + managerBean); } - else - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "You must enter a name", "You must enter a name"); - FacesContext.getCurrentInstance().addMessage("status", message); - } } - - - public PortalObject getSelectedObject() - { - if (bean instanceof PortalObjectManagerBean) - { - selectedObject = ((PortalObjectManagerBean) bean).getSelectedObject(); - } - return selectedObject; - } - - public void setSelectedObject(PortalObject selectedObject) - { - this.selectedObject = selectedObject; - } - - public String getNewText() - { - return newText; - } - - public void setNewText(String newText) - { - this.newText = newText; - } - - public String getNewLocale() - { - return newLocale; - } - - public void setNewLocale(String newLocale) - { - this.newLocale = newLocale; - } - - public SortedMap getLocales() - { - return getDisplayNameBean().getLocales(); - } - - public void setLocales(SortedMap locales) - { - this.locales = locales; - } - - public List<DisplayNameBean.Value> getCurrentLocales() - { - selectedObject = getSelectedObject(); - if (selectedObject != null && selectedObject.getDisplayName() != null) - { - List<DisplayNameBean.Value> currentLocales = getDisplayNameBean().populateCurrentLocales(selectedObject.getDisplayName().getValues()); - return currentLocales; - } - return null; - } - - public void editDisplayName() - { - String locale = getFacesParam("locale"); - String editAction = getFacesParam("editAction"); - - PortalObject portalObject = getSelectedObject(); - LocalizedString displayName = portalObject.getDisplayName(); - Map<Locale, String> map = new HashMap<Locale, String>(); - if (displayName != null) - { - Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); - Collection<LocalizedString.Value> values = oldMap.values(); - if (editAction.equals("delete")) - { - for (LocalizedString.Value value : values) - { - if (!value.getLocale().toString().equals(locale.toString())) - { - map.put(value.getLocale(), value.getString()); - } - } - } - if (editAction.equals("rename")) - { - for (LocalizedString.Value value : values) - { - map.put(value.getLocale(), value.getString()); - if (value.getLocale().toString().equals(locale.toString())) - { - newText = value.getString(); - newLocale = value.getLocale().getLanguage(); - } - } - } - } - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - selectedObject.setDisplayName(newLocalizedString); - } - - public String getFacesParam(String param){ - return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); - } - - - public String editDisplayNames() throws ConversionException - { - getSelectedObject(); - getCurrentLocales(); - return "editDisplayNames"; - } - - public DisplayNameBean getDisplayNameBean() - { - if(displayNameBean == null){ - displayNameBean = new DisplayNameBean(); - } - return displayNameBean; - } - - public void setDisplayNameBean(DisplayNameBean displayNameBean) - { - this.displayNameBean = displayNameBean; - } - } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,22 +20,19 @@ * 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.admin.ui.actions; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.impl.model.portal.PortalObjectImpl; +import org.jboss.portal.faces.gui.ManagedBean; +import org.jboss.portal.common.util.ParameterValidation; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.ValidatorException; -import java.util.Map; - /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PropertyAction +public class PropertyAction extends ManagedBean { /** . */ @@ -49,9 +46,8 @@ /** . */ private String otherPropertyName; + protected static final String PROPERTY_TYPE = "PROPERTY_TYPE"; - /** . */ - private static final String ERROR_EMPTY_NAME = "Property name cannot be blank!"; public PropertyAction(PortalObjectManagerBean pomgr) { @@ -78,47 +74,41 @@ this.propertyValue = propertyValue; } - - public void validatePropertyName(FacesContext context, UIComponent toValidate, Object value) - { - String propertyName = (String)value; - - // check for empty string - if (propertyName == null || propertyName.startsWith(" ") || propertyName.equals("")) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, PropertyAction.ERROR_EMPTY_NAME, PropertyAction.ERROR_EMPTY_NAME); - throw new ValidatorException(message); - } - } - public void selectProperty() { } public void removeProperty() { - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - String name = (String)pmap.get("name"); + String name = beanContext.getParameter("name"); ((PortalObjectImpl)pomgr.getSelectedObject()).setDeclaredProperty(name, null); } public void updateProperty() { - String propertyName = otherPropertyName.trim(); - String value = ""; - // - if (propertyName.length() == 0 && selectedProperty != null) - { - propertyName = selectedProperty.trim(); + String propertyName = ""; + + //This particular property can be null and still be valid + if(!ParameterValidation.isNullOrEmpty(otherPropertyName)){ + propertyName = checkNameValidity(otherPropertyName, "common-edit-prop-form:property"); } - // - if (propertyName.length() > 0) + if (propertyName != null) { - if (getPropertyValue() != null){ - value = getPropertyValue().trim(); + if (propertyName.length() == 0 && selectedProperty != null) + { + propertyName = selectedProperty.trim(); } - pomgr.getSelectedObject().setDeclaredProperty(propertyName, value); + + if (propertyName.length() > 0) + { + String value = ""; + if (getPropertyValue() != null) + { + value = getPropertyValue().trim(); + } + pomgr.getSelectedObject().setDeclaredProperty(propertyName, value); + } } } @@ -131,4 +121,14 @@ { this.otherPropertyName = otherPropertyName; } + + protected String getObjectTypeName() + { + return PROPERTY_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return pomgr.getSelectedObject().getDeclaredProperty(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,35 +20,34 @@ * 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.admin.ui.actions; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.admin.ui.dashboard.DashboardBean; -import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; -import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; -import org.jboss.portal.core.model.portal.PageContainer; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import java.util.Set; /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ */ -public class RenameAction +public class RenameAction extends ManagedBean { private String newName; - /** The page container that will create the child. */ - public PortalObject pageContainer; + /** The portal object we're trying to rename. */ + public PortalObject renamedObject; private DomainConfigurator domainConfigurator; private Object bean; + private static final String MESSAGE_TARGET = "renameForm:newName"; + protected static final String PORTAL_OBJECT_TYPE = "PORTAL_OBJECT_TYPE"; public void setNewName(String newName) { @@ -59,7 +58,7 @@ { if (newName == null) { - newName = pageContainer.getName(); + newName = renamedObject.getName(); } return newName; } @@ -75,66 +74,68 @@ this.domainConfigurator = domainConfigurator; } - public PortalObject getPageContainer() + public PortalObject getRenamedObject() { - return pageContainer; + return renamedObject; } - public void setPageContainer(PortalObject pageContainer) + public void setRenamedObject(PortalObject renamedObject) { - this.pageContainer = pageContainer; + this.renamedObject = renamedObject; } public String execute() { - PortalObject parent = pageContainer.getParent(); - PortalObject newObject = null; - try + // if the new name is equal to the current name, do nothing + String currentName = renamedObject.getName(); + if (!isOldAndNewDifferent(currentName, newName)) { - // TODO: Should be in a tx + return null; + } - // Clone portal object - newObject = pageContainer.copy(parent, newName, true); + newName = checkNameValidity(newName, MESSAGE_TARGET); + if (newName != null) + { + PortalObject parent = renamedObject.getParent(); + PortalObject newObject = null; + try + { + // TODO: Should be in a tx - // Copy security settings - Set set = domainConfigurator.getSecurityBindings(pageContainer.getId().toString(PortalObjectPath.CANONICAL_FORMAT)); - domainConfigurator.setSecurityBindings(newObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT), set); + // Clone portal object + newObject = renamedObject.copy(parent, newName, true); - String defaultObject = (String)parent.getDeclaredProperties().get(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); - if (pageContainer.getName().equals(defaultObject)) + // Copy security settings + Set set = domainConfigurator.getSecurityBindings(renamedObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT)); + domainConfigurator.setSecurityBindings(newObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT), set); + + String defaultObject = parent.getDeclaredProperties().get(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); + if (currentName.equals(defaultObject)) + { + parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName); + } + + // Destroy previous object + parent.destroyChild(currentName); + } + catch (Exception e) { - parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName); + log.error("An error occurred while attempting to rename " + renamedObject + "to " + newName); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); } - // Destroy previous object - parent.destroyChild(pageContainer.getName()); + // TODO: This is not clean + if (bean instanceof PortalObjectManagerBean) + { + ((PortalObjectManagerBean)bean).selectObject(parent); + return "objects"; + } + else if (bean instanceof DashboardBean) + { + ((DashboardBean)bean).selectedPageName = newObject.getName(); + } } - catch (IllegalArgumentException e) - { - e.printStackTrace(); - } - catch (DuplicatePortalObjectException e) - { - String message = "The name \"" + newName + "\" is already used, please choose a different one"; - FacesContext.getCurrentInstance().addMessage("renameForm:newName", new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message)); - return null; - } - catch (NoSuchPortalObjectException e) - { - e.printStackTrace(); - } - // TODO: This is not clean - if (bean instanceof PortalObjectManagerBean) - { - ((PortalObjectManagerBean)bean).selectObject(parent); - return "objects"; - } - else if (bean instanceof DashboardBean) - { - ((DashboardBean)bean).selectedPageName = newObject.getName(); - } - return null; } @@ -148,5 +149,13 @@ this.bean = bean; } + protected String getObjectTypeName() + { + return PORTAL_OBJECT_TYPE; + } + public boolean isAlreadyExisting(String objectName) + { + return renamedObject.getParent().getChild(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -39,18 +39,18 @@ import org.jboss.portal.faces.component.portlet.PortletRenderEvent; import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.faces.el.dynamic.DynamicBean; +import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse.Event; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; -import javax.faces.application.FacesMessage; +import javax.faces.component.UIInput; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; -import javax.faces.component.UIInput; import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collection; @@ -68,7 +68,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PageManagerBean +public class PageManagerBean extends ManagedBean { private static final QName CONTENT_SELECT = new QName("urn:jboss:portal:content", "select"); @@ -84,7 +84,6 @@ /** . */ private static final int ADD_ACTION = 'a'; - private static final String VIEW_ROOT = ":_viewRoot"; public PageManagerBean(LayoutService layoutService, PortletInvoker portletInvoker) { @@ -113,7 +112,7 @@ public String selectedContentURI; /** . */ - private Map<String,String> selectedContentParameters; + private Map<String, String> selectedContentParameters; /** . */ public Map selectedRenderParameters; @@ -136,7 +135,7 @@ } public List getContentTypeItems() - { + { LinkedList<SelectItem> types = new LinkedList<SelectItem>(); for (Object o : ContentProviderRegistryService.getInstance().getContentTypes()) { @@ -158,7 +157,7 @@ public ContentType getSelectedContentType() { - return selectedContentType; + return selectedContentType; } public void setSelectedContentType(ContentType selectedContentType) @@ -275,7 +274,7 @@ { // String selectedContentURI = this.selectedContentURI; - Map<String,String> selectedContentParams = this.selectedContentParameters; + Map<String, String> selectedContentParams = this.selectedContentParameters; // Reset to new state this.selectedContentURI = null; @@ -283,23 +282,23 @@ this.selectedRenderParameters = new HashMap(); // Obtain a window name - String windowName = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("blah"); - if (windowName.trim().length() == 0) + String windowName = (String)normalizeStringIfNeeded(beanContext.getParameter("blah")); + if (windowName == null) { + // no specified name in the UI, generate one windowName = createWindowName(selectedContentType.toString(), selectedContentURI, false); while (page.getWindow(windowName) != null) { windowName = createWindowName(selectedContentType.toString(), selectedContentURI, true); } } - - // Check for duplicate window name - if (page.getWindow(windowName) != null) + else { - FacesContext faces = FacesContext.getCurrentInstance(); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); - faces.addMessage("windowName", message); - throw new AbortProcessingException(); + windowName = checkNameValidity(windowName, "windowForm:windowName"); + if (windowName == null) + { + throw new AbortProcessingException("Duplicate window name!"); + } } // @@ -311,7 +310,7 @@ { for (Object o : selectedContentParams.entrySet()) { - Map.Entry<String,String> entry = (Map.Entry<String,String>)o; + Map.Entry<String, String> entry = (Map.Entry<String, String>)o; String paramName = entry.getKey(); String paramValue = entry.getValue(); content.setParameter(paramName, paramValue); @@ -344,10 +343,7 @@ } else { - FacesContext faces = FacesContext.getCurrentInstance(); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No content was selected!", null); - faces.addMessage("layoutForm", message); -// throw new AbortProcessingException(); + beanContext.createTargetedErrorMessage("layoutForm", "COMMON_NO_SELECTED_CONTENT"); } } else if (direction == MOVE_LEFT) @@ -403,12 +399,12 @@ Event portletEvent = eventEvent.getEvent(); QName name = portletEvent.getName(); // only react to content selection events - if(CONTENT_SELECT.equals(name)) + if (CONTENT_SELECT.equals(name)) { if (portletEvent.getPayload() instanceof String) { String uri = (String)portletEvent.getPayload(); - this.selectedContentURI = uri; + this.selectedContentURI = uri; this.selectedContentParameters = null; } else if (portletEvent.getPayload() instanceof SelectedContent) @@ -556,4 +552,14 @@ return true; } } + + protected String getObjectTypeName() + { + return "WINDOW_TYPE"; + } + + public boolean isAlreadyExisting(String objectName) + { + return page.getWindow(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,24 +1,25 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2008, 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. -*/ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ package org.jboss.portal.core.admin.ui.coordination; @@ -128,27 +129,29 @@ return result; } - public String create() + protected void internalRename(String oldName, String newName) throws IllegalCoordinationException { + managerBean.getCoordinationService().renameAliasBinding(managerBean.getSelectedPage(), oldName, newName); + } + + protected void internalCreate() throws IllegalCoordinationException + { if (aliasName != null) { - try + HashSet<QName> qNames = new HashSet<QName>(); + for (String qName : originalQNames) { - HashSet<QName> qNames = new HashSet<QName>(); - for (String qName : originalQNames) - { - qNames.add(QName.valueOf(qName)); - } - managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames); + qNames.add(QName.valueOf(qName)); } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } + managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames); } - return resetSelection(); } + protected String getBeanName() + { + return aliasName; + } + public String resetSelection() { aliasName = null; @@ -163,12 +166,6 @@ return resetSelection(); } - public String rename(String oldName, String newName) throws IllegalCoordinationException - { - managerBean.getCoordinationService().renameAliasBinding(managerBean.getSelectedPage(), oldName, newName); - return resetSelection(); - } - public void extractInfoFrom(Window window, PortletInfo info) { // retrieve metadata on public render parameters @@ -216,4 +213,21 @@ return getName().compareTo(other.getName()); } } + + @Override + public String getObjectTypeName() + { + return "COORDINATION_ALIAS"; + } + + @Override + public String getObjectNameForMessages() + { + return "alias"; + } + + public boolean isAlreadyExisting(String objectName) + { + return displayAliasBindings.containsKey(objectName); + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,24 +1,25 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2008, 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. -*/ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ package org.jboss.portal.core.admin.ui.coordination; @@ -65,6 +66,7 @@ private CoordinationType selectedType; private String newName; static final String EDIT_COORDINATION = "editCoordination"; + private static final String RENAME_COORDINATION = "renameCoordination"; private enum CoordinationType { @@ -135,12 +137,62 @@ public abstract String delete(String name) throws IllegalCoordinationException; - public abstract String rename(String oldName, String newName) throws IllegalCoordinationException; + public String rename(String oldName, String newName) + { + if (isOldAndNewDifferent(oldName, newName)) + { + if (checkNameValidity(newName, "renameForm:newName") != null) + { + try + { + internalRename(oldName, newName); + } + catch (IllegalCoordinationException e) + { + beanContext.createErrorMessageFrom(e); + } + } + else + { + // redisplay page with error message + return RENAME_COORDINATION; + } + } + return resetSelection(); + } + + protected abstract void internalRename(String oldName, String newName) throws IllegalCoordinationException; + public abstract void extractInfoFrom(Window window, PortletInfo info); - public abstract String create() throws IllegalCoordinationException; + public String create() + { + String nameForMessages = getObjectNameForMessages(); + String target = "create-" + nameForMessages + "-form:" + getAdditionalFormId() + nameForMessages + "Name"; + if (checkNameValidity(getBeanName(), target) != null) + { + try + { + internalCreate(); + } + catch (IllegalCoordinationException e) + { + beanContext.createErrorMessageFrom(e); + } + } + else + { + // do not reset the selection if the name is incorrect, let user modify it first... + // also gives the opportunity to display error messages + return null; + } + return resetSelection(); + } + + protected abstract void internalCreate() throws IllegalCoordinationException; + public String resetSelection() { managerBean.refresh(); @@ -153,6 +205,34 @@ } public abstract void initKnowing(Collection<PortalObject> children); + + /** + * Made public to get access to it in CoordinationManagerBean.getObjectTypeName() + * + * @return + */ + public abstract String getObjectTypeName(); + + /** + * Returns the object name used in identifiers for target of messages. Creation forms have id similar to: + * <code>created-getObjectNameForMessages()-form</code> while, input fields for these forms are named: + * <code>getObjectNameForMessages()Name</code>. + * + * @return + */ + protected abstract String getObjectNameForMessages(); + + protected abstract String getBeanName(); + + /** + * Additional form information for create form if needed. + * + * @return + */ + protected String getAdditionalFormId() + { + return ""; + } } public Page getSelectedPage() @@ -383,7 +463,7 @@ } catch (IllegalCoordinationException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + beanContext.createErrorMessageFrom(e); } } @@ -413,8 +493,19 @@ { if (selectedType != null) { - selectedType.getBean().rename(selectedName, newName); - refresh(); + CoordinationBean coordinationBean = selectedType.getBean(); + + // call rename on sub-bean and check that we're not requesting renaming again (in case an error occurred) + if (RENAME_COORDINATION.equals(coordinationBean.rename(selectedName, newName))) + { + // error occurred: redisplay rename dialog + return RENAME_COORDINATION; + } + else + { + // all went well: refresh! + refresh(); + } } // reset selection @@ -423,4 +514,14 @@ newName = null; return EDIT_COORDINATION; } + + protected String getObjectTypeName() + { + return selectedType.getBean().getObjectTypeName(); + } + + public boolean isAlreadyExisting(String objectName) + { + return selectedType.getBean().isAlreadyExisting(objectName); + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,24 +1,25 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2008, 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. -*/ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ package org.jboss.portal.core.admin.ui.coordination; @@ -290,22 +291,24 @@ } } - public String create() + protected void internalRename(String oldName, String newName) throws IllegalCoordinationException { + managerBean.getCoordinationService().renameEventWiring(managerBean.getSelectedPage(), oldName, newName); + } + + protected void internalCreate() throws IllegalCoordinationException + { if (currentWiring != null) { - try - { - managerBean.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName()); - } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } + managerBean.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName()); } - return resetSelection(); } + protected String getBeanName() + { + return currentWiring != null ? currentWiring.getName() : null; + } + public String resetSelection() { currentWiring = null; @@ -323,12 +326,6 @@ return resetSelection(); } - public String rename(String oldName, String newName) throws IllegalCoordinationException - { - managerBean.getCoordinationService().renameEventWiring(managerBean.getSelectedPage(), oldName, newName); - return resetSelection(); - } - public void extractInfoFrom(Window window, PortletInfo info) { // retrieve metadata on events @@ -478,4 +475,26 @@ this.destinations = destinations; } } + + public String getObjectTypeName() + { + return "COORDINATION_WIRING"; + } + + @Override + public String getObjectNameForMessages() + { + return "wiring"; + } + + @Override + protected String getAdditionalFormId() + { + return "COORDINATION_EVENT_CREATE_STEP5:"; + } + + public boolean isAlreadyExisting(String objectName) + { + return displayEventWirings.containsKey(objectName); + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,24 +1,25 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2008, 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. -*/ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ package org.jboss.portal.core.admin.ui.coordination; @@ -69,11 +70,11 @@ public List<? extends SelectItem> getAvailableParameterWindowPairs() { - if(availableParameterWindowPairs == null || availableParameterWindowPairs.isEmpty()) + if (availableParameterWindowPairs == null || availableParameterWindowPairs.isEmpty()) { return Collections.emptyList(); } - + List<WindowSelectItemGroup> result = new LinkedList<WindowSelectItemGroup>(availableParameterWindowPairs.values()); Collections.sort(result); return result; @@ -161,8 +162,13 @@ } } - public String create() throws IllegalCoordinationException + protected void internalRename(String oldName, String newName) throws IllegalCoordinationException { + managerBean.getCoordinationService().renameParameterBinding(managerBean.getSelectedPage(), oldName, newName); + } + + protected void internalCreate() throws IllegalCoordinationException + { if (windowBindingName != null) { Map<Window, Set<QName>> windowBinding = new HashMap<Window, Set<QName>>(); @@ -177,8 +183,11 @@ managerBean.getCoordinationService().setParameterBinding(windowBindingName, windowBinding); } + } - return resetSelection(); + protected String getBeanName() + { + return windowBindingName; } public String resetSelection() @@ -195,12 +204,6 @@ return resetSelection(); } - public String rename(String name, String newName) throws IllegalCoordinationException - { - managerBean.getCoordinationService().renameParameterBinding(managerBean.getSelectedPage(), name, newName); - return resetSelection(); - } - /** * Enforce the fact that you can only select one qname per window * @@ -367,5 +370,22 @@ return o1.getLabel().compareTo(o2.getLabel()); } } + private final static Comparator<SelectItem> COMP = new ParameterWindowSelectItemComparator(); + + public String getObjectTypeName() + { + return "COORDINATION_PARAMETER"; + } + + @Override + public String getObjectNameForMessages() + { + return "binding"; + } + + public boolean isAlreadyExisting(String objectName) + { + return displayParameterBindings.containsKey(objectName); + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -35,6 +35,7 @@ import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.faces.gui.JSFBeanContext; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeService; @@ -117,7 +118,9 @@ // Create page manager if it does not exit if (pageManager == null) { + // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext pageManager = new PageManagerBean(layoutService, new PortletDefinitionInvoker(instanceContainer)); + pageManager.setBeanContext(new JSFBeanContext()); } // Get user name @@ -149,7 +152,7 @@ defaultPageName = PortalObject.DEFAULT_OBJECT_NAME; } selectePageIsDefault = selectedPageName.equals(defaultPageName); - + // Collection pages = userPortal.getChildren(PortalObject.PAGE_MASK); pageItems = new SelectItem[pages.size()]; @@ -201,7 +204,7 @@ try { userPortal.destroyChild(selectedPageName); - + // Fallback to default page String defaultPageName = pageManager.page.getProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); if (defaultPageName == null) Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ ################################################################################ # JBoss, a division of Red Hat # -# Copyright 2006, Red Hat Middleware, LLC, and individual # +# Copyright 2009, Red Hat Middleware, LLC, and individual # # contributors as indicated by the @authors tag. See the # # copyright.txt in the distribution for a full listing of # # individual contributors. # @@ -104,6 +104,7 @@ COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) COMMON_WINDOW_NAME=Window Name COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page +COMMON_NO_SELECTED_CONTENT=You must select a content type! COMMON_CONTENT_TYPE=Content Type COMMON_SELECT_CONTENT=Select content that will be added to the page COMMON_PAGE_LAYOUT=Page Layout @@ -224,7 +225,7 @@ THEME_THEME_ID_NAME=Theme id THEME_THEME_ID_DESCRIPTION=The theme value skins a page THEME_RENDER_SET_ID_NAME=Renderset id -THEME_RENDER_SET_ID_DESCRIPTION=The render set id +THEME_RENDER_SET_ID_DESCRIPTION=The render set id THEME_RENDER_REGION_ID_NAME=Region id THEME_RENDER_REGION_ID_DESCRIPTION=The region that will the window THEME_RENDER_REGION_ORDER_NAME=Region order @@ -320,8 +321,20 @@ COORDINATION_EVENT_CREATE_PREVIEW_STEP3=The produced window events will be wired to the following destination event: COORDINATION_EVENT_CREATE_PREVIEW_STEP4=for the following destination windows: - - COORDINATION_WIRING=event wiring COORDINATION_PARAMETER=parameter binding COORDINATION_ALIAS=alias binding + +INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c' +NO_SELECTED_PORTLET_ERROR=No portlet was selected! +DUPLICATE_ERROR=A {1} named ''{0}'' already exists! +bean_support_unexpected_error=Unexpected error: +bean_support_cause=Cause: + +INSTANCE_TYPE=instance +PAGE_TYPE=page +PORTAL_TYPE=portal +DISPLAY_NAME_TYPE=display name +PROPERTY_TYPE=property +PORTAL_OBJECT_TYPE=portal object +WINDOW_TYPE=window Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -325,7 +325,7 @@ COORDINATION_PARAMETER=collegamento al parametro COORDINATION_ALIAS=collegamento all'alias -INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non pu\u00f2 essere null, vuoto o contenere '\\' o '%5c' +INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non pu\u00f2 essere null, vuoto o contenere '\\', '<', '>', '(', ')', '=' o '%5c' NO_SELECTED_PORTLET_ERROR=Non \u00e8 stata selezionata nessuna portlet! DUPLICATE_ERROR=Esiste gi\u00e0 un {1} chiamato ''{0}''! bean_support_unexpected_error=Errore inatteso: Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -21,139 +21,139 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -PORTLET_INSTANCES=Inst\u00E2ncias de Portlets -INSTANCE_DELETE=excluir inst\u00E2ncia -PORTLET_CAUSING_REFERENCING_NOT_ABLE=Janelas que referenciam essa inst\u00E2ncia de portlet n\u00E3o ser\u00E3o capazes de exibir o seu conte\u00FAdo -ARE_YOU_SURE_DELETE=Tem certeza de que deseja excluir esta inst\u00E2ncia de portlet? +PORTLET_INSTANCES=Inst\u00e2ncias de Portlets +INSTANCE_DELETE=excluir inst\u00e2ncia +PORTLET_CAUSING_REFERENCING_NOT_ABLE=Janelas que referenciam essa inst\u00e2ncia de portlet n\u00e3o ser\u00e3o capazes de exibir o seu conte\u00fado +ARE_YOU_SURE_DELETE=Tem certeza de que deseja excluir esta inst\u00e2ncia de portlet? DASHBOARD_THEME_PROPERTIES=Propriedades do Tema do Meu Portal -CONFIGURE_DASHBOARD_SETTINGS=Configurar defini\u00E7\u00F5es do Meu Portal +CONFIGURE_DASHBOARD_SETTINGS=Configurar defini\u00e7\u00f5es do Meu Portal DASHBOARDS=Meu Portal -ADD_DISPLAY_NAMES=Adicionar Nomes de Exibi\u00E7\u00E3o -CURRENT_DISPLAY_NAMES=Nomes de Exibi\u00E7\u00E3o Atuais +ADD_DISPLAY_NAMES=Adicionar Nomes de Exibi\u00e7\u00e3o +CURRENT_DISPLAY_NAMES=Nomes de Exibi\u00e7\u00e3o Atuais SAVE=Gravar MANAGE=Gerenciar PORTALS_NO_CAP=portais PORTAL=portal SUB_PORTALS=sub-portais -PAGES_WITHIN=p\u00E1ginas com +PAGES_WITHIN=p\u00e1ginas com CREATE_PORTAL_NAMED=Criar portal denominado -PAGE_LAYOUT=Layout de p\u00E1gina -SECURITY=Seguran\u00E7a +PAGE_LAYOUT=Layout de p\u00e1gina +SECURITY=Seguran\u00e7a THEME=Tema RENAME=Renomear -DISPLAY_NAMES=Nomes de Exibi\u00E7\u00E3o -MANAGE_SUB_PAGES_WITHIN=Gerenciar sub-p\u00E1ginas dentro -CREATE_PAGE_NAMED=Criar p\u00E1gina denominada -SET_PAGE_PERMISSIONS=Por favor, defina as permiss\u00F5es da p\u00E1gina -PAGE_THEME_PROPERTIES=Propriedades do tema da p\u00E1gina -SET_PORTAL_PERMISSIONS=Por favor, defina as permiss\u00F5es do portal +DISPLAY_NAMES=Nomes de Exibi\u00e7\u00e3o +MANAGE_SUB_PAGES_WITHIN=Gerenciar sub-p\u00e1ginas dentro +CREATE_PAGE_NAMED=Criar p\u00e1gina denominada +SET_PAGE_PERMISSIONS=Por favor, defina as permiss\u00f5es da p\u00e1gina +PAGE_THEME_PROPERTIES=Propriedades do tema da p\u00e1gina +SET_PORTAL_PERMISSIONS=Por favor, defina as permiss\u00f5es do portal PORTAL_THEME_PROPERTIES=Propriedades do tema do portal -SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Essas configura\u00E7\u00F5es s\u00E3o herdadas por todas as p\u00E1ginas e janelas deste portal. Voc\u00EA pode sobrescrev\u00EA-las, selecionando o valor adequado na respectiva p\u00E1gina de defini\u00E7\u00E3o de Temas +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Essas configura\u00e7\u00f5es s\u00e3o herdadas por todas as p\u00e1ginas e janelas deste portal. Voc\u00ea pode sobrescrev\u00ea-las, selecionando o valor adequado na respectiva p\u00e1gina de defini\u00e7\u00e3o de Temas EVENT_LISTENER_BINDING=Event Listener Binding CHOOSE_ID_PORTALEVENTLISTENER=Escolha o id do PortalEventListener para vincular a este -SET_PERMISSIONS_FOR=Por favor, defina as permiss\u00F5es para o +SET_PERMISSIONS_FOR=Por favor, defina as permiss\u00f5es para o WINDOW_NO_CAP=janela WINDOW_THEME_PROPERTIES=Propriedades do tema da janela -INSTANCE_ID=Id da inst\u00E3ncia -INSTANCE_NAME=Nome da inst\u00E2ncia -ACTIONS=A\u00E7\u00F5es -PREFERENCES=Prefer\u00EAncias +INSTANCE_ID=Id da inst\u00e3ncia +INSTANCE_NAME=Nome da inst\u00e2ncia +ACTIONS=A\u00e7\u00f5es +PREFERENCES=Prefer\u00eancias PORTLET_DETAILS=detalhes do portlet -ASSOCIATED_PORTLET_NOT_AVAILABLE=O portlet associado n\u00E3o est\u00E1 dispon\u00EDvel -PREFERENCES_NO_CAP=prefer\u00EAncias -SECURITY_SETTINGS=configura\u00E7\u00F5es de seguran\u00E7a -MAKE_DEFAULT=Tornar padr\u00E3o +ASSOCIATED_PORTLET_NOT_AVAILABLE=O portlet associado n\u00e3o est\u00e1 dispon\u00edvel +PREFERENCES_NO_CAP=prefer\u00eancias +SECURITY_SETTINGS=configura\u00e7\u00f5es de seguran\u00e7a +MAKE_DEFAULT=Tornar padr\u00e3o MANAGE_WINDOWS_WITHIN=Gerenciar janelas com PORTAL_OBJECTS=Objetos do Portal PORTALS=Portais PORTLET_NAME=Nome do portlet -DESCRIPTION=Descri\u00E7\u00E3o +DESCRIPTION=Descri\u00e7\u00e3o REMOTE=Remoto -REMOTABLE=Utiliz\u00E1vel remotamente -CREATE_INSTANCE=Criar inst\u00E2ncia -PORTLET_DEFINITIONS=Defini\u00E7\u00F5es de Portlets +REMOTABLE=Utiliz\u00e1vel remotamente +CREATE_INSTANCE=Criar inst\u00e2ncia +PORTLET_DEFINITIONS=Defini\u00e7\u00f5es de Portlets DETAILS=detalhes -INSTANCE_CREATION=cria\u00E7\u00E3o de inst\u00E2ncia -CREATE_INSTANCE_NAMED=Criar uma inst\u00E2ncia denominada +INSTANCE_CREATION=cria\u00e7\u00e3o de inst\u00e2ncia +CREATE_INSTANCE_NAMED=Criar uma inst\u00e2ncia denominada RENAME_THE=Renomeie o TO=para -THIS_MINIMIZED_STATE=Esta janela est\u00E1 definida com um estado minimizado -THIS_NORMAL_STATE=Esta janela est\u00E1 definida com um estado normal -THIS_MAXIMIZED_STATE=Esta janela est\u00E1 definida com um estado maximizado -THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Esta janela est\u00E1 com o estado padr\u00E3o para minimizado porque uma janela dentro desta p\u00E1gina est\u00E1 definida para maximizada +THIS_MINIMIZED_STATE=Esta janela est\u00e1 definida com um estado minimizado +THIS_NORMAL_STATE=Esta janela est\u00e1 definida com um estado normal +THIS_MAXIMIZED_STATE=Esta janela est\u00e1 definida com um estado maximizado +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Esta janela est\u00e1 com o estado padr\u00e3o para minimizado porque uma janela dentro desta p\u00e1gina est\u00e1 definida para maximizada SWITCH_TO_WIZARD_MODE=Alternar para o modo de assistente CREATE_PORTAL=Criar portal -CREATE_PAGE=Criar p\u00E1gina -DEFAULT=Padr\u00E3o +CREATE_PAGE=Criar p\u00e1gina +DEFAULT=Padr\u00e3o WINDOW=Janela VIEW_PORTLETS_PROVIDED_BY=Visualizar portlets fornecidos pelo provedor de portlet denominado VIEW_PORTLETS=Visualizar portlets COMMON_INCONSISTENT_STATE=Estado inconsistente COMMON_DELETE=Excluir -COMMON_DELETING=ATEN\u00C7\u00C3O\! Voc\u00EA est\u00E1 prestes a excluir o +COMMON_DELETING=ATEN\u00c7\u00c3O\! Voc\u00ea est\u00e1 prestes a excluir o COMMON_FROM=a partir do COMMON_SURE_DELETE=Tem certeza de que deseja excluir esta -COMMON_ERROR_HANDLING=P\u00E1gina de Gerenciamento de Erro -COMMON_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00EDvel de p\u00E1gina +COMMON_ERROR_HANDLING=P\u00e1gina de Gerenciamento de Erro +COMMON_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00edvel de p\u00e1gina COMMON_CASE=Caso -COMMON_INHERITANCE=Heran\u00E7a -COMMON_ACTION=A\u00E7\u00E3o -COMMON_INHERIT_ACTION=herdar a\u00E7\u00E3o dos pais -COMMON_CONTENT_DEFINITION=Defini\u00E7\u00E3o de Conte\u00FAdo -COMMON_DEFINE_NAME_WINDOW=Defina um nome para a janela de conte\u00FAdo (opcional) +COMMON_INHERITANCE=Heran\u00e7a +COMMON_ACTION=A\u00e7\u00e3o +COMMON_INHERIT_ACTION=herdar a\u00e7\u00e3o dos pais +COMMON_CONTENT_DEFINITION=Defini\u00e7\u00e3o de Conte\u00fado +COMMON_DEFINE_NAME_WINDOW=Defina um nome para a janela de conte\u00fado (opcional) COMMON_WINDOW_NAME=Nome da Janela -COMMON_SELECT_TYPE_CONTENT=Selecione o tipo de conte\u00FAdo que ser\u00E1 adicionado \u00E0 p\u00E1gina -COMMON_NO_SELECTED_CONTENT=Voc\u00EA deve selecionar um tipo de conte\u00FAdo\! -COMMON_CONTENT_TYPE=Tipo de Conte\u00FAdo -COMMON_SELECT_CONTENT=Selecione o conte\u00FAdo que ser\u00E1 adicionado \u00E0 p\u00E1gina -COMMON_PAGE_LAYOUT=Layout da P\u00E1gina -COMMON_REGION=Regi\u00E3o -COMMON_UNASSIGNED_WINDOW=Janelas n\u00E3o assinadas +COMMON_SELECT_TYPE_CONTENT=Selecione o tipo de conte\u00fado que ser\u00e1 adicionado \u00e0 p\u00e1gina +COMMON_NO_SELECTED_CONTENT=Voc\u00ea deve selecionar um tipo de conte\u00fado\! +COMMON_CONTENT_TYPE=Tipo de Conte\u00fado +COMMON_SELECT_CONTENT=Selecione o conte\u00fado que ser\u00e1 adicionado \u00e0 p\u00e1gina +COMMON_PAGE_LAYOUT=Layout da P\u00e1gina +COMMON_REGION=Regi\u00e3o +COMMON_UNASSIGNED_WINDOW=Janelas n\u00e3o assinadas COMMON_PORTAL_ERROR_HANDLING=Gerenciamento de Erros do Portal -COMMON_PORTAL_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00EDvel do portal +COMMON_PORTAL_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com os erros em n\u00edvel do portal COMMON_KEY=Chave COMMON_NAME=Nome COMMON_READONLY=Apenas leitura COMMON_VALUE=Valor -COMMON_NO_DEFINED_PREFERENCES=Nenhuma prefer\u00EAncia definida para este portlet +COMMON_NO_DEFINED_PREFERENCES=Nenhuma prefer\u00eancia definida para este portlet COMMON_EDIT_EXISTING_VALUES=Editar valores existentes COMMON_APPEND_VALUE=Adicionar um valor COMMON_PROPERTIES=Propriedades COMMON_ADD_PROPERTY=Adicionar uma propriedade -COMMON_SELECT_PREDEFINED_PROPERTY=Selecione as propriedades pr\u00E9-definidas +COMMON_SELECT_PREDEFINED_PROPERTY=Selecione as propriedades pr\u00e9-definidas COMMON_OR=ou COMMON_ENTER_PROPERTY_NAME=Digite o nome da propriedade -COMMON_MANAGE_PROPERTIES=Ger\u00EAnciar propriedades atuais -COMMON_DESCRIPTION=Descri\u00E7\u00E3o +COMMON_MANAGE_PROPERTIES=Ger\u00eanciar propriedades atuais +COMMON_DESCRIPTION=Descri\u00e7\u00e3o COMMON_INHERITED=Herdado COMMON_YES=Sim -COMMON_NO=N\u00E3o +COMMON_NO=N\u00e3o COMMON_ROLES=Perfis -COMMON_PERMISSIONS=Permiss\u00F5es +COMMON_PERMISSIONS=Permiss\u00f5es COMMON_ROLE=Perfil -COMMON_SETTING=Configura\u00E7\u00E3o +COMMON_SETTING=Configura\u00e7\u00e3o COMMON_LAYOUT=Layout -COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome do layout utilizado para organizar as janelas de portlets nas p\u00E1ginas +COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome do layout utilizado para organizar as janelas de portlets nas p\u00e1ginas COMMON_THEME=Tema -COMMON_NAME_LOOK_AND_FEEL=Nome da apar\u00EAncia +COMMON_NAME_LOOK_AND_FEEL=Nome da apar\u00eancia COMMON_RENDERSET=RenderSet -COMMON_NAME_RENDER_ENGINE_PAGES=Nome do motor de renderiza\u00E7\u00E3o utilizado para renderizar as p\u00E1ginas +COMMON_NAME_RENDER_ENGINE_PAGES=Nome do motor de renderiza\u00e7\u00e3o utilizado para renderizar as p\u00e1ginas COMMON_WINDOW_RENDERER=Renderizador da Janela -COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome do motor de renderiza\u00E7\u00E3o utilizado para renderizar as janelas -COMMON_DECORATION_RENDERER=Renderiza\u00E7\u00E3o da Decora\u00E7\u00E3o -COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome do motor de renderiza\u00E7\u00E3o utilizado nas decora\u00E7\u00F5es da janela +COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome do motor de renderiza\u00e7\u00e3o utilizado para renderizar as janelas +COMMON_DECORATION_RENDERER=Renderiza\u00e7\u00e3o da Decora\u00e7\u00e3o +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome do motor de renderiza\u00e7\u00e3o utilizado nas decora\u00e7\u00f5es da janela COMMON_PORTLET_RENDERER=Renderizador do Portlet -COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome do layout utilizado para organizar janelas de portlets em p\u00E1ginas -COMMON_PORTLET_INSTANCE_INFORMATION=Informa\u00E7\u00E3o sobre a Inst\u00E2ncia do Portlet +COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome do layout utilizado para organizar janelas de portlets em p\u00e1ginas +COMMON_PORTLET_INSTANCE_INFORMATION=Informa\u00e7\u00e3o sobre a Inst\u00e2ncia do Portlet COMMON_PORTLET_NAME=Nome do portlet -COMMON_PORTLET_DESCRIPTION=Descri\u00E7\u00E3o do portlet -COMMON_PORTLET_TITLE=T\u00EDtulo do portlet +COMMON_PORTLET_DESCRIPTION=Descri\u00e7\u00e3o do portlet +COMMON_PORTLET_TITLE=T\u00edtulo do portlet COMMON_PORTLET_KEYWORDS=Palavras-chave do portlet COMMON_PORTLET_LOCALES=Idiomas do portlet -COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Nomes de exibi\u00E7\u00E3o da Inst\u00E2ncia do Portlet -COMMON_ADD_INSTANCE_DISPLAY_NAMES=Adicionar Nome de Exibi\u00E7\u00E3o para Inst\u00E2ncia -COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nome de Exibi\u00E7\u00E3o Atual para Inst\u00E2ncia +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Nomes de exibi\u00e7\u00e3o da Inst\u00e2ncia do Portlet +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Adicionar Nome de Exibi\u00e7\u00e3o para Inst\u00e2ncia +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nome de Exibi\u00e7\u00e3o Atual para Inst\u00e2ncia COMMON_CANCEL=Cancelar COMMON_UPDATE=Atualizar COMMON_ADD=Adicionar @@ -163,37 +163,37 @@ COMMON_NEW_VALUE=Novo valor COMMON_APPEND=Adicionar COMMON_LOCALE=Idioma -COMMON_DISPLAY_NAME=Nome de Exibi\u00E7\u00E3o -COMMON_MEDIA_TYPES=Tipos de M\u00EDdia +COMMON_DISPLAY_NAME=Nome de Exibi\u00e7\u00e3o +COMMON_MEDIA_TYPES=Tipos de M\u00eddia COMMON_WINDOW_STATES=Estados da Janela COMMON_PORTLET_MODES=Modos do Portlet -COMMON_PREFERENCES=Prefer\u00EAncias -COMMON_PUBLIC_RENDER_PARAMETERS=Par\u00E2metros de Renderiza\u00E7\u00E3o P\u00FAblicos +COMMON_PREFERENCES=Prefer\u00eancias +COMMON_PUBLIC_RENDER_PARAMETERS=Par\u00e2metros de Renderiza\u00e7\u00e3o P\u00fablicos COMMON_ID=Id -COMMON_TITLE=T\u00EDtulo +COMMON_TITLE=T\u00edtulo COMMON_KEYWORDS=Palavras-chave COMMON_LOCALES=Idiomas COMMON_TRANSPORT_GUARANTEES=Garantias de Transporte -COMMON_CACHE_EXPIRATION=Expira\u00E7\u00E3o do Cache +COMMON_CACHE_EXPIRATION=Expira\u00e7\u00e3o do Cache COMMON_SECONDS=segundos -COMMON_PUBLIC_NAVIGATION_PARAMETERS=Par\u00E2metros de Navega\u00E7\u00E3o P\u00FAblicos +COMMON_PUBLIC_NAVIGATION_PARAMETERS=Par\u00e2metros de Navega\u00e7\u00e3o P\u00fablicos COMMON_CONSUMED_EVENTS=Eventos Consumidos COMMON_PRODUCED_EVENTS=Eventos Produzidos DASHBOARD_PERSONAL_EDITOR=Editor do Meu Portal -DASHBOARD_CREATE_NEW_PAGE=Criar uma nova P\u00E1gina -DASHBOARD_CREATE_PAGE=Nome da p\u00E1gina -DASHBOARD_RENAME_THIS_PAGE=Renomear essa P\u00E1gina -DASHBOARD_NEW_PAGE_NAME=Novo nome de p\u00E1gina -DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Utilize esta p\u00E1gina para gerenciar o conte\u00FAdo e a apar\u00EAncia das p\u00E1ginas do Meu Portal -DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Voc\u00EA pode controlar os t\u00EDtulos das p\u00E1ginas, layouts da colunas, p\u00E1gina de temas, e acrescentar, ordenar ou remover portlets -DASHBOARD_CURRENTLY_EDITING_PAGE=Editando a P\u00E1gina +DASHBOARD_CREATE_NEW_PAGE=Criar uma nova P\u00e1gina +DASHBOARD_CREATE_PAGE=Nome da p\u00e1gina +DASHBOARD_RENAME_THIS_PAGE=Renomear essa P\u00e1gina +DASHBOARD_NEW_PAGE_NAME=Novo nome de p\u00e1gina +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Utilize esta p\u00e1gina para gerenciar o conte\u00fado e a apar\u00eancia das p\u00e1ginas do Meu Portal +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Voc\u00ea pode controlar os t\u00edtulos das p\u00e1ginas, layouts da colunas, p\u00e1gina de temas, e acrescentar, ordenar ou remover portlets +DASHBOARD_CURRENTLY_EDITING_PAGE=Editando a P\u00e1gina DASHBOARD_THEME_AND_LAYOUT=Layout e Tema -DASHBOARD_APPLY_THEME=Aplique um tema para o Meu Portal ou selecione o n\u00FAmero de colunas para o layout +DASHBOARD_APPLY_THEME=Aplique um tema para o Meu Portal ou selecione o n\u00famero de colunas para o layout DASHBOARD_CHOOSE_LAYOUT=Escolha um layout DASHBOARD_CHOOSE_THEME=Escolha um tema -DASHBOARD_CANNOT_UNDO_ACTION=Voc\u00EA n\u00E3o pode desfazer esta a\u00E7\u00E3o -DASHBOARD_DELETE_THIS_PAGE=Excluir essa P\u00E1gina +DASHBOARD_CANNOT_UNDO_ACTION=Voc\u00ea n\u00e3o pode desfazer esta a\u00e7\u00e3o +DASHBOARD_DELETE_THIS_PAGE=Excluir essa P\u00e1gina DASHBOARD_SAVE=Gravar DASHBOARD_SELECT=Selecionar @@ -201,86 +201,86 @@ WIZARD_STEP=Passo WIZARD_SELECT_PORTLET=Selecione o Portlet WIZARD_SELECT_PORTAL=Selecione o Portal -WIZARD_SELECT_PAGE=Selecione a P\u00E1gina -WIZARD_SELECT_REGION=Selecione a Regi\u00E3o +WIZARD_SELECT_PAGE=Selecione a P\u00e1gina +WIZARD_SELECT_REGION=Selecione a Regi\u00e3o WIZARD_CONFIRM=Confirmar -WIZARD_CONTENT=Conte\u00FAdo -WIZARD_SWITCH_ADVANCED_MODE=Alternar para o modo avan\u00E7ado +WIZARD_CONTENT=Conte\u00fado +WIZARD_SWITCH_ADVANCED_MODE=Alternar para o modo avan\u00e7ado WIZARD_PORTLET=Portlet WIZARD_PORTAL=Portal -WIZARD_PAGE=P\u00E1gina -WIZARD_REGION=Regi\u00E3o +WIZARD_PAGE=P\u00e1gina +WIZARD_REGION=Regi\u00e3o WIZARD_PREVIOUS=Anterior -WIZARD_NEXT=Pr\u00F3ximo -WIZARD_SUB_PAGES=Sub-P\u00E1ginas +WIZARD_NEXT=Pr\u00f3ximo +WIZARD_SUB_PAGES=Sub-P\u00e1ginas WIZARD_PORTLET_PROVIDER=Fornecedor de portlet WIZARD_CHANGE=Alterar -DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Exibir mensagem de erro padr\u00E3o +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Exibir mensagem de erro padr\u00e3o REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redirecionar para o recurso especificado -REMOVE_THE_RESOURCE_FROM_PAGE=Remover o recurso da p\u00E1gina +REMOVE_THE_RESOURCE_FROM_PAGE=Remover o recurso da p\u00e1gina THEME_LAYOUT_ID_NAME=Id do layout -THEME_LAYOUT_ID_DESCRIPTION=O valor do layout formata a p\u00E1gina +THEME_LAYOUT_ID_DESCRIPTION=O valor do layout formata a p\u00e1gina THEME_THEME_ID_NAME=Id do tema -THEME_THEME_ID_DESCRIPTION=O valor do tema define a apar\u00EAncia da p\u00E1gina +THEME_THEME_ID_DESCRIPTION=O valor do tema define a apar\u00eancia da p\u00e1gina THEME_RENDER_SET_ID_NAME=Id do renderset THEME_RENDER_SET_ID_DESCRIPTION=O id do renderset -THEME_RENDER_REGION_ID_NAME=Id da regi\u00E3o -THEME_RENDER_REGION_ID_DESCRIPTION=A regi\u00E3o que ser\u00E1 a janela -THEME_RENDER_REGION_ORDER_NAME=Ordem da regi\u00E3o -THEME_RENDER_REGION_ORDER_DESCRIPTION=A ordem vertical ou horizontal da janela dentro de uma regi\u00E3o -AJAX_PARTIAL_REFRESH_NAME=Atualiza\u00E7\u00E3o parcial -AJAX_PARTIAL_REFRESH_DESCRIPTION=Permitir atualiza\u00E7\u00E3o parcial de portlets +THEME_RENDER_REGION_ID_NAME=Id da regi\u00e3o +THEME_RENDER_REGION_ID_DESCRIPTION=A regi\u00e3o que ser\u00e1 a janela +THEME_RENDER_REGION_ORDER_NAME=Ordem da regi\u00e3o +THEME_RENDER_REGION_ORDER_DESCRIPTION=A ordem vertical ou horizontal da janela dentro de uma regi\u00e3o +AJAX_PARTIAL_REFRESH_NAME=Atualiza\u00e7\u00e3o parcial +AJAX_PARTIAL_REFRESH_DESCRIPTION=Permitir atualiza\u00e7\u00e3o parcial de portlets AJAX_DND_NAME=Arrastar e soltar AJAX_DND_DESCRIPTION=Ativar arrastar e soltar para janelas -WINDOW_CONTENT_TYPE_NAME=Tipo de conte\u00FAdo -WINDOW_CONTENT_TYPE_DESCRIPTION=O tipo de conte\u00FAdo de uma janela -DEFAULT_CHILD_NAME_NAME=Nome padr\u00E3o para o filho -DEFAULT_CHILD_NAME_DESCRIPTION=O nome filho \u00E9 utilizado quando nenhum nome espec\u00EDfico para o filho \u00E9 especificado +WINDOW_CONTENT_TYPE_NAME=Tipo de conte\u00fado +WINDOW_CONTENT_TYPE_DESCRIPTION=O tipo de conte\u00fado de uma janela +DEFAULT_CHILD_NAME_NAME=Nome padr\u00e3o para o filho +DEFAULT_CHILD_NAME_DESCRIPTION=O nome filho \u00e9 utilizado quando nenhum nome espec\u00edfico para o filho \u00e9 especificado TAB_ORDER_NAME=Ordem da aba -TAB_ORDER_DESCRIPTION=A valor de ordena\u00E7\u00E3o para exibir p\u00E1ginas em abas +TAB_ORDER_DESCRIPTION=A valor de ordena\u00e7\u00e3o para exibir p\u00e1ginas em abas INITIAL_WINDOW_STATE_NAME=Modo Inicial INITIAL_WINDOW_STATE_DESCRIPTION=O modo inicial da janela -CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando o acesso \u00E0 janela \u00E9 negado -CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00E0 janela \u00E9 negado -CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando a janela est\u00E1 indispon\u00EDvel -CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando a janela est\u00E1 indispon\u00EDvel -CONTROL_POLICY_PAGE_ERROR_NAME=Quando h\u00E1 um erro na janela -CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando h\u00E1 um erro na janela -CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando h\u00E1 um erro dentro da janela -CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro dentro da janela -CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando a janela n\u00E3o for encontrada -CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando a janela n\u00E3o for encontrada +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando o acesso \u00e0 janela \u00e9 negado +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00e0 janela \u00e9 negado +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando a janela est\u00e1 indispon\u00edvel +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando a janela est\u00e1 indispon\u00edvel +CONTROL_POLICY_PAGE_ERROR_NAME=Quando h\u00e1 um erro na janela +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando h\u00e1 um erro na janela +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando h\u00e1 um erro dentro da janela +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando h\u00e1 um erro dentro da janela +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando a janela n\u00e3o for encontrada +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando a janela n\u00e3o for encontrada CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=Quando ocorrer um erro, redirecionar para este recurso CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=Quando ocorrer um erro, redirecionar para este recurso -CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando o acesso \u00E0 p\u00E1gina \u00E9 negado -CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00E0 p\u00E1gina \u00E9 negado -CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando a p\u00E1gina n\u00E3o est\u00E1 dispon\u00EDvel -CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando a p\u00E1gina n\u00E3o est\u00E1 dispon\u00EDvel -CONTROL_POLICY_PORTAL_ERROR_NAME=Quando h\u00E1 um erro na p\u00E1gina -CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro na p\u00E1gina -CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando h\u00E1 um erro dentro da p\u00E1gina -CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro dentro da p\u00E1gina -CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando a p\u00E1gina n\u00E3o for encontrada -CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando a p\u00E1gina n\u00E3o for encontrada +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando o acesso \u00e0 p\u00e1gina \u00e9 negado +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00e0 p\u00e1gina \u00e9 negado +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando a p\u00e1gina n\u00e3o est\u00e1 dispon\u00edvel +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando a p\u00e1gina n\u00e3o est\u00e1 dispon\u00edvel +CONTROL_POLICY_PORTAL_ERROR_NAME=Quando h\u00e1 um erro na p\u00e1gina +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando h\u00e1 um erro na p\u00e1gina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando h\u00e1 um erro dentro da p\u00e1gina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando h\u00e1 um erro dentro da p\u00e1gina +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando a p\u00e1gina n\u00e3o for encontrada +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando a p\u00e1gina n\u00e3o for encontrada CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=Quando ocorrer um erro, redirecionar para este recurso CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=Quando ocorrer um erro, redirecionar para este recurso NO_BOUND_LISTENER=nenhum listener vinculado -COORDINATION_COORDINATION=Coordena\u00E7\u00E3o +COORDINATION_COORDINATION=Coordena\u00e7\u00e3o COORDINATION_PARAMETER_BINDINGS=Parameter bindings COORDINATION_PARAMETER_EXPLICIT_MODE=Use explicit parameter binding COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings: COORDINATION_PARAMETER_EXISTING_NONE=No existing parameter bindings. COORDINATION_PARAMETER_EXISTING_NAME=Nome COORDINATION_PARAMETER_EXISTING_PAIRS=Window / parameter pairs -COORDINATION_PARAMETER_EXISTING_ACTIONS=A\u00E7\u00F5es -COORDINATION_PARAMETER_CREATE=Criar um novo par\u00E2metro de binding\: -COORDINATION_PARAMETER_CREATE_NO_PAIRS=Nenhum par\u00E2metro p\u00FAblico de renderiza\u00E7\u00E3o. N\u00E3o \u00E9 poss\u00EDvel criar novo par\u00E2metro de bindings. -COORDINATION_PARAMETER_CREATE_STEP1=1. Selecione par\u00E2metro p\u00FAblico / window pairs\: -COORDINATION_PARAMETER_CREATE_STEP2=2. Nome do par\u00E2metro de binding\: +COORDINATION_PARAMETER_EXISTING_ACTIONS=A\u00e7\u00f5es +COORDINATION_PARAMETER_CREATE=Criar um novo par\u00e2metro de binding\: +COORDINATION_PARAMETER_CREATE_NO_PAIRS=Nenhum par\u00e2metro p\u00fablico de renderiza\u00e7\u00e3o. N\u00e3o \u00e9 poss\u00edvel criar novo par\u00e2metro de bindings. +COORDINATION_PARAMETER_CREATE_STEP1=1. Selecione par\u00e2metro p\u00fablico / window pairs\: +COORDINATION_PARAMETER_CREATE_STEP2=2. Nome do par\u00e2metro de binding\: COORDINATION_PARAMETER_CREATE_CREATE=Criar binding COORDINATION_WINDOWS=Janelas @@ -290,7 +290,7 @@ COORDINATION_ALIAS_EXISTING_NONE=No existing alias bindings. COORDINATION_ALIAS_EXISTING_NAME=Nome COORDINATION_ALIAS_EXISTING_ORIGINAL=QName Original -COORDINATION_ALIAS_EXISTING_ACTIONS=A\u00E7\u00F5es +COORDINATION_ALIAS_EXISTING_ACTIONS=A\u00e7\u00f5es COORDINATION_ALIAS_CREATE=Create new alias binding: COORDINATION_ALIAS_CREATE_NO_PARAMS=No available public render parameters. Cannot create new alias bindings. COORDINATION_ALIAS_CREATE_STEP1=1. Select public render parameter: @@ -306,7 +306,7 @@ COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=Source events COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=Destination events COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows -COORDINATION_EVENT_EXISTING_ACTIONS=A\u00E7\u00F5es +COORDINATION_EVENT_EXISTING_ACTIONS=A\u00e7\u00f5es COORDINATION_EVENT_CREATE=Create new event wiring: COORDINATION_EVENT_CREATE_NO_EVENTS=No available events. Cannot create new event wirings. COORDINATION_EVENT_CREATE_STEP1=1. Select source event: @@ -325,16 +325,16 @@ COORDINATION_PARAMETER=parameter binding COORDINATION_ALIAS=alias binding -INVALID_NAME_ERROR=''{0}'' \u00E9 um nome de {1} inv\u00E1lido\: N\u00E3o pode ser nulo, vazio, ou que contenha '\\' ou '%5c' +INVALID_NAME_ERROR=''{0}'' \u00e9 um nome de {1} inv\u00e1lido\: N\u00e3o pode ser nulo, vazio, ou que contenha '\\', '<', '>', '(', ')', '=' ou '%5c' NO_SELECTED_PORTLET_ERROR=Nenhum portlet foi selecionado! -DUPLICATE_ERROR=O {1} denominado ''{0}'' j\u00E1 existe\! +DUPLICATE_ERROR=O {1} denominado ''{0}'' j\u00e1 existe\! bean_support_unexpected_error=Erro inesperado: bean_support_cause=Motivo: -INSTANCE_TYPE=inst\u00E2ncia -PAGE_TYPE=p\u00E1gina +INSTANCE_TYPE=inst\u00e2ncia +PAGE_TYPE=p\u00e1gina PORTAL_TYPE=portal -DISPLAY_NAME_TYPE=nomes de exibi\u00E7\u00E3o +DISPLAY_NAME_TYPE=nomes de exibi\u00e7\u00e3o PROPERTY_TYPE=propriedade PORTAL_OBJECT_TYPE=objeto do portal WINDOW_TYPE=janela Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,24 +1,24 @@ <?xml version="1.0"?> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ This is free software; you can redistribute it and/or modify it ~ - ~ under the terms of the GNU Lesser General Public License as ~ - ~ published by the Free Software Foundation; either version 2.1 of ~ - ~ the License, or (at your option) any later version. ~ - ~ ~ - ~ This software is distributed in the hope that it will be useful, ~ - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ - ~ Lesser General Public License for more details. ~ - ~ ~ - ~ You should have received a copy of the GNU Lesser General Public ~ - ~ License along with this software; if not, write to the Free ~ - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> @@ -29,7 +29,7 @@ <application> <view-handler> - org.jboss.portletbridge.application.PortletViewHandler + org.jboss.portletbridge.application.PortletViewHandler </view-handler> <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> <message-bundle>Resource</message-bundle> @@ -112,6 +112,11 @@ <property-name>portalObjectManager</property-name> <value>#{sessionScope.portalobjectmgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>addPageAction</managed-bean-name> @@ -129,6 +134,11 @@ <property-name>listener</property-name> <value>#{sessionScope.dashboard}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>assignContentToWindowAction</managed-bean-name> @@ -266,13 +276,17 @@ <property-name>instanceManager</property-name> <value>#{sessionScope.instancemgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> - <!-- - | Dashboard beans - --> + | Dashboard beans + --> <managed-bean> <managed-bean-name>dashboard</managed-bean-name> @@ -311,6 +325,11 @@ <property-name>listener</property-name> <value>#{sessionScope.dashboard}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -318,7 +337,7 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>pageContainer</property-name> + <property-name>renamedObject</property-name> <value>#{portalobjectmgr.selectedObject}</value> </managed-property> <managed-property> @@ -329,6 +348,11 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -336,9 +360,14 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.PortalObjectDisplayNameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>bean</property-name> + <property-name>managerBean</property-name> <value>#{portalobjectmgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -346,9 +375,14 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.PortalInstanceDisplayNameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>instanceManager</property-name> + <property-name>managerBean</property-name> <value>#{sessionScope.instancemgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -356,7 +390,7 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>pageContainer</property-name> + <property-name>renamedObject</property-name> <value>#{dashboard.selectedPage}</value> </managed-property> <managed-property> @@ -367,6 +401,11 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <!-- Constants --> @@ -599,7 +638,7 @@ <component-type>org.jboss.portal.Portlet</component-type> <component-class>org.jboss.portal.faces.component.portlet.UIPortlet</component-class> </component> - + <render-kit> <renderer> <component-family>javax.faces.Input</component-family> Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-04-28 23:53:54 UTC (rev 13282) @@ -52,6 +52,7 @@ <td> <h:inputText id="property" styleClass="portlet-form-input-field" value="#{properties.action.otherPropertyName}"/> + <h:message for="property" errorClass="portlet-msg-error"/> </td> </tr> </tbody> Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-04-28 23:53:54 UTC (rev 13282) @@ -123,69 +123,68 @@ <div class="half-width float-right details-right-col"> -<f:subview rendered="#{showDisplayNameEditor}"> +<f:subview rendered="#{showDisplayNameEditor}" id="display-names-view"> <div class="whiteWithLtGreyHeader meta-box"> <h3 class="blue">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> <div class="pad5"> - <h:form id="add-display-name-form" style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> - <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> - <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> - <f:selectItems value="#{instanceDisplayNameAction.locales}"/> - </h:selectOneMenu> - <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" - action="#{instanceDisplayNameAction.addDisplayName}" - styleClass="portlet-form-button"/> - </h:form> + <h:form id="add-display-name-form" style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> + <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> + <h:message for="newName" errorClass="portlet-msg-error"/> + <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> + <f:selectItems value="#{instanceDisplayNameAction.locales}"/> + </h:selectOneMenu> + <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" + action="#{instanceDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/> + </h:form> </div> <br/> <h3 class="blue">#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> <div class="pad5"> + <h:form id="instance-display-form" style="display:inline;width:100%;"> + <h:dataTable id="locale-datatable" var="value" value="#{instanceDisplayNameAction.currentLocales}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> + </f:facet> + #{value.localeDisplayName} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> + </f:facet> + #{value.text} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_DELETE}"/> + </f:facet> - <h:form id="instance-display-form" style="display:inline;width:100%;"> - <h:dataTable id="locale-datatable" var="value" value="#{instanceDisplayNameAction.currentLocales}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn, objectActionColumn" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_LOCALE}"/> - </f:facet> - #{value.localeDisplayName} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> - </f:facet> - #{value.text} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_DELETE}"/> - </f:facet> + <div><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink></div> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.RENAME}"/> + </f:facet> - <div style="width:150px"><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="delete"/> - </h:commandLink></div> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.RENAME}"/> - </f:facet> - - <div style="width:150px"> - <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="rename"/> - </h:commandLink></div> - </h:column> - </h:dataTable> - </h:form> + <div style="width:150px"> + <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></div> + </h:column> + </h:dataTable> + </h:form> </div> </div> @@ -207,7 +206,7 @@ </c:forEach> </dl> </portal:box> - <portal:box class="whiteWithLtGreyHeader meta-box"> +<portal:box class="whiteWithLtGreyHeader meta-box"> <h3>#{bundle.COMMON_CONSUMED_EVENTS}</h3> <dl> <c:forEach var="consumedEvent" items="#{portlet.consumedEvents}"> Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-28 23:53:54 UTC (rev 13282) @@ -65,7 +65,7 @@ <div id="aliasBindings" class="coordination-section"> <h3 class="sectionTitle tenpx-bottom" style="margin-top: 3px;">#{bundle.COORDINATION_ALIAS_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/> - <h:form rendered="#{!empty aliasManager.availableRenderParameters}"> + <h:form rendered="#{!empty aliasManager.availableRenderParameters}" id="create-alias-form"> <div class="float-left tenpx-right"> <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4> <h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}" @@ -77,8 +77,11 @@ <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4> <div class="full-width"> - <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></span> <span> + <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/> + <h:message for="aliasName" errorClass="portlet-msg-error"/> + </span> + <span> <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}" action="#{aliasManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}" @@ -160,7 +163,7 @@ <!-- Create parameter binding --> <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/> - <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}"> + <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}" id="create-binding-form"> <div class="float-left tenpx-right"> <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}" @@ -173,8 +176,11 @@ <div class="float-left paramBinding-step2"> <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> <div class="full-width"> - <span><h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/></span> <span> + <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/> + <h:message for="bindingName" errorClass="portlet-msg-error"/> + </span> + <span> <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" action="#{parameterManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" @@ -258,7 +264,7 @@ <!-- Create new event wiring --> <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> - <h:form rendered="#{!empty eventManager.sourceEvents}"> + <h:form rendered="#{!empty eventManager.sourceEvents}" id="create-wiring-form"> <div class="half-width float-left"> <div class="full-width pad5"> <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> @@ -340,6 +346,7 @@ <div class="margin10"> <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> + <h:message for="wiringName" errorClass="portlet-msg-error"/> <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-04-28 23:53:54 UTC (rev 13282) @@ -7,13 +7,11 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> - <h3>#{bundle.RENAME} #{coordinationManager.selectedType}</h3> + <h3 class="sectionTitle">#{bundle.RENAME} #{coordinationManager.selectedType}</h3> <h:form id="renameForm"> - <h:message for="newName"/> - <p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span> #{coordinationManager.selectedType} #{bundle.TO}: - <h:inputText id="newName" value="#{coordinationManager.newName}"/> + <h:inputText id="newName" value="#{coordinationManager.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/> <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination" Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-04-28 23:53:54 UTC (rev 13282) @@ -7,13 +7,11 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> - <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> + <h3 class="sectionTitle">#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> - <h:message for="newName"/> - <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObjectType} #{bundle.TO}: - <h:inputText id="newName" value="#{renameAction.newName}"/> + <h:inputText id="newName" value="#{renameAction.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/> <h:commandButton id="rename" value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="objects" Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2007, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -69,6 +69,7 @@ private static final String CANNOT_ERASE_REG = "bean_consumer_cannot_erase_reg"; private static final String MALFORMED_URL = "bean_consumer_malformed_url"; private static final String UPDATE_SUCCESS = "bean_consumer_update_success"; + private static final String CONSUMER_TYPE = "CONSUMER_TYPE"; public ConsumerBean() { @@ -119,12 +120,29 @@ { if (consumer != null) { + // renaming scenario ProducerInfo info = getProducerInfo(); String oldId = info.getId(); - info.setId((String)modifyIfNeeded(oldId, id, "id", false)); + + // need to check that the new id is valid + if (isOldAndNewDifferent(oldId, id)) + { + id = checkNameValidity(id, "edit-cons-form:id"); + if (id != null) + { + info.setId(id); + + // properly update the registry after change of id + registry.updateProducerInfo(info); + + // we're not using modifyIfNeeded here to avoid double equality check, so we need to set modified manually + modified = true; + } + } } else { + // initialization scenario consumer = registry.getConsumer(id); if (consumer != null) { @@ -449,7 +467,7 @@ if (!isRegistrationLocallyModified()) { IllegalStateException e = - new IllegalStateException("Registration not locally modified: there should be expected registration from producer!"); + new IllegalStateException("Registration not locally modified: there should be expected registration from producer!"); log.debug(e); throw e; } @@ -504,7 +522,7 @@ private Object modifyIfNeeded(Object oldValue, Object newValue, String target, boolean checkURL) { - if (isOldAndNewEqual(oldValue, newValue)) + if (isOldAndNewDifferent(oldValue, newValue)) { if (checkURL) { @@ -526,25 +544,6 @@ return oldValue; } - private boolean isOldAndNewEqual(Object oldValue, Object newValue) - { - oldValue = normalizeStringIfNeeded(oldValue); - newValue = normalizeStringIfNeeded(newValue); - - return (oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null); - } - - /** - * Normalizes Strings by considering empty String as null as JSF would give either - * - * @param value - * @return - */ - private Object normalizeStringIfNeeded(Object value) - { - return (value instanceof String && ((String)value).length() == 0) ? null : value; - } - // Listeners public void useWSDLListener(ValueChangeEvent event) @@ -564,8 +563,18 @@ Object oldValue = normalizeStringIfNeeded(event.getOldValue()); if (oldValue != null) { - registrationLocallyModified = isOldAndNewEqual(oldValue, event.getNewValue()); + registrationLocallyModified = isOldAndNewDifferent(oldValue, event.getNewValue()); } } } + + protected String getObjectTypeName() + { + return CONSUMER_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return registry.getConsumer(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -56,6 +56,7 @@ private static final String REFRESH_FAILURE = "bean_consumermanager_refresh_failure"; private static final String REFRESH_EXCEPTION = "bean_consumermanager_refresh_exception"; static final String REFRESH_MODIFY = "bean_consumermanager_refresh_modify"; + private static final String MESSAGE_TARGET = "createConsumer:consumerName"; public ConsumerRegistry getRegistry() { @@ -169,6 +170,7 @@ public String createConsumer() { + selectedId = checkNameValidity(selectedId, MESSAGE_TARGET); if (selectedId != null) { try @@ -179,15 +181,12 @@ } catch (Exception e) { - beanContext.createErrorMessageFrom(e); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); return null; } } - else - { - beanContext.createErrorMessage(INVALID_NEW_CONSUMER_NAME); - return null; - } + + return null; } public String destroyConsumer() @@ -365,4 +364,14 @@ { beanContext.createErrorMessage(NO_CONSUMER); } + + protected String getObjectTypeName() + { + return "CONSUMER_TYPE"; + } + + public boolean isAlreadyExisting(String objectName) + { + return registry.getConsumer(objectName) != null; + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2007, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -226,4 +226,14 @@ { selectedProp = beanContext.getParameter("propName"); } + + protected String getObjectTypeName() + { + return null; // default implementation as not used + } + + public boolean isAlreadyExisting(String objectName) + { + return false; // default implementation as not used + } } Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -137,6 +137,7 @@ bean_support_unexpected_error = An unexpected error occured: bean_support_cause = Cause: +CONSUMER_TYPE = Consumer # ConsumerBean bean_consumer_cannot_find_consumer = Couldn''t find consumer ''{0}''! @@ -175,4 +176,7 @@ registration_property_status_invalid_value = Invalid value registration_property_status_valid = Valid -org.jboss.portal.object.name.admin.WSRP=WSRP \ No newline at end of file +org.jboss.portal.object.name.admin.WSRP=WSRP + +INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c' +DUPLICATE_ERROR=A {1} named ''{0}'' already exists! \ No newline at end of file Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -144,4 +144,7 @@ registration_property_status_unchecked_value=Status ind\u00e9termin\u00e9 registration_property_status_valid=Valide org.jboss.portal.object.name.admin.WSRP=WSRP -consumers_table_reload=Recharger consommateurs \ No newline at end of file +consumers_table_reload=Recharger consommateurs +CONSUMER_TYPE=Consommateur +DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0! +INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '\\', '<', '>', '(', ')', '=' ou '%5c' \ No newline at end of file Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -52,7 +52,7 @@ E' necessario soltanto se il consumer si \u00e8 prima registrato con il producer remoto e il producer \u00e8 \n\ stato configurato in modo da non richiedere pi\u00f9 la registrazione. \n\ Elimina le informazioni della registrazione locale soltanto se riscontri degli errori per \n\ -questa particolare situazione. Se si cancella la registrazione in alcune situazioni c'� il rischio di non poter pi\u00f9 lavorare \n\ +questa particolare situazione. Se si cancella la registrazione in alcune situazioni c'\ufffd il rischio di non poter pi\u00f9 lavorare \n\ con quel producer. confirm_delete_registration_proceed = Sicuro di voler procedere? confirm_delete_registration_submit = Elimina la registrazione locale @@ -178,5 +178,5 @@ org.jboss.portal.object.name.admin.WSRP=WSRP -INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '\\' o '%5c' +INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '\\', '<', '>', '(', ')', '=' o '%5c' DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0! \ No newline at end of file Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-28 23:53:54 UTC (rev 13282) @@ -24,31 +24,31 @@ ## WSRP GUI localization # JBoss Portal display information -org.jboss.portal.object.name.WSRPConfigurationPortlet = Configura\u00E7\u00E3o WSRP -org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configura\u00E7\u00E3o WSRP +org.jboss.portal.object.name.WSRPConfigurationPortlet = Configura\u00e7\u00e3o WSRP +org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configura\u00e7\u00e3o WSRP # Tabs -nav_tabs_consumers = Configura\u00E7\u00E3o de Consumidores -nav_tabs_producer_config = Configura\u00E7\u00E3o de Produtores +nav_tabs_consumers = Configura\u00e7\u00e3o de Consumidores +nav_tabs_producer_config = Configura\u00e7\u00e3o de Produtores nav_tabs_producer_management = Gerenciamento de Produtores # Object path in consumer template path_consumers_root = Consumidores -path_consumers_consumer = Configura\u00E7\u00E3o do Consumidor ''{0}'' +path_consumers_consumer = Configura\u00e7\u00e3o do Consumidor ''{0}'' path_consumers_active = ativo path_consumers_inactive = inativo -path_consumers_refreshNeeded = (atualiza\u00E7\u00E3o necess\u00E1ria) +path_consumers_refreshNeeded = (atualiza\u00e7\u00e3o necess\u00e1ria) # Confirm deletion of a consumer screen confirm_delete_consumer_title = Excluir o consumidor ''{0}''? -confirm_delete_consumer_message = Voc\u00EA est\u00E1 prestes a excluir o consumidor ''{0}''\! +confirm_delete_consumer_message = Voc\u00ea est\u00e1 prestes a excluir o consumidor ''{0}''\! confirm_detete_consumer_proceed = Tem certeza de que deseja continuar? confirm_delete_consumer_submit = Excluir consumidor confirm_delete_consumer_cancel = Cancelar # Confirm deletion of local registration information screen confirm_delete_registration_title = Excluir registro local para o consumidor ''{0}''? -confirm_delete_registration_message = Voc\u00EA est\u00E1 prestes a eliminar o registro local de informa\u00E7\u00F5es para o consumidor ''{0}'\! \nIsso s\u00F3 \u00E9 necess\u00E1rio se esse consumidor tinha anteriormente se registrado com o produtor remoto, e esse produtor tiver sido modificado para n\u00E3o mais exigir registro. \nApenas apague informa\u00E7\u00F5es locais de registro, se esse produtor apresentar erros devido a essa situa\u00E7\u00E3o particular. Apagar o registro local quando n\u00E3o obrigat\u00F3rio pode conduzir \u00E0 incapacidade de utilizar esse produtor. +confirm_delete_registration_message = Voc\u00ea est\u00e1 prestes a eliminar o registro local de informa\u00e7\u00f5es para o consumidor ''{0}'\! \nIsso s\u00f3 \u00e9 necess\u00e1rio se esse consumidor tinha anteriormente se registrado com o produtor remoto, e esse produtor tiver sido modificado para n\u00e3o mais exigir registro. \nApenas apague informa\u00e7\u00f5es locais de registro, se esse produtor apresentar erros devido a essa situa\u00e7\u00e3o particular. Apagar o registro local quando n\u00e3o obrigat\u00f3rio pode conduzir \u00e0 incapacidade de utilizar esse produtor. confirm_delete_registration_proceed = Tem certeza de que deseja continuar? confirm_delete_registration_submit = Excluir registro local confirm_delete_registration_cancel = Cancelar @@ -61,7 +61,7 @@ # Consumers list consumers_table_column_consumer = Consumidor consumers_table_column_consumer_status = status: -consumers_table_column_actions = A\u00E7\u00F5es +consumers_table_column_actions = A\u00e7\u00f5es consumers_table_action_configure = Configurar consumers_table_action_refresh = Atualizar consumers_table_action_activate = Ativar @@ -73,55 +73,55 @@ # Consumer editing screen edit_consumer_producer = Id do produtor\: -edit_consumer_cache = Expira\u00E7\u00E3o do cache\: +edit_consumer_cache = Expira\u00e7\u00e3o do cache\: edit_consumer_cache_seconds = (segundos antes de expirar) -edit_consumer_endpoint = Configura\u00E7\u00E3o do endpoint\: +edit_consumer_endpoint = Configura\u00e7\u00e3o do endpoint\: edit_consumer_endpoint_wsdl = Usar WSDL? edit_consumer_endpoint_sd = URL do Service Description\: edit_consumer_endpoint_m = URL do Markup\: edit_consumer_endpoint_r = URL do Registro\: edit_consumer_endpoint_pm = URL do Portlet de Gerenciamento\: -edit_consumer_registration = Informa\u00E7\u00F5es do registro\: -edit_consumer_registration_current = Informa\u00E7\u00F5es do registro atual\: +edit_consumer_registration = Informa\u00e7\u00f5es do registro\: +edit_consumer_registration_current = Informa\u00e7\u00f5es do registro atual\: edit_consumer_prop_name = Nome -edit_consumer_prop_desc = Descri\u00E7\u00E3o +edit_consumer_prop_desc = Descri\u00e7\u00e3o edit_consumer_prop_value = Valor edit_consumer_registration_update_props = Atualizar propriedades -edit_consumer_registration_no_props = O registro \u00E9 indicado como obrigat\u00F3rio sem as propriedades do registro. +edit_consumer_registration_no_props = O registro \u00e9 indicado como obrigat\u00f3rio sem as propriedades do registro. edit_consumer_registration_modify = Modificar registro edit_consumer_registration_modify_title = Modificar o registro realizado com este produtor -edit_consumer_registration_expected = Informa\u00E7\u00F5es de registro esperadas\: -edit_consumer_no_registration = O produtor n\u00E3o requer registro. +edit_consumer_registration_expected = Informa\u00e7\u00f5es de registro esperadas\: +edit_consumer_no_registration = O produtor n\u00e3o requer registro. edit_consumer_registration_context = Contexto do registro\: edit_consumer_registration_context_handle = Handle: edit_consumer_registration_context_erase = Excluir registro local -edit_consumer_registration_context_erase_title = Excluir informa\u00E7\u00F5es locais de registro (potencialmente perigoso\!) +edit_consumer_registration_context_erase_title = Excluir informa\u00e7\u00f5es locais de registro (potencialmente perigoso\!) edit_consumer_refresh = Atualizar e Gravar -edit_consumer_refresh_title = Gravar altera\u00E7\u00F5es e atualizar as informa\u00E7\u00F5es do produtor +edit_consumer_refresh_title = Gravar altera\u00e7\u00f5es e atualizar as informa\u00e7\u00f5es do produtor edit_consumer_cancel = Cancelar # Confirm registration property deletion screen -confirm_delete_reg_property_title = Excluir a descri\u00E7\u00E3o da propriedade de registro ' '(0)''? -confirm_delete_reg_property_message = Voc\u00EA est\u00E1 prestes a eliminar a descri\u00E7\u00E3o da propriedade de registro ''{0}''\!\n Isso acionar\u00E1 a invalida\u00E7\u00E3o dos registros dos consumidores que ter\u00E3o de modificar suas informa\u00E7\u00E3o de registro. +confirm_delete_reg_property_title = Excluir a descri\u00e7\u00e3o da propriedade de registro ' '(0)''? +confirm_delete_reg_property_message = Voc\u00ea est\u00e1 prestes a eliminar a descri\u00e7\u00e3o da propriedade de registro ''{0}''\!\n Isso acionar\u00e1 a invalida\u00e7\u00e3o dos registros dos consumidores que ter\u00e3o de modificar suas informa\u00e7\u00e3o de registro. confirm_delete_reg_property_proceed = Tem certeza de que deseja continuar? confirm_delete_reg_property_submit = Excluir propriedade confirm_delete_reg_property_cancel = Cancelar # Producer configuration screen -producer_config_title = Configura\u00E7\u00E3o do Produtor -producer_config_sd_requires_reg = O acesso \u00E0 descri\u00E7\u00E3o completa do servi\u00E7o exige que os consumidores estejam registados. +producer_config_title = Configura\u00e7\u00e3o do Produtor +producer_config_sd_requires_reg = O acesso \u00e0 descri\u00e7\u00e3o completa do servi\u00e7o exige que os consumidores estejam registados. producer_config_strict = Utilize compatibilidade estrita ao WSRP. -producer_config_requires_reg = Registro obrigat\u00F3rio. Modificar essa informa\u00E7\u00E3o invalidar\u00E1 os registros dos consumidores. -producer_config_reg_policy = Nome da classe de pol\u00EDtica do registro\: -producer_config_reg_prop_validator = Nome da classe de valida\u00E7\u00E3o da propriedade do registro\: +producer_config_requires_reg = Registro obrigat\u00f3rio. Modificar essa informa\u00e7\u00e3o invalidar\u00e1 os registros dos consumidores. +producer_config_reg_policy = Nome da classe de pol\u00edtica do registro\: +producer_config_reg_prop_validator = Nome da classe de valida\u00e7\u00e3o da propriedade do registro\: producer_config_reg_props = Propriedades do registro producer_config_reg_prop_name = Nome producer_config_reg_prop_type = Tipo -producer_config_reg_prop_label = R\u00F3tulo +producer_config_reg_prop_label = R\u00f3tulo producer_config_reg_prop_hint = Dica -producer_config_reg_prop_action = A\u00E7\u00E3o +producer_config_reg_prop_action = A\u00e7\u00e3o producer_config_reg_prop_remove = Excluir -producer_config_no_reg_props = Propriedades obrigat\u00F3rias do registro n\u00E3o especificadas. +producer_config_no_reg_props = Propriedades obrigat\u00f3rias do registro n\u00e3o especificadas. producer_config_add_reg_prop = Adicionar propriedade producer_config_save = Gravar producer_config_cancel = Cancelar @@ -133,41 +133,41 @@ CONSUMER_TYPE = Consumidor # ConsumerBean -bean_consumer_cannot_find_consumer = N\u00E3o foi poss\u00EDvel encontrar o consumidor ''{0}''\! -bean_consumer_cannot_update_consumer = N\u00E3o foi poss\u00EDvel atualizar o consumidor\! -bean_consumer_cannot_refresh_consumer = N\u00E3o foi poss\u00EDvel atualizar o consumidor\! +bean_consumer_cannot_find_consumer = N\u00e3o foi poss\u00edvel encontrar o consumidor ''{0}''\! +bean_consumer_cannot_update_consumer = N\u00e3o foi poss\u00edvel atualizar o consumidor\! +bean_consumer_cannot_refresh_consumer = N\u00e3o foi poss\u00edvel atualizar o consumidor\! bean_consumer_modify_reg_success = Registro modificado com sucesso\! -bean_consumer_invalid_modify = Tentativa inv\u00E1lida de modificar um registro que n\u00E3o foi modificado localmente\! -bean_consumer_cannot_modify_reg = N\u00E3o foi poss\u00EDvel modificar o registro\! -bean_consumer_cannot_erase_reg = N\u00E3o foi poss\u00EDvel excluir o registro local\! -bean_consumer_malformed_url = ''{0}'' n\u00E3o \u00E9 uma URL v\u00E1lida\: {1} -bean_consumer_update_success = Atualiza\u00E7\u00E3o do consumidor realizada com sucesso\! +bean_consumer_invalid_modify = Tentativa inv\u00e1lida de modificar um registro que n\u00e3o foi modificado localmente\! +bean_consumer_cannot_modify_reg = N\u00e3o foi poss\u00edvel modificar o registro\! +bean_consumer_cannot_erase_reg = N\u00e3o foi poss\u00edvel excluir o registro local\! +bean_consumer_malformed_url = ''{0}'' n\u00e3o \u00e9 uma URL v\u00e1lida\: {1} +bean_consumer_update_success = Atualiza\u00e7\u00e3o do consumidor realizada com sucesso\! # ConsumerManagerBean -bean_consumermanager_invalid_new_consumer_name = Necessita de um nome n\u00E3o nulo, n\u00E3o vazio para o novo consumidor\! +bean_consumermanager_invalid_new_consumer_name = Necessita de um nome n\u00e3o nulo, n\u00e3o vazio para o novo consumidor\! bean_consumermanager_no_consumer = Nenhum consumidor foi selecionado\! -bean_consumermanager_refresh_bypassed = N\u00E3o \u00E9 necess\u00E1rio atualizar. -bean_consumermanager_refresh_success = Atualiza\u00E7\u00E3o bem sucedida. -bean_consumermanager_refresh_failure = A atualiza\u00E7\u00E3o falhou (provavelmente porque a informa\u00E7\u00E3o de registro n\u00E3o era v\u00E1lida). +bean_consumermanager_refresh_bypassed = N\u00e3o \u00e9 necess\u00e1rio atualizar. +bean_consumermanager_refresh_success = Atualiza\u00e7\u00e3o bem sucedida. +bean_consumermanager_refresh_failure = A atualiza\u00e7\u00e3o falhou (provavelmente porque a informa\u00e7\u00e3o de registro n\u00e3o era v\u00e1lida). bean_consumermanager_refresh_exception = Ocorreu um erro inesperado. -bean_consumermanager_refresh_modify = Informa\u00E7\u00E3o local ou remota foi alterada. Voc\u00EA deve modificar o registro com o produtor remoto. \\n Os novos locais de informa\u00E7\u00E3o ser\u00E3o salvos, mas o seu atual registro de dados ser\u00E1 usado at\u00E9 que voc\u00EA modifique o registro com o produtor com sucesso. +bean_consumermanager_refresh_modify = Informa\u00e7\u00e3o local ou remota foi alterada. Voc\u00ea deve modificar o registro com o produtor remoto. \\n Os novos locais de informa\u00e7\u00e3o ser\u00e3o salvos, mas o seu atual registro de dados ser\u00e1 usado at\u00e9 que voc\u00ea modifique o registro com o produtor com sucesso. # ProducerBean -bean_producer_regpolicy_unset = RegistrationPolicy n\u00E3o definida -bean_producer_cannot_save = N\u00E3o foi poss\u00EDvel salvar a configura\u00E7\u00E3o do produtor. Motivo\: (0) -bean_producer_cannot_reload = N\u00E3o foi poss\u00EDvel recarregar a configura\u00E7\u00E3o do produtor. Motivo\: {0} -bean_producer_save_success = Configura\u00E7\u00E3o do producer gravada com sucesso\! -bean_producer_cancel_success = Todas as modifica\u00E7\u00F5es feitas na configura\u00E7\u00E3o do produtor foram canceladas\! +bean_producer_regpolicy_unset = RegistrationPolicy n\u00e3o definida +bean_producer_cannot_save = N\u00e3o foi poss\u00edvel salvar a configura\u00e7\u00e3o do produtor. Motivo\: (0) +bean_producer_cannot_reload = N\u00e3o foi poss\u00edvel recarregar a configura\u00e7\u00e3o do produtor. Motivo\: {0} +bean_producer_save_success = Configura\u00e7\u00e3o do producer gravada com sucesso\! +bean_producer_cancel_success = Todas as modifica\u00e7\u00f5es feitas na configura\u00e7\u00e3o do produtor foram canceladas\! ## RegistrationProperty Status localization registration_property_status_inexistent = Produtor inexistente -registration_property_status_missing = N\u00E3o est\u00E1 presente -registration_property_status_missing_value = Valor n\u00E3o est\u00E1 presente +registration_property_status_missing = N\u00e3o est\u00e1 presente +registration_property_status_missing_value = Valor n\u00e3o est\u00e1 presente registration_property_status_unchecked_value = Status indeterminado -registration_property_status_invalid_value = Valor inv\u00E1lido -registration_property_status_valid = V\u00E1lido +registration_property_status_invalid_value = Valor inv\u00e1lido +registration_property_status_valid = V\u00e1lido org.jboss.portal.object.name.admin.WSRP=WSRP -INVALID_NAME_ERROR=''{0}'' \u00E9 um nome inv\u00E1lido para {1}\: n\u00E3o deve ser nulo, vazio ou conter os caracteres '\\' ou '%5c' -DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00E1 existe\! \ No newline at end of file +INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\: n\u00e3o deve ser nulo, vazio ou conter os caracteres '\\', '<', '>', '(', ')', '=' ou '%5c' +DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00e1 existe\! \ No newline at end of file Modified: branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -52,6 +52,11 @@ */ public abstract String getParameter(String key); + /** + * @param target + * @param message + * @param severity + */ protected abstract void createMessage(String target, String message, Object severity); protected abstract Object getErrorSeverity(); Modified: branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -24,6 +24,8 @@ package org.jboss.portal.faces.gui; import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import java.util.Locale; import java.util.Map; @@ -58,8 +60,22 @@ jsfSeverity = FacesMessage.SEVERITY_ERROR; } + // Get the component id from the target + FacesContext facesContext = FacesContext.getCurrentInstance(); + UIViewRoot viewRoot = facesContext.getViewRoot(); + UIComponent component = viewRoot.findComponent(target); + if (component != null) + { + target = component.getClientId(facesContext); + } + else + { + // todo: do something better here + System.out.println("Couldn't resolve component target: " + target); + } + FacesMessage msg = new FacesMessage(jsfSeverity, message, message); - FacesContext.getCurrentInstance().addMessage(target, msg); + facesContext.addMessage(target, msg); } protected Object getErrorSeverity() Modified: branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2007, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -24,6 +24,7 @@ package org.jboss.portal.faces.gui; import org.apache.log4j.Logger; +import org.jboss.portal.common.util.ParameterValidation; /** @@ -31,14 +32,118 @@ * @version $Revision$ * @since 2.6 */ -public class ManagedBean +public abstract class ManagedBean { protected Logger log = Logger.getLogger(getClass()); protected BeanContext beanContext; + public static final String INVALID_NAME = "INVALID_NAME_ERROR"; + public static final String DUPLICATE = "DUPLICATE_ERROR"; public void setBeanContext(BeanContext beanContext) { this.beanContext = beanContext; } + + public String checkNameValidity(String name, String targetForErrorMessage) + { + if (ParameterValidation.isNullOrEmpty(name)) + { + beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, name, getLocalizedType()); + return null; + } + else + { + // Trim name + name = name.trim(); + + // "sanitize" name: if it's invalid, return null and output message + name = ParameterValidation.sanitizeFromPatternWithHandler(name, ParameterValidation.XSS_CHECK, + new MessageValidationHandler(null, targetForErrorMessage, name)); + + // we got an invalid name, fail! + if (name == null) + { + return null; + } + + // Check for duplicate + if (isAlreadyExisting(name)) + { + beanContext.createTargetedErrorMessage(targetForErrorMessage, DUPLICATE, name, getLocalizedType()); + return null; + } + + return name; + } + } + + private String getLocalizedType() + { + return beanContext.getMessageFromBundle(getObjectTypeName()); + } + + protected abstract String getObjectTypeName(); + + public abstract boolean isAlreadyExisting(String objectName); + + /** + * @param oldValue + * @param newValue + * @return + * @todo public for test cases + */ + public boolean isOldAndNewDifferent(Object oldValue, Object newValue) + { + oldValue = normalizeStringIfNeeded(oldValue); + newValue = normalizeStringIfNeeded(newValue); + + return (oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null); + } + + /** + * Normalizes String by considering empty String as null as JSF would give either and trim non-null Strings. + * + * @param value + * @return + * @todo public for test cases + */ + public Object normalizeStringIfNeeded(Object value) + { + if (value == null) + { + return null; + } + else + { + if (value instanceof String) + { + String stringValue = (String)value; + return stringValue.length() == 0 ? null : stringValue.trim(); + } + else + { + return value; + } + } + } + + private class MessageValidationHandler extends ParameterValidation.ValidationErrorHandler + { + private String targetForErrorMessage; + private String validatedName; + + private MessageValidationHandler(String defaultValue, String targetForErrorMessage, String validatedName) + { + super(defaultValue); + this.targetForErrorMessage = targetForErrorMessage; + this.validatedName = validatedName; + } + + protected String internalValidationErrorHandling(String s) + { + beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, validatedName, getLocalizedType()); + return null; + } + } } Copied: branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/test/faces/ManagedBeanTestCase.java (from rev 12865, branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/test/faces/ManagedBeanTestCase.java) =================================================================== --- branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/test/faces/ManagedBeanTestCase.java (rev 0) +++ branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/test/faces/ManagedBeanTestCase.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -0,0 +1,71 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ + +package org.jboss.portal.test.faces; + +import junit.framework.TestCase; +import org.jboss.portal.faces.gui.ManagedBean; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class ManagedBeanTestCase extends TestCase +{ + private ManagedBean bean; + + @Override + protected void setUp() throws Exception + { + bean = new ManagedBean() + { + @Override + protected String getObjectTypeName() + { + return "test"; + } + + @Override + public boolean isAlreadyExisting(String objectName) + { + return false; + } + }; + } + + public void testNormalizeStringIfNeeded() + { + assertEquals("foo", bean.normalizeStringIfNeeded("foo")); + assertEquals("foo", bean.normalizeStringIfNeeded(" foo ")); + assertEquals("foo", bean.normalizeStringIfNeeded("\t\nfoo\t")); + assertNull(bean.normalizeStringIfNeeded(null)); + assertEquals(bean, bean.normalizeStringIfNeeded(bean)); + } + + public void testIsOldAndNewDifferent() + { + assertTrue(bean.isOldAndNewDifferent("foo", null)); + assertTrue(bean.isOldAndNewDifferent(null, "foo")); + assertFalse(bean.isOldAndNewDifferent(null, null)); + } +} Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -13,12 +13,12 @@ @Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.") public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase { - public static String casePfx = "e2e.wsrp."; + private static final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]"; - private final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]"; - public final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]"; + private static final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]"; + + public static String casePfx = "e2e.wsrp."; - private final String ADR_HOME = getProp(casePfx+"adr.home","portal/auth/portal/default"); private final String INP_CONSUMER_NAME = getProp(casePfx+"inp.consumer.name","//input[contains(@id,'edit-cons-form:id')]"); private final String SUBMIT_REFRESH_CANCEL = getProp(casePfx+"submit.refresh.cancel","//a[contains(@id,'edit-cons-form:list-cons-link')]"); private final String SUBMIT_PROD_SAVE = getProp(casePfx+"submit.prod.save","//input[contains(@id,'producer-form:save-producer')]"); @@ -87,23 +87,20 @@ /// def - private final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]"; - private final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]"; - private final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]"; - private final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]"; - private final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]"; - private final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]"; - private final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table"; - private final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]"; - private final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]"; - private final String LINK_ADMIN = "link=Admin"; - private final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]"; - private final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]"; + private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]"; + private static final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]"; + private static final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]"; + private static final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]"; + private static final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]"; + private static final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]"; + private static final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table"; + private static final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]"; + private static final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]"; + private static final String LINK_ADMIN = "link=Admin"; + private static final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]"; + private static final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]"; public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]"; - - public static int c = 0; - @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { logoutIfPossible(); @@ -125,28 +122,28 @@ String pageName = "default"; String defName= "BEA: Hello World"; String insName = "1BeaPor"; - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + createConsumer(consName); createInstance(defName, consName, insName); addPortlet(portalName, pageName, insName, "portlet"); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); - selenium.open(ADR_HOME); + + selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow")); Assert.assertTrue(selenium.isTextPresent("Welcome to WebLogic Portal WSRP Demo.")); } private void createConsumer(String consumerName){ - selenium.open(ADR_HOME); + selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=WSRP"); selenium.waitForPageToLoad(PAGE_LOAD); clickIfVisible(ID_LINK_CONSCONF); - + selenium.type(INPUT_CREATECONS, consumerName); selenium.click(SUBMIT_CREATECONS); @@ -156,23 +153,20 @@ selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL"); selenium.click(SUBMIT_REFRESHSAVE); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid).")); Assert.assertTrue(selenium.isTextPresent("Missing value")); selenium.type(INPUT_CONS_REGVALUE, "public"); selenium.click(SUBMIT_CONS_REGVAL); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); Assert.assertTrue(selenium.isTextPresent("Refresh was successful.")); selenium.click(SUBMIT_REFRESHFINAL); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); Assert.assertTrue(selenium.isTextPresent(consumerName)); } private void createInstance(String defName, String type, String insName){ - selenium.open(ADR_HOME); + selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); clickIfVisible(LINK_ADMIN); @@ -183,12 +177,12 @@ selenium.select(SEL_CONS_TYPE, "label="+type); selenium.click(SUB_VIEW_PORTLETS); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + int r = findTableRow(TABLE_PORTLET, defName, 0); selenium.click(MessageFormat.format(T_LINK_CREATE,r-1)); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + selenium.type(INPUT_INSTANCE_NAME, insName); selenium.click(SUBMIT_CREATE_INST); selenium.waitForPageToLoad(PAGE_LOAD); @@ -196,12 +190,12 @@ } private void addPortlet(String portalName, String pageName, String portletName, String type) { - selenium.open(ADR_HOME); + selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LNK_PORTALS_ID); clickIfVisible(LNK_PORTAL_HOME); @@ -209,7 +203,7 @@ int r = findTableRow(TBL_PORTAL_ADMIN, portalName, 0) - 1; selenium.click(MessageFormat.format(POR_TL_MAIN, r)); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + r = findTableRow(TBL_PORTALPAGE_ADMIN, pageName, 0) - 1; // click on the page layout @@ -220,7 +214,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + //hack selenium.select(SEL_PORTLET_TYPE, "label=" + "cms"); try { @@ -228,17 +222,17 @@ } catch (InterruptedException e) { e.printStackTrace(); } - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + selenium.select(SEL_PORTLET_TYPE, "label=" + type); try { Thread.sleep(5000); } catch (InterruptedException e) { e.printStackTrace(); } - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + selenium.click("link=*"+portletName+"*"); selenium.waitForPageToLoad(PAGE_LOAD); - debugScreenshot("debug_e2e_bea_"+ c++ +".jpg"); + selenium.click(SUB_LAYOUT_ADD_CENTER); selenium.waitForPageToLoad(PAGE_LOAD); Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-28 23:44:29 UTC (rev 13281) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-28 23:53:54 UTC (rev 13282) @@ -259,11 +259,12 @@ selenium.waitForPageToLoad(PAGE_LOAD); portletName = links[1]; } - + selenium.click("link=*" + portletName + "*"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(SUB_LAYOUT_ADD_CENTER); selenium.waitForPageToLoad(PAGE_LOAD); + }