[portal-commits] JBoss Portal SVN: r13490 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/main/org/jboss/portal/core/admin/ui/actions and 8 other directories.

Author: chris.laprun(a)jboss.com Date: 2009-06-23 11:59:30 -0400 (Tue, 23 Jun 2009) New Revision: 13490 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java Log: - Renamed ManagedBean.checkNameValidity to checkValidity as it's more correct. - JBPORTAL-2427: + PreferenceBean now validates value in setValue + inject beanContext in PortletManagerBean and InstanceManagerBean so that it can be made available to PreferenceBean via PreferencesBean + added error reporting in editPreferences.xhtml and fixed typo Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -86,7 +86,7 @@ public void setValue(Object value) { // it's currently quite difficult to retrieve the correct target for error messages, send them to "status" - String propertyValue = checkNameValidity(value.toString(), null); + String propertyValue = checkValidity(value.toString(), null); if (propertyValue != null && !inherited) { this.value = value.toString(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -28,6 +28,7 @@ import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.instance.InstanceDefinition; import org.jboss.portal.core.model.instance.NoSuchInstanceException; +import org.jboss.portal.faces.gui.BeanContext; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -108,6 +109,13 @@ /** . */ private AuthorizationBean auth = new InstanceAuthorizationBean(); + private transient BeanContext beanContext; + + public void setBeanContext(BeanContext beanContext) + { + this.beanContext = beanContext; + } + // Services accessors public RoleModule getRoleModule() @@ -218,7 +226,7 @@ { try { - selectedPrefs = new PreferencesBean(true); + selectedPrefs = new PreferencesBean(true, beanContext); // PreferencesInfo prefsInfo = selectedInstance.getPortlet().getInfo().getPreferences(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -20,12 +20,14 @@ * 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.logging.Logger; import org.jboss.portal.Mode; import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.faces.gui.BeanContext; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; @@ -124,6 +126,13 @@ /** . */ private transient FederatedPortletInvoker selectedPortletInvoker; + private transient BeanContext beanContext; + + public void setBeanContext(BeanContext beanContext) + { + this.beanContext = beanContext; + } + // Wired services public InstanceContainer getInstanceContainer() @@ -262,7 +271,7 @@ // If the portlet has preferences info then we display them if (prefsInfo != null) { - selectedPreferences = new PreferencesBean(false); + selectedPreferences = new PreferencesBean(false, beanContext); for (Iterator i = prefsInfo.getKeys().iterator(); i.hasNext();) { String key = (String)i.next(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -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. * @@ -25,8 +25,11 @@ import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.faces.el.dynamic.DynamicBean; +import org.jboss.portal.faces.gui.BeanContext; +import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.portlet.info.PreferenceInfo; +import javax.faces.el.EvaluationException; import javax.faces.event.ActionEvent; import java.util.ArrayList; import java.util.List; @@ -35,7 +38,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PreferenceBean implements Comparable, DynamicBean +public class PreferenceBean extends ManagedBean implements Comparable, DynamicBean { /** . */ @@ -62,13 +65,14 @@ /** . */ private boolean stale; - public PreferenceBean(PreferenceInfo prefInfo, List<String> value) + public PreferenceBean(PreferenceInfo prefInfo, List<String> value, BeanContext beanContext) { this.name = prefInfo.getKey(); this.readOnly = Boolean.TRUE.equals(prefInfo.isReadOnly()); this.displayName = prefInfo.getDisplayName(); this.description = prefInfo.getDescription(); this.value = value; + setBeanContext(beanContext); } public String getName() @@ -197,16 +201,36 @@ public boolean setValue(Object propertyName, Object value) throws IllegalArgumentException { + // if the value is invalid, throw an EvaluationException to prevent upstream processing... if (propertyName instanceof String) { + String stringValue = (String)value; String s = (String)propertyName; + if (s.startsWith("index_")) { int index = Integer.parseInt(s.substring(6)); - this.value.set(index, (String)value); - stale = true; - return true; + stringValue = checkValidity(stringValue, "common-edit-existing-form:pref-input-" + index); + + if (stringValue != null) + { + this.value.set(index, stringValue); + stale = true; + return true; + } + else + { + throw new EvaluationException("Invalid preference value: " + value); + } } + else + { + stringValue = checkValidity(stringValue, "common-append-form:new_value"); + if (stringValue == null) + { + throw new EvaluationException("Invalid preference value: " + value); + } + } } return false; } @@ -216,4 +240,14 @@ PreferenceBean that = (PreferenceBean)o; return name.compareTo(that.name); } + + protected String getObjectTypeName() + { + return "PREFERENCE_TYPE"; + } + + public boolean isAlreadyExisting(String objectName) + { + return false; // not used + } } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -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,6 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import org.jboss.portal.faces.gui.BeanContext; import org.jboss.portal.portlet.info.PreferenceInfo; import java.util.ArrayList; @@ -43,12 +44,14 @@ /** . */ private boolean mutable; + private BeanContext beanContext; - public PreferencesBean(boolean mutable) + public PreferencesBean(boolean mutable, BeanContext beanContext) { this.entries = new ArrayList(); this.selectedIndex = -1; this.mutable = mutable; + this.beanContext = beanContext; } public boolean isMutable() @@ -92,7 +95,7 @@ } // - addEntry(new PreferenceBean(prefInfo, null)); + addEntry(new PreferenceBean(prefInfo, null, beanContext)); } public void addEntry(PreferenceInfo prefInfo, List<String> value) @@ -103,7 +106,7 @@ } // - addEntry(new PreferenceBean(prefInfo, value)); + addEntry(new PreferenceBean(prefInfo, value, beanContext)); } private void addEntry(PreferenceBean pref) Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -125,7 +125,7 @@ if (!ParameterValidation.isNullOrEmpty(propertyValue)) { // it's currently quite difficult to retrieve the correct target for error messages, send them to "status" - propertyValue = checkNameValidity(propertyValue, null); + propertyValue = checkValidity(propertyValue, null); } if (propertyValue != null) Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -53,7 +53,7 @@ public void execute() { - pageName = checkNameValidity(pageName, messageTarget); + pageName = checkValidity(pageName, messageTarget); if (pageName != null) { try Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -84,7 +84,7 @@ public String execute() { // Validate instance id - instanceId = checkNameValidity(instanceId, MESSAGE_TARGET); + instanceId = checkValidity(instanceId, MESSAGE_TARGET); if (instanceId == null) { return null; Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -28,8 +28,8 @@ 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.BeanContext; import org.jboss.portal.faces.gui.ManagedBean; -import org.jboss.portal.faces.gui.BeanContext; import java.util.Collection; import java.util.HashMap; @@ -109,7 +109,7 @@ boolean directResolved = beanContext.isTargetResolved(DISPLAY_NAME_DIRECT); boolean inViewResolved = beanContext.isTargetResolved(DISPLAY_NAME_IN_VIEW); - if(directResolved) + if (directResolved) { errorMessageTarget = DISPLAY_NAME_DIRECT; } @@ -122,7 +122,7 @@ errorMessageTarget = BeanContext.STATUS; } - newText = checkNameValidity(newText, errorMessageTarget); + newText = checkValidity(newText, errorMessageTarget); if (newText != null) { HasDisplayName hasDisplayName = getTarget(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -104,7 +104,7 @@ { PortalContainer portalContainer = (PortalContainer)pomgr.getSelectedObject(); - portalName = checkNameValidity(portalName, MESSAGE_TARGET); + portalName = checkValidity(portalName, MESSAGE_TARGET); if (portalName != null) { Portal portal = portalContainer.createPortal(portalName); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -97,7 +97,7 @@ String propertyName = null; if (!ParameterValidation.isNullOrEmpty(otherPropertyName)) { - propertyName = checkNameValidity(otherPropertyName, "common-edit-prop-form:property"); + propertyName = checkValidity(otherPropertyName, "common-edit-prop-form:property"); } else { Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -93,7 +93,7 @@ return null; } - newName = checkNameValidity(newName, MESSAGE_TARGET); + newName = checkValidity(newName, MESSAGE_TARGET); if (newName != null) { PortalObject parent = renamedObject.getParent(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -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.common; import org.jboss.portal.Mode; @@ -294,7 +295,7 @@ } else { - windowName = checkNameValidity(windowName, "windowForm:windowName"); + windowName = checkValidity(windowName, "windowForm:windowName"); if (windowName == null) { throw new AbortProcessingException("Duplicate window name!"); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -141,7 +141,7 @@ { if (isOldAndNewDifferent(oldName, newName)) { - if (checkNameValidity(newName, "renameForm:newName") != null) + if (checkValidity(newName, "renameForm:newName") != null) { try { @@ -170,7 +170,7 @@ { String nameForMessages = getObjectNameForMessages(); String target = "create-" + nameForMessages + "-form:" + getAdditionalFormId() + nameForMessages + "Name"; - if (checkNameValidity(getBeanName(), target) != null) + if (checkValidity(getBeanName(), target) != null) { try { Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-06-23 15:59:30 UTC (rev 13490) @@ -340,6 +340,7 @@ PROPERTY_TYPE=property PORTAL_OBJECT_TYPE=portal object WINDOW_TYPE=window +PREFERENCE_TYPE=preference MAKE_DEFAULT_SUCCESS= ''{0}'' {1} was successfully set as default {1} DESTROY_SUCCESS=''{0}'' has successfully been destroyed Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-06-23 15:59:30 UTC (rev 13490) @@ -215,6 +215,11 @@ <property-name>paginationSize</property-name> <value>20</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> <!-- The portlet manager managed bean --> @@ -246,6 +251,11 @@ <property-name>paginationSize</property-name> <value>20</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> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2009-06-23 15:59:30 UTC (rev 13490) @@ -1,3 +1,26 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -5,11 +28,11 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<c:choose> - <c:when test="#{not empty prefs.entries}"> - <h:form id="common-edit-pref-form"> - <table class="full-width datatable"> - <thead class="portlet-section-header" style="text-align:left;"> + <c:choose> + <c:when test="#{not empty prefs.entries}"> + <h:form id="common-edit-pref-form"> + <table class="full-width datatable"> + <thead class="portlet-section-header" style="text-align:left;"> <tr> <th>#{bundle.COMMON_KEY}</th> <th>#{bundle.COMMON_NAME}</th> @@ -18,16 +41,16 @@ <th>#{bundle.COMMON_VALUE}</th> </c:if> </tr> - </thead> - <tbody> + </thead> + <tbody> <c:forEach items="#{prefs.entries}" var="pref" varStatus="status"> <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <td> <c:choose> <c:when test="#{prefs.mutable and pref.readOnly == false}"> <h:commandLink id="pref-link-#{status.index}" - rendered="#{pref.readOnly == false}" - action="#{pref.select}">#{pref.name}</h:commandLink> + rendered="#{pref.readOnly == false}" + action="#{pref.select}">#{pref.name}</h:commandLink> </c:when> <c:otherwise>#{pref.name}</c:otherwise> </c:choose> @@ -36,7 +59,8 @@ <h:outputText value="#{pref.displayName.value}"/> </td> <td> - <h:selectBooleanCheckbox id="pref-check-#{status.index}" disabled="true" value="#{pref.readOnly}"/> + <h:selectBooleanCheckbox id="pref-check-#{status.index}" disabled="true" + value="#{pref.readOnly}"/> </td> <c:if test="#{prefs.mutable}"> <td> @@ -45,30 +69,32 @@ </c:if> </tr> </c:forEach> - </tbody> - </table> - </h:form> - </c:when> - <c:otherwise> - <p>#{bundle.COMMON_NO_DEFINED_PREFERENCES}.</p> - </c:otherwise> -</c:choose> + </tbody> + </table> + </h:form> + </c:when> + <c:otherwise> + <p>#{bundle.COMMON_NO_DEFINED_PREFERENCES}.</p> + </c:otherwise> + </c:choose> -<c:if test="#{prefs.selectedEntry != null}"> - <h:form id="common-edit-exisiting-form" style="padding: 1em 0 1em 0"> - <fieldset style="border: 1px solid;"> - <legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend> - <table> - <tbody> + <c:if test="#{prefs.selectedEntry != null}"> + <h:form id="common-edit-existing-form" style="padding: 1em 0 1em 0"> + <fieldset style="border: 1px solid;"> + <legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend> + <table> + <tbody> <c:forEach items="#{prefs.selectedEntry.indices}" var="index" varStatus="status"> <tr> <td> <h:outputLabel for="row_#{status.index}"> - <h:outputText value="#{bundle.COMMON_VALUE} #{status.index}: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_VALUE} #{status.index}: " + styleClass="portlet-form-field-label"/> </h:outputLabel> </td> <td> - <h:inputText id="pref-input-#{status.index}" value="#{prefs.selectedEntry[index]}" styleClass="portlet-form-input-field"/> + <h:inputText id="pref-input-#{status.index}" value="#{prefs.selectedEntry[index]}" + styleClass="portlet-form-input-field"/> </td> <td> <h:commandButton @@ -76,6 +102,7 @@ actionListener="#{prefs.selectedEntry.deleteLine}" value="#{bundle.COMMON_DELETE}" styleClass="portlet-form-button"/> + <h:message for="pref-input-#{status.index}" errorClass="portlet-msg-error"/> </td> </tr> </c:forEach> @@ -84,23 +111,25 @@ <h:commandButton id="update" value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </td> </tr> - </tbody> - </table> - </fieldset> - </h:form> + </tbody> + </table> + </fieldset> + </h:form> - <h:form id="common-append-form"> - <fieldset style="border: 1px solid;"> - <legend>#{bundle.COMMON_APPEND_VALUE}</legend> - <h:outputLabel for="new_value"> - <h:outputText value="#{bundle.COMMON_NEW_VALUE}: " styleClass="portlet-form-field-label"/> - </h:outputLabel> - <h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/> - <h:commandButton id="append-button" action="#{prefs.selectedEntry.appendLine}" value="#{bundle.COMMON_APPEND}" - styleClass="portlet-form-button"/> - </fieldset> - </h:form> + <h:form id="common-append-form"> + <fieldset style="border: 1px solid;"> + <legend>#{bundle.COMMON_APPEND_VALUE}</legend> + <h:outputLabel for="new_value"> + <h:outputText value="#{bundle.COMMON_NEW_VALUE}: " styleClass="portlet-form-field-label"/> + </h:outputLabel> + <h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/> + <h:commandButton id="append-button" action="#{prefs.selectedEntry.appendLine}" + value="#{bundle.COMMON_APPEND}" + styleClass="portlet-form-button"/> + <h:message for="new_value" errorClass="portlet-msg-error"/> + </fieldset> + </h:form> -</c:if> + </c:if> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -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.identity.ui.actions; import org.jboss.portal.core.identity.ui.UIRole; @@ -39,10 +40,10 @@ { String name = this.uiRole.getName(); String displayName = this.uiRole.getDisplayName(); - name = checkNameValidity(name, "create-role-form:rolename"); + name = checkValidity(name, "create-role-form:rolename"); // check display name validity for XSS injection but check duplicate separately due to limitation to how ManagedBean works - displayName = checkNameValidity(displayName, "create-role-form:roledisplayname", displayNameValidator); + displayName = checkValidity(displayName, "create-role-form:roledisplayname", displayNameValidator); if (name != null && displayName != null) { Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -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.identity.ui.actions; import org.jboss.portal.common.text.FastURLDecoder; @@ -73,7 +74,7 @@ log.error("Couldn't get current role " + roleDisplayName); } - roleDisplayName = checkNameValidity(roleDisplayName, "edit-role-link:display-name", displayNameValidator); // display names are unique as well + roleDisplayName = checkValidity(roleDisplayName, "edit-role-link:display-name", displayNameValidator); // display names are unique as well if (roleDisplayName != null) { try Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -128,7 +128,7 @@ // need to check that the new id is valid if (isOldAndNewDifferent(oldId, id)) { - id = checkNameValidity(id, "edit-cons-form:id"); + id = checkValidity(id, "edit-cons-form:id"); if (id != null) { info.setId(id); Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -173,7 +173,7 @@ public String createConsumer() { - selectedId = checkNameValidity(selectedId, MESSAGE_TARGET); + selectedId = checkValidity(selectedId, MESSAGE_TARGET); if (selectedId != null) { try Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -148,7 +148,7 @@ public void setRegistrationPolicyClassName(String className) { - className = checkNameValidity(className, "producer-form:registrationPolicy"); + className = checkValidity(className, "producer-form:registrationPolicy"); if (className != null) { policyClassName = className; @@ -176,7 +176,7 @@ public void setValidatorClassName(String className) { - className = checkNameValidity(className, "producer-form:validator"); + className = checkValidity(className, "producer-form:validator"); if (className != null) { validatorClassName = className; Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-06-23 14:48:15 UTC (rev 13489) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-06-23 15:59:30 UTC (rev 13490) @@ -73,31 +73,31 @@ this.beanContext = beanContext; } - public String checkNameValidity(String name, String targetForErrorMessage) + public String checkValidity(String value, String targetForErrorMessage) { - return checkNameValidity(name, targetForErrorMessage, validator); + return checkValidity(value, targetForErrorMessage, validator); } - public String checkNameValidity(String name, String targetForErrorMessage, PropertyValidator validator) + public String checkValidity(String value, String targetForErrorMessage, PropertyValidator validator) { ParameterValidation.throwIllegalArgExceptionIfNull(validator, "PropertyValidator"); String objectTypeName = validator.getObjectTypeName(); - if (ParameterValidation.isNullOrEmpty(name)) + if (ParameterValidation.isNullOrEmpty(value)) { - beanContext.createTargetedErrorMessage(targetForErrorMessage, validator.getErrorMessageKey(), name, getLocalizedType(objectTypeName)); + beanContext.createTargetedErrorMessage(targetForErrorMessage, validator.getErrorMessageKey(), value, getLocalizedType(objectTypeName)); return null; } else { - String original = name; + String original = value; // Trim name - name = name.trim(); + value = value.trim(); // we got an invalid name after simple checks, fail! - name = validator.doSimpleChecks(name); - if (name == null) + value = validator.doSimpleChecks(value); + if (value == null) { beanContext.createTargetedErrorMessage(targetForErrorMessage, validator.getErrorMessageKey(), original, getLocalizedType(objectTypeName)); return null; @@ -105,23 +105,23 @@ // "sanitize" name: if it's invalid, return null and output message - name = ParameterValidation.sanitizeFromPatternWithHandler(name, validator.getValidationPattern(), - validator.getValidationErrorHandler(name, targetForErrorMessage)); + value = ParameterValidation.sanitizeFromPatternWithHandler(value, validator.getValidationPattern(), + validator.getValidationErrorHandler(value, targetForErrorMessage)); // we got an invalid name, fail! - if (name == null) + if (value == null) { return null; } // Check for duplicate - if (validator.checkForDuplicates() && validator.isAlreadyExisting(name)) + if (validator.checkForDuplicates() && validator.isAlreadyExisting(value)) { - getDuplicateErrorMessage(name, targetForErrorMessage, objectTypeName); + getDuplicateErrorMessage(value, targetForErrorMessage, objectTypeName); return null; } - return name; + return value; } }