Author: julien(a)jboss.com Date: 2007-06-22 10:47:33 -0400 (Fri, 22 Jun 2007) New Revision: 7512 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml trunk/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java Log: - fix for ui:portlet component to work with Sun RI Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -159,7 +159,7 @@ return grabProperty(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY); } - protected PortalObject getRelatedObject() + public PortalObject getRelatedObject() { return pomgr.getSelectedObject(); } Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -491,7 +491,7 @@ // if (selectedId == null) { - selectedId = new PortalObjectId("", PortalObjectPath.ROOT_PATH); + selectedId = new PortalObjectId(namespace, PortalObjectPath.ROOT_PATH); } // Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -166,7 +166,7 @@ return (SelectItem[])items.toArray(new SelectItem[items.size()]); } - protected PortalObject getRelatedObject() + public PortalObject getRelatedObject() { return pomgr.getSelectedObject(); } Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -105,6 +105,7 @@ static { + CONTEXT_PROPERTIES.put(AJAX_PARTIAL_REFRESH.getName(), AJAX_PARTIAL_REFRESH); CONTEXT_PROPERTIES.put(CONTROL_POLICY_PORTAL_ACCESS_DENIED.getName(), CONTROL_POLICY_PORTAL_ACCESS_DENIED); CONTEXT_PROPERTIES.put(CONTROL_POLICY_PORTAL_UNAVAILABLE.getName(), CONTROL_POLICY_PORTAL_UNAVAILABLE); CONTEXT_PROPERTIES.put(CONTROL_POLICY_PORTAL_ERROR.getName(), CONTROL_POLICY_PORTAL_ERROR); Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -31,6 +31,6 @@ public abstract class PropertyBeanContainer { - protected abstract PortalObject getRelatedObject(); + public abstract PortalObject getRelatedObject(); } Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -56,6 +56,10 @@ pomgr.refresh(); // + PortalObjectManagerBean dashboardmgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{dashboardmgr}").getValue(ctx); + dashboardmgr.refresh(); + + // InstanceManagerBean instancemgr = (InstanceManagerBean)ctx.getApplication().createValueBinding("#{instancemgr}").getValue(ctx); instancemgr.refresh(); @@ -76,6 +80,10 @@ pomgr.refresh(); // + PortalObjectManagerBean dashboardmgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{dashboardmgr}").getValue(ctx); + dashboardmgr.refresh(); + + // InstanceManagerBean instancemgr = (InstanceManagerBean)ctx.getApplication().createValueBinding("#{instancemgr}").getValue(ctx); instancemgr.refresh(); Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-22 14:47:33 UTC (rev 7512) @@ -121,6 +121,40 @@ </managed-property> </managed-bean> + <managed-bean> + <managed-bean-name>dashboardmgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.admin.ui.PortalObjectManagerBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>namespace</property-name> + <value>dashboard</value> + </managed-property> + <managed-property> + <property-name>roleModule</property-name> + <value>#{applicationScope.RoleModule}</value> + </managed-property> + <managed-property> + <property-name>portalObjectContainer</property-name> + <value>#{applicationScope.PortalObjectContainer}</value> + </managed-property> + <managed-property> + <property-name>instanceContainer</property-name> + <value>#{applicationScope.InstanceContainer}</value> + </managed-property> + <managed-property> + <property-name>layoutService</property-name> + <value>#{applicationScope.LayoutService}</value> + </managed-property> + <managed-property> + <property-name>themeService</property-name> + <value>#{applicationScope.ThemeService}</value> + </managed-property> + <managed-property> + <property-name>domainConfigurator</property-name> + <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> + </managed-property> + </managed-bean> + <!-- The instance manager managed bean --> <managed-bean> <managed-bean-name>instancemgr</managed-bean-name> @@ -405,6 +439,11 @@ </navigation-case> <navigation-case> + <from-outcome>dashboards</from-outcome> + <to-view-id>/WEB-INF/jsf/dashboards.xhtml</to-view-id> + </navigation-case> + + <navigation-case> <from-outcome>dashboard</from-outcome> <to-view-id>/WEB-INF/jsf/dashboard/dashboard.xhtml</to-view-id> </navigation-case> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml 2007-06-22 14:47:33 UTC (rev 7512) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core"> - <f:subview id="errorHandlingView" rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT or portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}"> + <f:subview id="errorHandlingView" rendered="#{properties.relatedObject.type == PortalObject.TYPE_CONTEXT or properties.relatedObject.type == PortalObject.TYPE_PORTAL}"> <!-- Separation --> <hr/> @@ -106,7 +106,7 @@ </h:form> </f:subview> - <f:subview id="errorHandlingView" rendered="#{!(portalobjectmgr.selectedObject.type == PortalObject.TYPE_WINDOW)}"> + <f:subview id="errorHandlingView" rendered="#{!(properties.relatedObject.type == PortalObject.TYPE_WINDOW)}"> <!-- Separation --> <hr/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-06-22 14:47:33 UTC (rev 7512) @@ -30,7 +30,7 @@ <td>#{prop.inherited ? 'Yes' : 'No'}</td> <td> <c:choose> - <c:when test="#{prop.type=='java.lang.Boolean'}"> + <c:when test="#{prop.type == 'java.lang.Boolean'}"> <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}" readonly="#{prop.readOnly}"/> </c:when> <c:otherwise> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-22 14:47:33 UTC (rev 7512) @@ -19,10 +19,6 @@ <!-- Separation --> <hr/> - <h:form> - <h:commandButton value="Cancel" styleClass="portlet-form-button" action="objects" immediate="true"/> - </h:form> - </ui:define> </ui:composition> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-06-22 14:47:33 UTC (rev 7512) @@ -14,6 +14,9 @@ <li> <h:commandLink value="Portlet Definitions" action="portlets"/> </li> + <li> + <h:commandLink value="Dashboard" action="dashboards"/> + </li> </ul> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-22 14:47:33 UTC (rev 7512) @@ -17,7 +17,7 @@ <h:commandLink value="Portlet Definitions" action="portlets"/> </li> <li> - <h:commandLink value="Dashboard" action="dashboard"/> + <h:commandLink value="Dashboard" action="dashboards"/> </li> </ul> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-06-22 14:47:33 UTC (rev 7512) @@ -14,6 +14,9 @@ <h:commandLink value="Portlet Instances" action="instances"/> </li> <li id="currentTab">Portlet Definitions</li> + <li> + <h:commandLink value="Dashboard" action="dashboards"/> + </li> </ul> </h:form> Modified: trunk/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2007-06-21 22:33:43 UTC (rev 7511) +++ trunk/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2007-06-22 14:47:33 UTC (rev 7512) @@ -569,6 +569,13 @@ " };\n" + " return tmp;\n" + " }\n" + + + // Temporary hack for Sun RI which encodes contextual state on the page + " var viewStateId = document.getElementById('javax.faces.ViewState')\n" + + " if (viewStateId != null) {\n" + + " this.params['javax.faces.ViewState'] = viewStateId\n" + + " }\n" + + "}\n" + "function fx(event) {\n" +