[portal-commits] JBoss Portal SVN: r12969 - in branches/JBoss_Portal_AS5_Deployer/core-admin: src/bin/portal-admin-war/css and 10 other directories.

Author: mwringe Date: 2009-03-06 18:20:57 -0500 (Fri, 06 Mar 2009) New Revision: 12969 Added: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/minus.gif branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/plus.gif branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml Log: Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath 2009-03-06 23:20:57 UTC (rev 12969) @@ -23,6 +23,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/> + <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -95,11 +95,10 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="sun.jsf.classpath"/> + <path refid="glassfish.jsf.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="el.el.classpath"/> - <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> <path refid="jboss/portlet.bridge.classpath"/> @@ -149,10 +148,10 @@ <pathelement location="${project.tools}/lib/explode.jar"/> <path refid="apache.ant.classpath"/> </path> - <taskdef - name="explode" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> </target> <!--+====================================================================+--> @@ -189,28 +188,25 @@ <!-- portal-admin.war --> <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib"> - <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/> + <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/> <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> - </copy> - <copy todir="${build.resources}/portal-admin-war"> - <fileset dir="${source.bin}/portal-admin-war"/> - </copy> + </copy> + <copy todir="${build.resources}/portal-admin-war"> + <fileset dir="${source.bin}/portal-admin-war"/> + </copy> <!-- portal-admin.sar --> <copy todir="${build.resources}/portal-admin.sar"> <fileset dir="${build.resources}/portal-admin-sar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/lib"> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/portal-admin.war"> @@ -285,8 +281,8 @@ <target name="deploy-ha" description="Deploy." depends="output"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy file="${build.lib}/portal-admin.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" - overwrite="true"/> - </target> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy file="${build.lib}/portal-admin.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" + overwrite="true"/> + </target> </project> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css 2009-03-06 23:20:57 UTC (rev 12969) @@ -79,6 +79,14 @@ margin: 10px 0 10px 0; } +.tenpx-bottom { + margin: 0 0 10px 0; +} + +.tenpx-top { + margin: 10px 0 0 0; +} + .tenpx-right { margin: 0 10px 0 0; } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css 2009-03-06 23:20:57 UTC (rev 12969) @@ -623,7 +623,6 @@ .details-header ul li { float: left; list-style: none; - height: 16px; padding: 0 0 0 3px; } @@ -697,6 +696,11 @@ /*--------------------------- Coordination admin */ +div.coordination-section { + border: 1px solid #ccc; + padding: 0 3px 3px 3px; +} + ul.bindingList { margin: 0; padding: 0; Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/minus.gif (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/minus.gif) =================================================================== (Binary files differ) Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/plus.gif (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/plus.gif) =================================================================== (Binary files differ) Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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; @@ -35,7 +36,6 @@ import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.ContentProvider; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObject; @@ -45,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; @@ -64,7 +65,6 @@ import javax.xml.namespace.QName; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -139,15 +139,6 @@ private final AuthorizationBean auth = new PortalObjectAuthorizationBean(); /** . */ - private SelectItem[] instanceItems; - - /** . */ - private SelectItem[] portalPageItems; - - /** . */ - private SelectItem[] portalItems; - - /** . */ private List selectedObjectPath; /** . */ @@ -369,21 +360,6 @@ return auth; } - public SelectItem[] getInstanceItems() - { - return instanceItems; - } - - public SelectItem[] getPortalPageItems() - { - return portalPageItems; - } - - public SelectItem[] getPortalItems() - { - return portalItems; - } - public List getSelectedObjectPath() { return selectedObjectPath; @@ -494,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); } } @@ -567,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); } @@ -659,9 +635,6 @@ public void refresh() { propertyAction = null; - instanceItems = null; - portalPageItems = null; - portalItems = null; selectedObjectPath = null; selectedObject = null; selectedProperties = null; @@ -682,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; } @@ -690,33 +665,14 @@ // 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); - // - Collection<PortalObject> portals = getSelectedObject().getChildren(PortalObject.PORTAL_MASK); - ArrayList<SelectItem> portalList = new ArrayList<SelectItem>(portals.size() + 1); - for (PortalObject portal : portals) - { - portalList.add(new SelectItem(portal.getName())); - } - portalList.add(new SelectItem("", "no selection")); - portalItems = portalList.toArray(new SelectItem[portalList.size()]); - - // - Collection<PortalObject> pages = getSelectedObject().getChildren(PortalObject.PAGE_MASK); - ArrayList<SelectItem> list = new ArrayList<SelectItem>(pages.size() + 1); - for (PortalObject page : pages) - { - SelectItem item = new SelectItem(page.getName()); - list.add(item); - } - list.add(new SelectItem("", "no selection")); - portalPageItems = list.toArray(new SelectItem[list.size()]); - - // PortalObject o = getSelectedObject(); ArrayList<PortalObject> path = new ArrayList<PortalObject>(); while (o != null) @@ -726,17 +682,6 @@ } Collections.reverse(path); selectedObjectPath = path; - - // rather dirty code... - List tmp = new ArrayList(instanceContainer.getDefinitions()); - Collections.sort(tmp, InstanceManagerBean.INSTANCE_COMPARATOR); - for (int i = 0; i < tmp.size(); i++) - { - Instance instance = (Instance)tmp.get(i); - SelectItem item = new SelectItem(instance.getId()); - tmp.set(i, item); - } - instanceItems = (SelectItem[])tmp.toArray(new SelectItem[tmp.size()]); } public void processEvent(ActionEvent event) @@ -819,10 +764,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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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,13 +39,14 @@ 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; @@ -67,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"); @@ -83,7 +84,6 @@ /** . */ private static final int ADD_ACTION = 'a'; - private static final String VIEW_ROOT = ":_viewRoot"; public PageManagerBean(LayoutService layoutService, PortletInvoker portletInvoker) { @@ -112,18 +112,30 @@ public String selectedContentURI; /** . */ - private Map<String,String> selectedContentParameters; + private Map<String, String> selectedContentParameters; /** . */ public Map selectedRenderParameters; + UIInput windowName = null; + + public UIInput getWindowName() + { + return windowName; + } + + public void setWindowName(UIInput windowName) + { + this.windowName = windowName; + } + public String getNamespace() { - return FacesContext.getCurrentInstance().getExternalContext().encodeNamespace("") + VIEW_ROOT; + return windowName.getClientId(FacesContext.getCurrentInstance()); } public List getContentTypeItems() - { + { LinkedList<SelectItem> types = new LinkedList<SelectItem>(); for (Object o : ContentProviderRegistryService.getInstance().getContentTypes()) { @@ -145,7 +157,7 @@ public ContentType getSelectedContentType() { - return selectedContentType; + return selectedContentType; } public void setSelectedContentType(ContentType selectedContentType) @@ -262,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; @@ -270,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!"); + } } // @@ -298,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); @@ -322,7 +334,7 @@ tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); } - this.windowName = ""; + this.windowName.setValue(""); } catch (DuplicatePortalObjectException unexpected) { @@ -331,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) @@ -369,18 +378,6 @@ assignedWindows.values.clear(); } - private String windowName; - - public String getWindowName() - { - return windowName; - } - - public void setWindowName(String windowName) - { - this.windowName = windowName; - } - /** Portlet event */ public void assignWindow(ActionEvent event) { @@ -393,7 +390,7 @@ String[] windowNames = ((String[])renderParams.get("windowName")); if (windowNames != null && windowNames.length > 0) { - setWindowName(windowNames[0]); + windowName.setValue(windowNames[0]); } } else if (event instanceof PortletEventEvent) @@ -402,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) @@ -555,4 +552,14 @@ return true; } } + + protected String getObjectTypeName() + { + return "WINDOW_TYPE"; + } + + public boolean isAlreadyExisting(String objectName) + { + return page.getWindow(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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. * @@ -34,6 +34,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; @@ -115,7 +116,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 @@ -147,7 +150,7 @@ defaultPageName = PortalObject.DEFAULT_OBJECT_NAME; } selectePageIsDefault = selectedPageName.equals(defaultPageName); - + // Collection pages = userPortal.getChildren(PortalObject.PAGE_MASK); pageItems = new SelectItem[pages.size()]; @@ -199,7 +202,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/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-03-06 23:20:57 UTC (rev 12969) @@ -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 @@ -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 Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,328 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# This is free software; you can redistribute it and/or modify it # +# under the terms of the GNU Lesser General Public License as # +# published by the Free Software Foundation; either version 2.1 of # +# the License, or (at your option) any later version. # +# # +# This software is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# Lesser General Public License for more details. # +# # +# You should have received a copy of the GNU Lesser General Public # +# License along with this software; if not, write to the Free # +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # +################################################################################ + +PORTLET_INSTANCES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9 +INSTANCE_DELETE=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u524a\u9664 +PORTLET_CAUSING_REFERENCING_NOT_ABLE=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u30a6\u30a3\u30f3\u30c9\u30a6\u53c2\u7167\u3092\u767a\u751f\u3055\u305b\u3066\u304a\u308a\u3001\u3053\u308c\u3089\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u8868\u793a\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093 +ARE_YOU_SURE_DELETE=\u672c\u5f53\u306b\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f +DASHBOARD_THEME_PROPERTIES=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 \u30c6\u30fc\u30de \u30d7\u30ed\u30d1\u30c6\u30a3 +CONFIGURE_DASHBOARD_SETTINGS=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u306e\u8a2d\u5b9a +DASHBOARDS=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 +ADD_DISPLAY_NAMES=\u8868\u793a\u540d\u306e\u8ffd\u52a0 +CURRENT_DISPLAY_NAMES=\u73fe\u5728\u306e\u8868\u793a\u540d +SAVE=\u4fdd\u5b58 +MANAGE=\u7ba1\u7406 +PORTALS_NO_CAP=\u30dd\u30fc\u30bf\u30eb +PORTAL=\u30dd\u30fc\u30bf\u30eb +SUB_PORTALS=\u30b5\u30d6\u30dd\u30fc\u30bf\u30eb +PAGES_WITHIN=\u30da\u30fc\u30b8\u5185\u90e8 +CREATE_PORTAL_NAMED=\u65b0\u898f\u30dd\u30fc\u30bf\u30eb\u4f5c\u6210 \u540d\u524d: +PAGE_LAYOUT=\u30da\u30fc\u30b8\u30ec\u30a4\u30a2\u30a6\u30c8 +SECURITY=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 +THEME=\u30c6\u30fc\u30de +RENAME=\u540d\u524d\u5909\u66f4 +DISPLAY_NAMES=\u8868\u793a\u540d +MANAGE_SUB_PAGES_WITHIN=\u30b5\u30d6\u30da\u30fc\u30b8\u306e\u7ba1\u7406 \u89aa\u30da\u30fc\u30b8: +CREATE_PAGE_NAMED=\u65b0\u898f\u30da\u30fc\u30b8\u4f5c\u6210 \u540d\u524d: +SET_PAGE_PERMISSIONS=\u30da\u30fc\u30b8\u306e\u6a29\u9650\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +PAGE_THEME_PROPERTIES=\u30da\u30fc\u30b8\u30c6\u30fc\u30de\u30d7\u30ed\u30d1\u30c6\u30a3 +SET_PORTAL_PERMISSIONS=\u30dd\u30fc\u30bf\u30eb\u306e\u6a29\u9650\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +PORTAL_THEME_PROPERTIES=\u30dd\u30fc\u30bf\u30eb\u30c6\u30fc\u30de\u30d7\u30ed\u30d1\u30c6\u30a3 +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=\u3053\u308c\u3089\u306e\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u306f\u3001\u3059\u3079\u3066\u306e\u30da\u30fc\u30b8\u3068\u30dd\u30fc\u30bf\u30eb\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3088\u3063\u3066\u53d7\u3051\u7d99\u304c\u308c\u307e\u3059\u3002\u3042\u306a\u305f\u306f\u3001\u305d\u308c\u305e\u308c\u306e\u30c6\u30fc\u30de\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u30da\u30fc\u30b8\u306e\u4e0a\u3067\u9069\u5f53\u306a\u5024\u3092\u9078\u3076\u3053\u3068\u306b\u3088\u3063\u3066\u3001\u3053\u308c\u3089\u306e\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u3092\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3059\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093 +EVENT_LISTENER_BINDING=\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u30fc\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +CHOOSE_ID_PORTALEVENTLISTENER=\u30d0\u30a4\u30f3\u30c9\u3059\u308b\u305f\u3081\u306ePortalEventListener\u306eID\u3092\u9078\u3093\u3067\u304f\u3060\u3055\u3044\u3002 +SET_PERMISSIONS_FOR=\u30d1\u30fc\u30df\u30b7\u30e7\u30f3\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044: +WINDOW_NO_CAP=\u30a6\u30a3\u30f3\u30c9\u30a6 +WINDOW_THEME_PROPERTIES=\u30a6\u30a3\u30f3\u30c9\u30a6\u30c6\u30fc\u30de\u30d7\u30ed\u30d1\u30c6\u30a3 +INSTANCE_ID=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9ID +INSTANCE_NAME=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u540d +ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +PREFERENCES=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 +PORTLET_DETAILS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u8a73\u7d30 +ASSOCIATED_PORTLET_NOT_AVAILABLE=\u9023\u643a\u3059\u308b\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +PREFERENCES_NO_CAP=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 +SECURITY_SETTINGS=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a2d\u5b9a +MAKE_DEFAULT=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u4f5c\u6210 +MANAGE_WINDOWS_WITHIN=\u7ba1\u7406\u30a6\u30a3\u30f3\u30c9\u30a6\u5185 +PORTAL_OBJECTS=\u30dd\u30fc\u30bf\u30eb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 +PORTALS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +PORTLET_NAME=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u540d +DESCRIPTION=\u8aac\u660e +REMOTE=Remote +REMOTABLE=Remotable +CREATE_INSTANCE=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4f5c\u6210 +PORTLET_DEFINITIONS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u5b9a\u7fa9 +DETAILS=\u8a73\u7d30 +INSTANCE_CREATION=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4f5c\u6210 +CREATE_INSTANCE_NAMED=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4f5c\u6210 \u540d\u524d: +RENAME_THE=\u540d\u524d\u306e\u5909\u66f4: +TO=to +THIS_MINIMIZED_STATE=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u6700\u5c0f\u306b\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002 +THIS_NORMAL_STATE=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u30ce\u30fc\u30de\u30eb\u306b\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002 +THIS_MAXIMIZED_STATE=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u6700\u5927\u306b\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002 +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=\u3053\u306e\u30da\u30fc\u30b8\u5185\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u6700\u5927\u5316\u3059\u308b\u3088\u3046\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u6700\u5c0f\u5316\u3055\u308c\u307e\u3059\u3002 +SWITCH_TO_WIZARD_MODE=\u30a6\u30a3\u30b6\u30fc\u30c9\u30e2\u30fc\u30c9\u3078\u5909\u66f4 +CREATE_PORTAL=\u30dd\u30fc\u30bf\u30eb\u306e\u4f5c\u6210 +CREATE_PAGE=\u30da\u30fc\u30b8\u306e\u4f5c\u6210 +DEFAULT=\u30c7\u30d5\u30a9\u30eb\u30c8 +WINDOW=Window +VIEW_PORTLETS_PROVIDED_BY=\u8868\u793a\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u547d\u540d\u3055\u308c\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002 +VIEW_PORTLETS=\u8868\u793a\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 + +COMMON_INCONSISTENT_STATE=\u4e0d\u6574\u5408\u306a\u72b6\u614b +COMMON_DELETE=\u524a\u9664 +COMMON_DELETING=\u8b66\u544a! \u524a\u9664\u3055\u308c\u307e\u3059: +COMMON_FROM=from the +COMMON_SURE_DELETE=\u672c\u5f53\u306b\u524a\u9664\u3057\u3066\u3088\u308d\u3057\u3044\u3067\u3059\u304b? : +COMMON_ERROR_HANDLING=\u30da\u30fc\u30b8\u30a8\u30e9\u30fc\u30cf\u30f3\u30c9\u30ea\u30f3\u30b0 +COMMON_CONFIGURE_ERRORS=\u30b7\u30b9\u30c6\u30e0\u304c\u30da\u30fc\u30b8\u30ec\u30d9\u30eb\u3067\u30a8\u30e9\u30fc\u3092\u30cf\u30f3\u30c9\u30eb\u3059\u308b\u65b9\u6cd5\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044 +COMMON_CASE=\u30b1\u30fc\u30b9 +COMMON_INHERITANCE=\u7d99\u627f +COMMON_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3 +COMMON_INHERIT_ACTION=\u89aa\u304b\u3089\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u7d99\u627f\u3059\u308b +COMMON_CONTENT_DEFINITION=\u30b3\u30f3\u30c6\u30f3\u30c4\u5b9a\u7fa9 +COMMON_DEFINE_NAME_WINDOW=\u30b3\u30f3\u30c6\u30f3\u30c4\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u540d\u524d\u3092\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044(\u30aa\u30d7\u30b7\u30e7\u30f3) +COMMON_WINDOW_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u540d +COMMON_SELECT_TYPE_CONTENT=\u30da\u30fc\u30b8\u306b\u8ffd\u52a0\u3059\u308b\u30b3\u30f3\u30c6\u30f3\u30c8\u306e\u30bf\u30a4\u30d7\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +COMMON_CONTENT_TYPE=\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30a4\u30d7 +COMMON_SELECT_CONTENT=\u30da\u30fc\u30b8\u306b\u8ffd\u52a0\u3059\u308b\u30b3\u30f3\u30c6\u30f3\u30c8\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +COMMON_PAGE_LAYOUT=\u30da\u30fc\u30b8\u30ec\u30a4\u30a2\u30a6\u30c8 +COMMON_REGION=\u30ea\u30fc\u30b8\u30e7\u30f3 +COMMON_UNASSIGNED_WINDOW=\u30a2\u30b5\u30a4\u30f3\u3055\u308c\u3066\u3044\u306a\u3044\u30a6\u30a3\u30f3\u30c9\u30a6 +COMMON_PORTAL_ERROR_HANDLING=\u30dd\u30fc\u30bf\u30eb\uff06\u30da\u30fc\u30b8 \u30a8\u30e9\u30fc\u30cf\u30f3\u30c9\u30ea\u30f3\u30b0 +COMMON_PORTAL_CONFIGURE_ERRORS=\u30dd\u30fc\u30bf\u30eb\u30ec\u30d9\u30eb\u3067\u30b7\u30b9\u30c6\u30e0\u304c\u30a8\u30e9\u30fc\u3092\u30cf\u30f3\u30c9\u30eb\u3059\u308b\u65b9\u6cd5\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +COMMON_KEY=\u30ad\u30fc +COMMON_NAME=\u540d\u524d +COMMON_READONLY=ReadOnly +COMMON_VALUE=\u5024 +COMMON_NO_DEFINED_PREFERENCES=\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 +COMMON_EDIT_EXISTING_VALUES=\u73fe\u5728\u306e\u5024\u3092\u7de8\u96c6 +COMMON_APPEND_VALUE=\u5024\u3092\u8ffd\u52a0 +COMMON_PROPERTIES=\u30d7\u30ed\u30d1\u30c6\u30a3 +COMMON_ADD_PROPERTY=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0 +COMMON_SELECT_PREDEFINED_PROPERTY=\u5b9a\u7fa9\u3055\u308c\u305f\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u9078\u629e +COMMON_OR=or +COMMON_ENTER_PROPERTY_NAME=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u306e\u5165\u529b +COMMON_MANAGE_PROPERTIES=\u73fe\u5728\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u7ba1\u7406 +COMMON_DESCRIPTION=\u8aac\u660e +COMMON_INHERITED=\u7d99\u627f +COMMON_YES=\u306f\u3044 +COMMON_NO=\u3044\u3044\u3048 +COMMON_ROLES=\u30ed\u30fc\u30eb +COMMON_PERMISSIONS=\u6a29\u9650 +COMMON_ROLE=\u30ed\u30fc\u30eb +COMMON_SETTING=\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0 +COMMON_LAYOUT=\u30ec\u30a4\u30a2\u30a6\u30c8 +COMMON_NAME_LAYOUT_IMPLEMENTATION=\u30da\u30fc\u30b8\u3067\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u914d\u7f6e\u3059\u308b\u306e\u306b\u7528\u3044\u3089\u308c\u308b\u30ec\u30a4\u30a2\u30a6\u30c8\u30a4\u30f3\u30d7\u30ea\u30e1\u30f3\u30c6\u30fc\u30b7\u30e7\u30f3\u306e\u540d\u524d +COMMON_THEME=\u30c6\u30fc\u30de +COMMON_NAME_LOOK_AND_FEEL=\u5229\u7528\u3059\u308b\u30eb\u30c3\u30af\uff06\u30d5\u30a3\u30fc\u30eb\u306e\u540d\u524d +COMMON_RENDERSET=\u30ec\u30f3\u30c0\u30bb\u30c3\u30c8 +COMMON_NAME_RENDER_ENGINE_PAGES=\u30ec\u30f3\u30c0\u30fc\u30da\u30fc\u30b8\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_WINDOW_RENDERER=\u30a6\u30a3\u30f3\u30c9\u30a6\u30ec\u30f3\u30c0\u30e9\u30fc +COMMON_NAME_RENDER_ENGINE_WINDOWS=\u30ec\u30f3\u30c0\u30fc\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_DECORATION_RENDERER=\u30c7\u30b3\u30ec\u30fc\u30b7\u30e7\u30f3 \u30ec\u30f3\u30c0\u30e9\u30fc +COMMON_NAME_RENDER_ENGINE_DECORATIONS=\u30ec\u30f3\u30c0\u30fc\u30a6\u30a3\u30f3\u30c9\u30a6\u30c7\u30b3\u30ec\u30fc\u30b7\u30e7\u30f3\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_PORTLET_RENDERER=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 \u30ec\u30f3\u30c0\u30e9\u30fc +COMMON_NAME_RENDER_ENGINE_PORTLETS=\u30ec\u30f3\u30c0\u30fc\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_PORTLET_INSTANCE_INFORMATION=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u60c5\u5831 +COMMON_PORTLET_NAME=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u540d +COMMON_PORTLET_DESCRIPTION=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u8aac\u660e +COMMON_PORTLET_TITLE=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30bf\u30a4\u30c8\u30eb +COMMON_PORTLET_KEYWORDS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30ad\u30fc\u30ef\u30fc\u30c9 +COMMON_PORTLET_LOCALES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u5834\u6240 +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8868\u793a\u540d +COMMON_ADD_INSTANCE_DISPLAY_NAMES=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u8868\u793a\u540d\u306e\u8ffd\u52a0 +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=\u73fe\u5728\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u8868\u793a\u540d +COMMON_CANCEL=\u30ad\u30e3\u30f3\u30bb\u30eb +COMMON_UPDATE=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8 +COMMON_ADD=\u8ffd\u52a0 +COMMON_ADD_PROPERTY_BUTTON=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u8ffd\u52a0 +COMMON_UP=Up +COMMON_DOWN=Down +COMMON_NEW_VALUE=\u65b0\u3057\u3044\u5024 +COMMON_APPEND=\u8ffd\u52a0 +COMMON_LOCALE=\u5834\u6240 +COMMON_DISPLAY_NAME=\u8868\u793a\u540d +COMMON_MEDIA_TYPES=\u30e1\u30c7\u30a3\u30a2\u30bf\u30a4\u30d7 +COMMON_WINDOW_STATES=\u30a6\u30a3\u30f3\u30c9\u30a6\u30b9\u30c6\u30fc\u30c8 +COMMON_PORTLET_MODES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30e2\u30fc\u30c9 +COMMON_PREFERENCES=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 +COMMON_PUBLIC_RENDER_PARAMETERS=\u30d1\u30d6\u30ea\u30c3\u30af\u30ec\u30f3\u30c0\u30fc\u30d1\u30e9\u30e1\u30fc\u30bf +COMMON_ID=Id +COMMON_TITLE=\u30bf\u30a4\u30c8\u30eb +COMMON_KEYWORDS=\u30ad\u30fc\u30ef\u30fc\u30c9 +COMMON_LOCALES=\u5834\u6240 +COMMON_TRANSPORT_GUARANTEES=\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8\u30ae\u30e3\u30e9\u30f3\u30c6\u30a3\u30fc +COMMON_CACHE_EXPIRATION=\u30ad\u30e3\u30c3\u30b7\u30e5\u6709\u52b9\u671f\u9650 +COMMON_SECONDS=\u79d2 +COMMON_PUBLIC_NAVIGATION_PARAMETERS=\u30d1\u30d6\u30ea\u30c3\u30af\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d1\u30e9\u30e1\u30fc\u30bf +COMMON_CONSUMED_EVENTS=Consumed Events +COMMON_PRODUCED_EVENTS=Produced Events + +DASHBOARD_PERSONAL_EDITOR=\u30d1\u30fc\u30bd\u30ca\u30eb \u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 \u30a8\u30c7\u30a3\u30bf +DASHBOARD_CREATE_NEW_PAGE=\u65b0\u3057\u3044\u30da\u30fc\u30b8\u306e\u4f5c\u6210 +DASHBOARD_CREATE_PAGE=\u30da\u30fc\u30b8\u540d +DASHBOARD_RENAME_THIS_PAGE=\u30da\u30fc\u30b8\u540d\u306e\u5909\u66f4 +DASHBOARD_NEW_PAGE_NAME=\u65b0\u3057\u3044\u30da\u30fc\u30b8\u540d +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=\u3042\u306a\u305f\u306e\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30da\u30fc\u30b8\u306e\u30b3\u30f3\u30c6\u30f3\u30c8\u3068\u4f53\u88c1\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306b\u3001\u3053\u306e\u30da\u30fc\u30b8\u3092\u4f7f\u3063\u3066\u304f\u3060\u3055\u3044 +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=\u3042\u306a\u305f\u306f\u30da\u30fc\u30b8\u30bf\u30a4\u30c8\u30eb\u3001\u30ab\u30e9\u30e0\u30ec\u30a4\u30a2\u30a6\u30c8\u3001\u30da\u30fc\u30b8\u30c6\u30fc\u30de\u306e\u8ffd\u52a0\u3001\u9806\u5e8f\u3001\u524a\u9664\u3092\u5236\u5fa1\u3067\u304d\u307e\u3059\u3002 +DASHBOARD_CURRENTLY_EDITING_PAGE=\u73fe\u5728\u7de8\u96c6\u3057\u3066\u3044\u308b\u30da\u30fc\u30b8 +DASHBOARD_THEME_AND_LAYOUT=\u30c6\u30fc\u30de\u3068\u30ec\u30a4\u30a2\u30a6\u30c8 +DASHBOARD_APPLY_THEME=\u3042\u306a\u305f\u306e\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u306e\u30c6\u30fc\u30de\u3092\u5272\u308a\u5f53\u3066\u3066\u304f\u3060\u3055\u3044\u3002\u3082\u3057\u304f\u306f\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u30ab\u30e9\u30e0\u6570\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +DASHBOARD_CHOOSE_LAYOUT=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u9078\u629e +DASHBOARD_CHOOSE_THEME=\u30c6\u30fc\u30de\u306e\u9078\u629e +DASHBOARD_CANNOT_UNDO_ACTION=\u3053\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u5143\u306b\u623b\u3059\u4e8b\u304c\u3067\u304d\u307e\u305b\u3093\u3002 +DASHBOARD_DELETE_THIS_PAGE=\u30da\u30fc\u30b8\u306e\u524a\u9664 +DASHBOARD_SAVE=\u4fdd\u5b58 +DASHBOARD_SELECT=\u9078\u629e + +WIZARD_ADDING_NEW_PORTLET=\u65b0\u3057\u3044\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8ffd\u52a0 +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u9078\u629e +WIZARD_SELECT_PORTAL=\u30dd\u30fc\u30bf\u30eb\u306e\u9078\u629e +WIZARD_SELECT_PAGE=\u30da\u30fc\u30b8\u306e\u9078\u629e +WIZARD_SELECT_REGION=\u30ea\u30fc\u30b8\u30e7\u30f3\u306e\u9078\u629e +WIZARD_CONFIRM=\u78ba\u8a8d +WIZARD_CONTENT=\u30b3\u30f3\u30c6\u30f3\u30c8 +WIZARD_SWITCH_ADVANCED_MODE=ADVANCED MODE\u3078\u306e\u5207\u308a\u66ff\u3048 +WIZARD_PORTLET=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +WIZARD_PORTAL=\u30dd\u30fc\u30bf\u30eb +WIZARD_PAGE=\u30da\u30fc\u30b8 +WIZARD_REGION=\u30ea\u30fc\u30b8\u30e7\u30f3 +WIZARD_PREVIOUS=Previous +WIZARD_NEXT=Next +WIZARD_SUB_PAGES=Sub-Pages +WIZARD_PORTLET_PROVIDER=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc +WIZARD_CHANGE=\u5909\u66f4 + +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=\u30c7\u30d5\u30a9\u30eb\u30c8\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u8868\u793a +REDIRECT_TO_THE_SPECIFIED_RESOURCE=\u8a18\u8ff0\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8 +REMOVE_THE_RESOURCE_FROM_PAGE=\u30da\u30fc\u30b8\u304b\u3089\u30ea\u30bd\u30fc\u30b9\u3092\u524a\u9664 + +THEME_LAYOUT_ID_NAME=\u30ec\u30a4\u30a2\u30a6\u30c8ID +THEME_LAYOUT_ID_DESCRIPTION=\u30ec\u30a4\u30a2\u30a6\u30c8\u5024\u306f\u30da\u30fc\u30b8\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 +THEME_THEME_ID_NAME=\u30c6\u30fc\u30deID +THEME_THEME_ID_DESCRIPTION=\u30c6\u30fc\u30de\u5024\u306f\u30da\u30fc\u30b8\u3092\u304a\u304a\u3044\u307e\u3059\u3002 +THEME_RENDER_SET_ID_NAME=\u30ec\u30f3\u30c0\u30bb\u30c3\u30c8 id +THEME_RENDER_SET_ID_DESCRIPTION=\u30ec\u30f3\u30c0\u30bb\u30c3\u30c8 id +THEME_RENDER_REGION_ID_NAME=\u30ea\u30fc\u30b8\u30e7\u30f3ID +THEME_RENDER_REGION_ID_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30ea\u30fc\u30b8\u30e7\u30f3 id +THEME_RENDER_REGION_ORDER_NAME=\u30ea\u30fc\u30b8\u30e7\u30f3\u30aa\u30fc\u30c0\u30fc +THEME_RENDER_REGION_ORDER_DESCRIPTION=\u30ea\u30fc\u30b8\u30e7\u30f3\u5185\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u5782\u76f4\u3001\u307e\u305f\u306f\u6c34\u5e73\u9806 +AJAX_PARTIAL_REFRESH_NAME=\u90e8\u5206\u7684\u306a\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5 +AJAX_PARTIAL_REFRESH_DESCRIPTION=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u90e8\u5206\u7684\u306a\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3092\u6709\u52b9 +AJAX_DND_NAME=\u30c9\u30e9\u30c3\u30b0\uff06\u30c9\u30ed\u30c3\u30d7 +AJAX_DND_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30c9\u30e9\u30c3\u30b0\uff06\u30c9\u30ed\u30c3\u30d7\u3092\u6709\u52b9 +WINDOW_CONTENT_TYPE_NAME=\u30b3\u30f3\u30c6\u30f3\u30c8\u30bf\u30a4\u30d7 +WINDOW_CONTENT_TYPE_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30b3\u30f3\u30c6\u30f3\u30c8\u306e\u30bf\u30a4\u30d7 +DEFAULT_CHILD_NAME_NAME=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5b50\u306e\u540d\u524d +DEFAULT_CHILD_NAME_DESCRIPTION=\u5b50\u306e\u540d\u524d\u304c\u660e\u793a\u7684\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u4f7f\u308f\u308c\u308b\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u540d\u524d +TAB_ORDER_NAME=\u30bf\u30d6\u9806 +TAB_ORDER_DESCRIPTION=\u30da\u30fc\u30b8\u5185\u306b\u8868\u793a\u3055\u308c\u308b\u30bf\u30d6\u306e\u9806\u5e8f +INITIAL_WINDOW_STATE_NAME=\u30a4\u30cb\u30b7\u30e3\u30eb\u30e2\u30fc\u30c9 +INITIAL_WINDOW_STATE_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30a4\u30cb\u30b7\u30e3\u30eb\u30e2\u30fc\u30c9 + +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_ERROR_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=\u30da\u30fc\u30b8\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=\u30da\u30fc\u30b8\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=\u30da\u30fc\u30b8\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_ERROR_NAME=\u30da\u30fc\u30b8\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=\u30da\u30fc\u30b8\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=\u30da\u30fc\u30b8\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=\u30da\u30fc\u30b8\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d + +NO_BOUND_LISTENER=\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u305f\u30ea\u30b9\u30ca\u30fc\u306a\u3057 + +COORDINATION_COORDINATION=\u30b3\u30fc\u30c7\u30a3\u30cd\u30fc\u30b7\u30e7\u30f3 +COORDINATION_PARAMETER_BINDINGS=\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +COORDINATION_PARAMETER_EXPLICIT_MODE=\u660e\u793a\u7684\u306a\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u884c\u3046 +COORDINATION_PARAMETER_MANAGE_EXISTING=\u73fe\u72b6\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u7ba1\u7406: +COORDINATION_PARAMETER_EXISTING_NONE=\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +COORDINATION_PARAMETER_EXISTING_NAME=\u540d\u524d +COORDINATION_PARAMETER_EXISTING_PAIRS=\u30a6\u30a3\u30f3\u30c9\u30a6 / \u30d1\u30e9\u30e1\u30fc\u30bf \u30da\u30a2 +COORDINATION_PARAMETER_EXISTING_ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +COORDINATION_PARAMETER_CREATE=\u65b0\u3057\u3044\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u4f5c\u6210: +COORDINATION_PARAMETER_CREATE_NO_PAIRS=\u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30ec\u30f3\u30c0\u30fc\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u65b0\u3057\u3044\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +COORDINATION_PARAMETER_CREATE_STEP1=1. \u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30a6\u30a3\u30f3\u30c9\u30a6 / \u30d1\u30e9\u30e1\u30fc\u30bf \u30da\u30a2\u306e\u9078\u629e: +COORDINATION_PARAMETER_CREATE_STEP2=2. \u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u547d\u540d: +COORDINATION_PARAMETER_CREATE_CREATE=\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u4f5c\u6210 + +COORDINATION_WINDOWS=\u30a6\u30a3\u30f3\u30c9\u30a6 + +COORDINATION_ALIAS_BINDINGS=\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +COORDINATION_ALIAS_MANAGE_EXISTING=\u73fe\u72b6\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u7ba1\u7406: +COORDINATION_ALIAS_EXISTING_NONE=\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +COORDINATION_ALIAS_EXISTING_NAME=\u540d\u524d +COORDINATION_ALIAS_EXISTING_ORIGINAL=\u30aa\u30ea\u30b8\u30ca\u30eb QName +COORDINATION_ALIAS_EXISTING_ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +COORDINATION_ALIAS_CREATE=\u65b0\u3057\u3044\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u4f5c\u6210: +COORDINATION_ALIAS_CREATE_NO_PARAMS=\u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u65b0\u3057\u3044\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +COORDINATION_ALIAS_CREATE_STEP1=1. \u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30ec\u30f3\u30c0\u30fc\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u4f5c\u6210: +COORDINATION_ALIAS_CREATE_STEP2=2. \u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u547d\u540d: +COORDINATION_ALIAS_CREATE_CREATE=\u30a8\u30a4\u30ea\u30a2\u30b9\u306e\u4f5c\u6210 + +COORDINATION_EVENT_WIRINGS=\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0 +COORDINATION_EVENT_EXPLICIT_MODE=\u660e\u793a\u7684\u306a\u30a4\u30d9\u30f3\u30c8\u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u3092\u884c\u3046 +COORDINATION_EVENT_MANAGE_EXISTING=\u73fe\u72b6\u306e\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u7ba1\u7406: +COORDINATION_EVENT_EXISTING_NONE=\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +COORDINATION_EVENT_EXISTING_NAME=\u540d\u524d +COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=\u30bd\u30fc\u30b9\u30a6\u30a3\u30f3\u30c9\u30a6 +COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=\u30bd\u30fc\u30b9\u30a4\u30d9\u30f3\u30c8 +COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=\u5b9b\u5148\u30a4\u30d9\u30f3\u30c8 +COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=\u5b9b\u5148\u30a6\u30a3\u30f3\u30c9\u30a6 +COORDINATION_EVENT_EXISTING_ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +COORDINATION_EVENT_CREATE=\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u4f5c\u6210: +COORDINATION_EVENT_CREATE_NO_EVENTS=\u30a4\u30d9\u30f3\u30c8 \u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +COORDINATION_EVENT_CREATE_STEP1=1. \u30bd\u30fc\u30b9\u30a4\u30d9\u30f3\u30c8\u306e\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP2=2. \u30a4\u30d9\u30f3\u30c8\u3092\u767a\u751f\u3055\u305b\u308b\u30bd\u30fc\u30b9\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP3=3. \u5b9b\u5148\u30a4\u30d9\u30f3\u30c8\u3092\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP4=4. \u30a4\u30d9\u30f3\u30c8\u3092\u51e6\u7406\u3059\u308b\u5b9b\u5148\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP5=5. \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u547d\u540d: +COORDINATION_EVENT_CREATE_CREATE=\u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u4f5c\u6210 +COORDINATION_EVENT_CREATE_PREVIEW=\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8\u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u30d7\u30ec\u30d3\u30e5\u30fc: +COORDINATION_EVENT_CREATE_PREVIEW_STEP1=\u3042\u306a\u305f\u306f\u3001\u4ee5\u4e0b\u306e\u30bd\u30fc\u30b9\u30a4\u30d9\u30f3\u30c8\u3092\u9078\u629e\u3057\u307e\u3057\u305f: +COORDINATION_EVENT_CREATE_PREVIEW_STEP2=\u4ee5\u4e0b\u306e\u30bd\u30fc\u30b9\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3088\u3063\u3066\u5f15\u304d\u8d77\u3053\u3055\u308c\u307e\u3059: +COORDINATION_EVENT_CREATE_PREVIEW_STEP3=\u767a\u751f\u3057\u305f\u30a6\u30a3\u30f3\u30c9\u30a6\u30a4\u30d9\u30f3\u30c8\u304c\u30ef\u30a4\u30e4\u3055\u308c\u308b\u5b9b\u5148\u30a4\u30d9\u30f3\u30c8: +COORDINATION_EVENT_CREATE_PREVIEW_STEP4=\u5b9b\u5148\u30a6\u30a3\u30f3\u30c9\u30a6: + + + +COORDINATION_WIRING=\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0 +COORDINATION_PARAMETER=\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +COORDINATION_ALIAS=\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,340 @@ +################################################################################ +# 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. # +################################################################################ + +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 +DASHBOARDS=Meus Portais +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 +CREATE_PORTAL_NAMED=Criar portal chamado +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 chamada +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 sobrescrever essas configura\u00E7\u00F5es, 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 +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 +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 +MANAGE_WINDOWS_WITHIN=Gerenciar janelas com +PORTAL_OBJECTS=Objetos do Portal +PORTALS=Portais +PORTLET_NAME=Nome do portlet +DESCRIPTION=Descri\u00E7\u00E3o +REMOTE=Remoto +REMOTABLE=Remoto +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 chamada +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 +SWITCH_TO_WIZARD_MODE=Mude para o modo de assistente +CREATE_PORTAL=Criar portal +CREATE_PAGE=Criar p\u00E1gina +DEFAULT=Padr\u00E3o +WINDOW=Janela +VIEW_PORTLETS_PROVIDED_BY=Visualizar portlets fornecidos pelo provedor de portlet chamado +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_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 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_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_PORTAL_ERROR_HANDLING=Gerenciamento de Erros do Portal +COMMON_PORTAL_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com 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_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 propriedades predefinidas +COMMON_OR=ou +COMMON_ENTER_PROPERTY_NAME=Digite o nome da propriedade +COMMON_MANAGE_PROPERTIES=Ger\u00EAnciar propriedades atualmente definidas +COMMON_DESCRIPTION=Descri\u00E7\u00E3o +COMMON_INHERITED=Herdado +COMMON_YES=Sim +COMMON_NO=N\u00E3o +COMMON_ROLES=Perfis +COMMON_PERMISSIONS=Permiss\u00F5es +COMMON_ROLE=Perfil +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_THEME=Tema +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_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_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_PORTLET_NAME=Nome 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=L\u00EDnguas 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_CANCEL=Cancelar +COMMON_UPDATE=Atualizar +COMMON_ADD=Adicionar +COMMON_ADD_PROPERTY_BUTTON=Adicionar Propriedade +COMMON_UP=Cima +COMMON_DOWN=Baixo +COMMON_NEW_VALUE=Novo valor +COMMON_APPEND=Adicionar +COMMON_LOCALE=Nacionalidade +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_ID=Id +COMMON_TITLE=T\u00EDtulo +COMMON_KEYWORDS=Palavras-chave +COMMON_LOCALES=Nacionalidades +COMMON_TRANSPORT_GUARANTEES=Garantias de Transporte +COMMON_CACHE_EXPIRATION=Expira\u00E7\u00E3o de Cache +COMMON_SECONDS=segundos +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 P\u00E1gina Nova +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 p\u00E1gina +DASHBOARD_THEME_AND_LAYOUT=Tema e Layout +DASHBOARD_APPLY_THEME=Aplicar 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_SAVE=Gravar +DASHBOARD_SELECT=Selecionar + +WIZARD_ADDING_NEW_PORTLET=Adicionando um novo portlet +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_CONFIRM=Confirmar +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_PREVIOUS=Anterior +WIZARD_NEXT=Pr\u00F3ximo +WIZARD_SUB_PAGES=Sub-P\u00E1ginas +WIZARD_PORTLET_PROVIDER=Fornecedor de portlet +WIZARD_CHANGE=Mudar + +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 + +THEME_LAYOUT_ID_NAME=Id do layout +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_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 +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 +TAB_ORDER_NAME=Ordem da aba +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_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=When there is an error on the page +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_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_CREATE_CREATE=Criar binding + +COORDINATION_WINDOWS=Janelas + +COORDINATION_ALIAS_BINDINGS=Alias bindings +COORDINATION_ALIAS_MANAGE_EXISTING=Manage existing alias bindings: +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_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: +COORDINATION_ALIAS_CREATE_STEP2=2. Name alias binding: +COORDINATION_ALIAS_CREATE_CREATE=Criar alias + +COORDINATION_EVENT_WIRINGS=Event wirings +COORDINATION_EVENT_EXPLICIT_MODE=Use explicit event wiring +COORDINATION_EVENT_MANAGE_EXISTING=Manage existing event wirings: +COORDINATION_EVENT_EXISTING_NONE=No existing event wirings. +COORDINATION_EVENT_EXISTING_NAME=Nome +COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=Source windows +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_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: +COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event: +COORDINATION_EVENT_CREATE_STEP3=3. Select destination event: +COORDINATION_EVENT_CREATE_STEP4=4. Select destination windows consuming event: +COORDINATION_EVENT_CREATE_STEP5=5. Name wiring: +COORDINATION_EVENT_CREATE_CREATE=Create wiring +COORDINATION_EVENT_CREATE_PREVIEW=New event wiring preview: +COORDINATION_EVENT_CREATE_PREVIEW_STEP1=You have selected the following source event: +COORDINATION_EVENT_CREATE_PREVIEW_STEP2=triggered by the following source windows: +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}'' \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} chamado ''{0}'' j\u00E1 existe\! +bean_support_unexpected_error=Erro inesperado: +bean_support_cause=Causa: + +INSTANCE_TYPE=inst\u00E2ncia +PAGE_TYPE=p\u00E1gina +PORTAL_TYPE=portal +DISPLAY_NAME_TYPE=nomes de exibi\u00E7\u00E3o +PROPERTY_TYPE=propriedade +PORTAL_OBJECT_TYPE=objeto do portal +WINDOW_TYPE=janela Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -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> @@ -38,6 +38,7 @@ <default-locale>en</default-locale> <supported-locale>it</supported-locale> <supported-locale>de</supported-locale> + <supported-locale>ja</supported-locale> </locale-config> </application> @@ -111,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> @@ -128,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> @@ -265,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> @@ -310,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> @@ -317,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> @@ -328,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> @@ -335,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> @@ -345,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> @@ -355,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> @@ -366,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 --> @@ -598,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/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -35,9 +35,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> <link rel="stylesheet" type="text/css" href="/css/boxes.css"/> </header-content> @@ -57,9 +54,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -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,85 +29,63 @@ version="2.4"> <context-param> - <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> - <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> - </context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> - <context-param> - <param-name>javax.portlet.faces.renderPolicy</param-name> - <param-value>ALWAYS_DELEGATE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> - <param-value>rfRes</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - - <!--When turned on, it changes ViewHandler.restoreView() to build the view before asking the StateManager for help.--> - <context-param> - <param-name>facelets.BUILD_BEFORE_RESTORE</param-name> - <param-value>true</param-value> - </context-param> - - <!-- JSF --> <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>false</param-value> + </context-param> <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> <param-name>facelets.LIBRARIES</param-name> <param-value>/WEB-INF/portal.taglib.xml</param-value> </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>FacesServlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> + <!--<listener>--> + <!--<listener-class>com.sun.faces.config.ConfigureListener</listener-class>--> + <!--</listener>--> - <servlet> - <servlet-name>FacesServlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <error-page> + <exception-type>javax.servlet.ServletException</exception-type> + <location>/faces/jsf/error.xhtml</location> + </error-page> + <error-page> + <exception-type>javax.faces.application.ViewExpiredException</exception-type> + <location>/jsf/error.xhtml</location> + </error-page> - <servlet-mapping> - <servlet-name>FacesServlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> + <error-page> + <exception-type>javax.faces.FacesException</exception-type> + <location>/jsf/error.xhtml</location> + </error-page> - <session-config> - <session-timeout>10</session-timeout> - </session-config> + <servlet> + <servlet-name>FacesServlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>FacesServlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + </web-app> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -24,7 +24,7 @@ <h:form id="windowForm"> <label for="windowName"> <span class="portlet-form-field-label admin-label">#{bundle.COMMON_WINDOW_NAME}:</span> - <h:inputText id="windowName" value="#{pageManager.windowName}" + <h:inputText id="windowName" binding="#{pageManager.windowName}" styleClass="portlet-form-input-field id-window-name"/> </label> <h:message for="windowName" errorClass="portlet-msg-error"/> @@ -56,7 +56,7 @@ initialMode="edit_content" initialWindowState="normal" renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById(document.getElementById('namespaceHolder').value + ':windowForm:windowName').value);"/> + onClick="url.setParameter('windowName', document.getElementById(document.getElementById('namespaceHolder').value).value);"/> <input type="hidden" value="#{pageManager.namespace}" id="namespaceHolder"/> </td> </tr> @@ -86,7 +86,7 @@ <tr> <td valign="top"> <h:commandButton - onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}:windowForm:windowName').value" + onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}').value" value="#{bundle.COMMON_ADD}" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,46 +1,69 @@ -<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> <h:form id="common-edit-theme-form"> <table class="full-width datatable"> <thead class="portlet-section-header"> - <tr> - <th>#{bundle.COMMON_NAME}</th> - <th>#{bundle.COMMON_DESCRIPTION}</th> - <th>#{bundle.COMMON_SETTING}</th> - </tr> + <tr> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> + </tr> </thead> <tbody> - <tr class="portlet-section-body"> - <td>#{bundle.COMMON_LAYOUT}</td> - <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> - <td> - <h:selectOneMenu id="layout" value="#{theme.layoutName}"> - <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td>#{bundle.COMMON_THEME}</td> - <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> - <td> - <h:selectOneMenu id="theme" value="#{theme.themeName}"> - <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td>#{bundle.COMMON_RENDERSET}</td> - <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> - <td> - <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> + <tr class="portlet-section-body"> + <td>#{bundle.COMMON_LAYOUT}</td> + <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> + <td> + <h:selectOneMenu id="layout" value="#{theme.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>#{bundle.COMMON_THEME}</td> + <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> + <td> + <h:selectOneMenu id="theme" value="#{theme.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-body"> + <td>#{bundle.COMMON_RENDERSET}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> + <td> + <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> </tbody> </table> - <br /> + <br/> <ui:insert name="form_submit"/> </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -2,8 +2,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" xmlns:portal="http://www.jboss.org/portal"> <div class="details-container"> @@ -125,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> @@ -209,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/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -8,8 +8,8 @@ <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> - <br/><br/> - <div class="float-left third-width-pad5"> + <br/> + <div class="float-left third-width"> <h:form id="display-name-form"> <h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3> @@ -24,7 +24,7 @@ </h:form> </div> - <div class="float-left two-third-width-pad5"> + <div class="float-right two-third-width"> <h:form id="display-name-form1"> <h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -5,19 +5,26 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:c="http://java.sun.com/jstl/core"> <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> <script type="text/javascript"> <!-- function toggle_visibility(id) { var e = document.getElementById(id); + var disc = document.getElementById(id + 'Disc'); if(e.style.display != 'none') + { e.style.display = 'none'; + disc.setAttribute('src', '/portal-admin/img/plus.gif'); + disc.setAttribute('alt', '+'); + } else + { e.style.display = ''; + disc.setAttribute('src','/portal-admin/img/minus.gif'); + disc.setAttribute('alt', '-'); + } } //--> @@ -26,14 +33,17 @@ <br/> <!-- Alias bindings --> - <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS}</h2> + <div class="tenpx-top"> + <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"> + <img id="aliasBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS} + </h2> <!-- Create alias binding --> - <div id="aliasBindings"> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3> + <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}" @@ -45,8 +55,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}" @@ -108,10 +121,15 @@ </div> </div> + <br/> + <!-- Parameter bindings --> <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> - <div id="parameterBindings"> + <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"> + <img id="parameterBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS} + </h2> + <div id="parameterBindings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}" onchange="this.form.submit()" immediate="true"/> @@ -123,7 +141,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}" @@ -136,8 +154,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}" @@ -203,20 +224,25 @@ </div> </div> + <br/> + <!-- Event wirings --> - <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS}</h2> - <div id="eventWirings"> + <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"> + <img id="eventWiringsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS} + </h2> + <div id="eventWirings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} </h:form> <hr/> - + <!-- 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> @@ -298,6 +324,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/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>#{bundle.SET_PAGE_PERMISSIONS}</h3> + <br/> + <p class="portlet-area-header">#{bundle.SET_PAGE_PERMISSIONS}</p> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>#{bundle.PAGE_THEME_PROPERTIES}</h3> + <br/> + <p class="portlet-area-header">#{bundle.PAGE_THEME_PROPERTIES}</p> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>#{bundle.SET_PORTAL_PERMISSIONS}</h3> + <br/> + <p class="portlet-area-header">#{bundle.SET_PORTAL_PERMISSIONS}</p> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>#{bundle.PORTAL_THEME_PROPERTIES}</h3> + <br/> + <p class="portlet-area-header">#{bundle.PORTAL_THEME_PROPERTIES}</p> <p>#{bundle.SETTINGS_ARE_INHERITED_BY_ALL_PAGES}.</p> <br/> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,8 +6,9 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{bundle.WINDOW_NO_CAP}</h3> + <br/> + <p class="portlet-area-header">#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.WINDOW_NO_CAP}</p> <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>#{bundle.WINDOW_THEME_PROPERTIES}</h3> + <br/> + <p class="portlet-area-header">#{bundle.WINDOW_THEME_PROPERTIES}</p> <ui:decorate template="common/editWindowTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/error.xhtml) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,7 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + <!--Standard Error Page--> + </ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,174 +6,187 @@ xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core"> -<ui:composition template="instancesTemplate.xhtml"> + <ui:composition template="instancesTemplate.xhtml"> -<ui:define name="content"> + <ui:define name="content"> -<c:if test="#{empty instancemgr.selectedPlugin}"> - <h:form id="instances-form"> - <ul class="pagination property-container"> - <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> - <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" - var="index"> - <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> - <h:commandLink action="#{instancemgr.selectFrom}"> - <f:param name="from" value="#{index * instancemgr.paginationSize}"/> - <h:outputText value="#{index * instancemgr.paginationSize}"/> - </h:commandLink> - </li> - </c:forEach> + <c:if test="#{empty instancemgr.selectedPlugin}"> + <h:form id="instances-form"> + <ul class="pagination property-container"> + <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> + <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" + var="index"> + <li + class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> + <h:commandLink action="#{instancemgr.selectFrom}"> + <f:param name="from" value="#{index * instancemgr.paginationSize}"/> + <h:outputText value="#{index * instancemgr.paginationSize}"/> + </h:commandLink> + </li> + </c:forEach> + </c:if> + </ul> + <table id="instancesTable2" class="portlet-def-table datatable"> + <thead class="portlet-section-header"> + <tr> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status"> + <tr + class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> + <td> + <img src="#{instance.portlet.smallIconLocation}" alt="icon" align="middle" + style="margin:0 4px 0 0"/> + <h:commandLink id="instance-#{status.index}" + action="#{instancemgr.selectInstance}"> + <h:outputText value="#{instance.id}"/> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="info"/> + </h:commandLink> + </td> + <td> + <h:outputText value="#{instance.displayName}"/> + </td> + <td> + <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0"> + <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" + id="security-instance-#{status.index}"> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="security"/> + #{bundle.SECURITY} + </h:commandLink> + <h:commandLink rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}" + id="preference-instance-#{status.index}" + action="#{instancemgr.selectInstance}" + styleClass="actionPreferences"> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="preferences"/> + #{bundle.PREFERENCES} + </h:commandLink> + <h:commandLink action="confirmDeleteInstance" + id="delete-instance-#{status.index}" + styleClass="actionDeleteInstance" + actionListener="#{instancemgr.selectInstance}"> + <f:param name="id" value="#{instance.id}"/> + #{bundle.COMMON_DELETE} + </h:commandLink> + </h:panelGrid> + </td> + </tr> + </c:forEach> + </tbody> + <tfoot class="portlet-section-header"> + <tr> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> + </tr> + </tfoot> + </table> + <ul class="pagination property-container"> + <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> + <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" + var="index"> + <li + class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> + <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}"> + <f:param name="from" value="#{index * instancemgr.paginationSize}"/> + <h:outputText value="#{index * instancemgr.paginationSize}"/> + </h:commandLink> + </li> + </c:forEach> + </c:if> + </ul> + </h:form> </c:if> - </ul> - <table id="instancesTable2" class="portlet-def-table datatable"> - <thead class="portlet-section-header"> - <tr> - <th>#{bundle.INSTANCE_ID}</th> - <th>#{bundle.INSTANCE_NAME}</th> - <th>#{bundle.ACTIONS}</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status"> - <tr - class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> - <td> - <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/> - <h:commandLink id="#{instance.id}" action="#{instancemgr.selectInstance}"> - <h:outputText value="#{instance.id}"/> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="info"/> - </h:commandLink> - </td> - <td> - <h:outputText value="#{instance.displayName}"/> - </td> - <td> - <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0"> - <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" id="security-#{instance.id}"> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="security"/> - #{bundle.SECURITY} - </h:commandLink> - <h:commandLink rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}" - id="preference-#{instance.id}" action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="preferences"/> - #{bundle.PREFERENCES} - </h:commandLink> - <h:commandLink action="confirmDeleteInstance" id="delete-#{instance.id}" - styleClass="actionDeleteInstance" - actionListener="#{instancemgr.selectInstance}"> - <f:param name="id" value="#{instance.id}"/> - #{bundle.COMMON_DELETE} - </h:commandLink> - </h:panelGrid> - </td> - </tr> - </c:forEach> - </tbody> - <tfoot class="portlet-section-header"> - <tr> - <th>#{bundle.INSTANCE_ID}</th> - <th>#{bundle.INSTANCE_NAME}</th> - <th>#{bundle.ACTIONS}</th> - </tr> - </tfoot> - </table> - <ul class="pagination property-container"> - <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> - <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" - var="index"> - <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> - <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}"> - <f:param name="from" value="#{index * instancemgr.paginationSize}"/> - <h:outputText value="#{index * instancemgr.paginationSize}"/> - </h:commandLink> - </li> - </c:forEach> - </c:if> - </ul> - </h:form> -</c:if> -<c:if test="#{instancemgr.selectedPlugin == 'info'}"> - <!-- Path nav --> - <h:form id="instance-form1"> - <ul class="objectpath"> - <li class="pathItem"> - <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} - </li> - </ul> - </h:form> - <br/> - <c:choose> - <c:when test="#{instancemgr.selectedInstance.portlet != null}"> - <ui:include src="common/showPortletDetails.xhtml"> - <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> - <ui:param name="portletmgr" value="#{portletmgr}"/> - <ui:param name="showDisplayNameEditor" value="true"/> - </ui:include> - </c:when> - <c:otherwise> - #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. - </c:otherwise> - </c:choose> -</c:if> + <c:if test="#{instancemgr.selectedPlugin == 'info'}"> + <!-- Path nav --> + <h:form id="instance-form1"> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink id="instance-link" + action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} + </li> + </ul> + </h:form> + <br/> + <c:choose> + <c:when test="#{instancemgr.selectedInstance.portlet != null}"> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + <ui:param name="portletmgr" value="#{portletmgr}"/> + <ui:param name="showDisplayNameEditor" value="true"/> + </ui:include> + </c:when> + <c:otherwise> + #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. + </c:otherwise> + </c:choose> + </c:if> -<c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> - <!-- Path nav --> - <h:form id="instance-form2"> - <ul class="objectpath"> - <li class="pathItem"> - <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP} - </li> - </ul> - </h:form> - <br/> + <c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> + <!-- Path nav --> + <h:form id="instance-form2"> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink id="instance-link" + action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP} + </li> + </ul> + </h:form> + <br/> - <div class="property-container"> - <ui:include src="common/editPreferences.xhtml"> - <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> - </ui:include> - <br /> - <h:form> - <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> - <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> - </h:form> - </div> -</c:if> + <div class="property-container"> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <br/> + <h:form> + <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" + styleClass="portlet-form-button"/> + <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" + styleClass="portlet-form-button"/> + </h:form> + </div> + </c:if> -<c:if test="#{instancemgr.selectedPlugin == 'security'}"> - <!-- Path nav --> - <h:form id="instance-form3"> - <ul class="objectpath"> - <li class="pathItem"> - <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} - </li> - </ul> - </h:form> - <br/> + <c:if test="#{instancemgr.selectedPlugin == 'security'}"> + <!-- Path nav --> + <h:form id="instance-form3"> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink id="instance-link" + action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} + </li> + </ul> + </h:form> + <br/> - <div class="property-container"> - <ui:decorate template="/jsf/common/editSecurity.xhtml"> - <ui:param name="auth" value="#{instancemgr.auth}"/> - </ui:decorate> - </div> -</c:if> + <div class="property-container"> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + </ui:decorate> + </div> + </c:if> -</ui:define> -</ui:composition> + </ui:define> + </ui:composition> </div> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -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/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -7,16 +7,14 @@ <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.CANCEL}" action="objects" + <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="objects" styleClass="portlet-form-button portlet-section-buttonrow"/> </p> </h:form>