[portal-commits] JBoss Portal SVN: r11549 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/impl/api/node and 5 other directories.

Author: julien(a)jboss.com Date: 2008-07-22 19:59:40 -0400 (Tue, 22 Jul 2008) New Revision: 11549 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java Log: - rework samples to better reflect use cases (still need to redo the fallback case, but going to bed) - initial implementation for integration with page urls Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -351,32 +351,28 @@ } else { - String[] parameterValue = getPublicNavigationalState(parameterInfo.getName()); - // Explicit binding String[] explicitParameterValue = null; // Check all bindings for this window/qname pair Collection<String> bindings = getCoordinationManager().getBindingNames(getWindow(windowName), parameterInfo.getName()); - // If this window/qname is binded several times with different updated params value will be unpredictable... for (String binding : bindings) { explicitParameterValue = getPublicNavigationalState(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, binding)); } - - CoordinationStrategy strategy = getCoordinationManager().resolveBindingStrategy(getWindow(windowName).getPage()); - + // String parameterId = parameterInfo.getId(); + // + CoordinationStrategy strategy = getCoordinationManager().resolveBindingStrategy(getWindow(windowName).getPage()); if (strategy.equals(CoordinationStrategy.EXPLICIT) || (strategy.equals(CoordinationStrategy.FALLBACK) && explicitParameterValue != null)) { - // // We clone the value here so we keep the internal state not potentially changed if (explicitParameterValue != null) { @@ -384,18 +380,13 @@ } else { - //If it is EXPLICIT strategy check if this is not window publishing the param - + //If it is EXPLICIT strategy check if this is not window publishing the param } } - else + else if (parameterValue != null) { - // - if (parameterValue != null) - { - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); - } + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); } } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -27,7 +27,10 @@ import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.server.request.URLContext; +import org.jboss.portal.common.util.ParameterMap; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -42,7 +45,7 @@ protected ControllerContext controllerContext; /** . */ - protected ParametersStateString parameters; + protected Map<String, String[]> parameters; /** . */ protected Boolean wantSecure; @@ -61,17 +64,20 @@ this.id = id; this.controllerContext = controllerContext; this.relative = true; - this.parameters = ParametersStateString.create(); } public void setParameter(String name, String value) { - parameters.setValue(name, value); + setParameter(name, new String[]{value}); } public void setParameter(String name, String[] values) { - parameters.setValues(name, values); + if (parameters == null) + { + parameters = new ParameterMap(); + } + parameters.put(name, values); } public void setAuthenticated(Boolean authenticated) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -28,6 +28,9 @@ import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; +import java.util.Map; +import java.util.Collections; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -35,6 +38,9 @@ public class PageURL extends AbstractPortalNodeURL { + /** . */ + private static final Map<String, String[]> EMPTY_PARAMETERS = Collections.emptyMap(); + public PageURL(PortalObjectId id, ControllerContext controllerContext) { super(id, controllerContext); @@ -42,7 +48,8 @@ public String toString() { - ViewPageCommand cmd = new ViewPageCommand(id); + Map<String, String[]> parameters = this.parameters != null ? this.parameters : EMPTY_PARAMETERS; + ViewPageCommand cmd = new ViewPageCommand(id, parameters); URLContext urlContext = getURLContext(); return controllerContext.renderURL(cmd, urlContext, URLFormat.newInstance(relative, true)); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -27,6 +27,7 @@ import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; +import org.jboss.portal.portlet.ParametersStateString; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -42,7 +43,8 @@ public String toString() { - InvokePortletWindowRenderCommand cmd = new InvokePortletWindowRenderCommand(id, null, null, parameters); + ParametersStateString stateString = parameters != null ? ParametersStateString.create(parameters) : null; + InvokePortletWindowRenderCommand cmd = new InvokePortletWindowRenderCommand(id, null, null, stateString); URLContext urlContext = getURLContext(); return controllerContext.renderURL(cmd, urlContext, URLFormat.newInstance(relative, true)); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -88,6 +88,7 @@ PortletRequestDecoder decoder = new PortletRequestDecoder(); decoder.decode(queryParams, invocation.getServerContext().getBodyParameterMap()); + // if (decoder.getType() == PortletRequestDecoder.RESOURCE_TYPE) { cmd = new InvokePortletWindowResourceCommand( @@ -166,7 +167,7 @@ } else { - cmd = new ViewPageCommand(id); + cmd = new ViewPageCommand(id, queryParams); } } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -30,7 +30,6 @@ import org.jboss.portal.core.model.portal.command.PortalObjectCommand; import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand; -import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowResourceCommand; @@ -44,6 +43,8 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerURL; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -129,7 +130,9 @@ // Customize further more if (cmd instanceof ViewPageCommand) { - // Nothing for now, we let the statement just to show that it handles page rendering commands + ViewPageCommand vpCmd = (ViewPageCommand)cmd; + Map<String, String[]> parameters = vpCmd.getParameters(); + url.getParameterMap().putAll(parameters); } else if (cmd instanceof ViewPortalCommand) { Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -72,6 +72,7 @@ // PortletWindowNavigationalState windowNS = pageNS.getPortletWindowNavigationalState(window.getName()); + // PortletInfo portletInfo = cpcc.getPortletInfo(window.getName()); // Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -24,13 +24,22 @@ import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.controller.command.info.ViewCommandInfo; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.navstate.PageNavigationalState; import org.jboss.portal.core.model.portal.command.PageCommand; import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; +import org.jboss.portal.core.navstate.NavigationalStateContext; +import org.jboss.portal.common.util.ParameterMap; +import javax.xml.namespace.QName; +import java.util.Map; +import java.util.Collections; +import java.util.HashMap; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -41,11 +50,31 @@ /** . */ private static final CommandInfo info = new ViewCommandInfo(); - public ViewPageCommand(PortalObjectId pageId) + /** . */ + private static final Map<String,String[]> EMPTY_PARAMETERS = Collections.emptyMap(); + + /** . */ + private Map<String, String[]> parameters; + + public ViewPageCommand(PortalObjectId pageId, Map<String, String[]> parameters) { super(pageId); + + // + if (parameters == null) + { + throw new IllegalArgumentException("No null parameters accepted"); + } + + // + this.parameters = parameters; } + public ViewPageCommand(PortalObjectId pageId) + { + this(pageId, EMPTY_PARAMETERS); + } + protected Page initPage() { return (Page)getTarget(); @@ -56,8 +85,43 @@ return info; } + public Map<String, String[]> getParameters() + { + return parameters; + } + public ControllerResponse execute() throws ControllerException { + if (parameters.size() > 0) + { + NavigationalStateContext nsContext = (NavigationalStateContext)context.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); + + // + String pageId = getPage().getId().toString(); + + // + PageNavigationalState previousPNS = nsContext.getPageNavigationalState(pageId); + + // + Map<QName, String[]> state = new HashMap<QName, String[]>(); + + // Clone the previous state if needed + if (previousPNS != null) + { + state.putAll(previousPNS.getParameters()); + } + + // + for (Map.Entry<String, String[]> entry : parameters.entrySet()) + { + state.put(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, entry.getKey()), entry.getValue()); + } + + // + nsContext.setPageNavigationalState(pageId, new PageNavigationalState(state)); + } + + // return new UpdatePageResponse(page.getId()); } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-22 23:59:40 UTC (rev 11549) @@ -23,6 +23,7 @@ package org.jboss.portal.core.model.portal.navstate; import javax.xml.namespace.QName; +import javax.xml.XMLConstants; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -36,7 +37,8 @@ public class PageNavigationalState implements Serializable { - public static final String NAMESPACE_EXPLICIT = "org.jboss.portal.core.model.portal.navstate.PageNavigationalState.EXPLICIT"; + /** . */ + public static final String NAMESPACE_EXPLICIT = XMLConstants.NULL_NS_URI; // "urn:jboss:portal:coordination:explicit"; /** . */ private final HashMap<QName, String[]> parameters; @@ -55,5 +57,4 @@ { return Collections.unmodifiableMap(parameters); } - } Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-22 23:59:40 UTC (rev 11549) @@ -283,112 +283,86 @@ </page> <page> + + <!-- + | In this sample we show that + | - no implicit coordination occur if we do not declare it + | - different namespace can be bound + --> + <page-name>Parameters EXPLICIT</page-name> <window> - <window-name>PublicParametersPortletWindowA1</window-name> + <window-name>PublicParametersPortletWindow1</window-name> <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref> <region>left</region> <height>0</height> </window> <window> - <window-name>PublicParametersPortletWindowA2</window-name> + <window-name>PublicParametersPortletWindow2</window-name> <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref> - <region>left</region> - <height>1</height> + <region>center</region> + <height>0</height> </window> - <window> - <window-name>PublicParametersPortletWindowB1</window-name> + <window-name>PublicParametersPortletWindow3</window-name> <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref> - <region>center</region> - <height>0</height> + <region>left</region> + <height>1</height> </window> <window> - <window-name>PublicParametersPortletWindowB2</window-name> + <window-name>PublicParametersPortletWindow4</window-name> <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref> <region>center</region> <height>1</height> </window> - - <coordination> <parameter-strategy>EXPLICIT</parameter-strategy> <bindings> + + <!-- Same foo qname among 3 windows --> <parameter-binding> <name>binding1</name> <window-coordination> - <window-name>PublicParametersPortletWindowA1</window-name> - <qname>foo1</qname> + <window-name>PublicParametersPortletWindow1</window-name> + <qname>foo</qname> </window-coordination> <window-coordination> - <window-name>PublicParametersPortletWindowB2</window-name> - <qname>foo2</qname> + <window-name>PublicParametersPortletWindow2</window-name> + <qname>foo</qname> </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding2</name> <window-coordination> - <window-name>PublicParametersPortletWindowA1</window-name> - <qname>bar1</qname> + <window-name>PublicParametersPortletWindow3</window-name> + <qname>foo</qname> </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB2</window-name> - <qname>bar2</qname> - </window-coordination> </parameter-binding> - <parameter-binding> - <name>binding3</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA1</window-name> - <qname>juu1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB2</window-name> - <qname>juu2</qname> - </window-coordination> - </parameter-binding> - + <!-- Bind different namespaces --> <parameter-binding> - <name>binding4</name> + <name>binding2</name> <window-coordination> - <window-name>PublicParametersPortletWindowA2</window-name> - <qname>foo1</qname> + <window-name>PublicParametersPortletWindow1</window-name> + <qname>bar1</qname> </window-coordination> <window-coordination> - <window-name>PublicParametersPortletWindowB1</window-name> - <qname>foo2</qname> + <window-name>PublicParametersPortletWindow2</window-name> + <qname>{urn:jboss:portal:samples:daa1}daa1</qname> </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding5</name> <window-coordination> - <window-name>PublicParametersPortletWindowA2</window-name> - <qname>bar1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB1</window-name> + <window-name>PublicParametersPortletWindow3</window-name> <qname>bar2</qname> </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding6</name> <window-coordination> - <window-name>PublicParametersPortletWindowA2</window-name> - <qname>juu1</qname> + <window-name>PublicParametersPortletWindow4</window-name> + <qname>{urn:jboss:portal:samples:daa2}daa2</qname> </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB1</window-name> - <qname>juu2</qname> - </window-coordination> </parameter-binding> - - + </bindings> - </coordination> </page> + +<!-- <page> <page-name>Parameters FALLBACK</page-name> <window> @@ -417,8 +391,6 @@ <height>1</height> </window> - - <coordination> <parameter-strategy>FALLBACK</parameter-strategy> <bindings> @@ -456,118 +428,48 @@ </window-coordination> </parameter-binding> </bindings> - </coordination> </page> +--> + <page> + + <!-- + | In this sample we show that + | - implicit coordination occurs if parameter matches + | - no other kind of coordination occurs + --> + <page-name>Parameters IMPLICIT</page-name> <window> - <window-name>PublicParametersPortletWindowA1</window-name> + <window-name>PublicParametersPortletWindow1</window-name> <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref> <region>left</region> <height>0</height> </window> <window> - <window-name>PublicParametersPortletWindowA2</window-name> + <window-name>PublicParametersPortletWindow2</window-name> <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref> - <region>left</region> - <height>1</height> + <region>center</region> + <height>0</height> </window> - <window> - <window-name>PublicParametersPortletWindowB1</window-name> + <window-name>PublicParametersPortletWindow3</window-name> <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref> - <region>center</region> - <height>0</height> + <region>left</region> + <height>1</height> </window> <window> - <window-name>PublicParametersPortletWindowB2</window-name> + <window-name>PublicParametersPortletWindow4</window-name> <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref> <region>center</region> <height>1</height> </window> - - <coordination> <parameter-strategy>IMPLICIT</parameter-strategy> - <bindings> - <parameter-binding> - <name>binding1</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA1</window-name> - <qname>foo1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB2</window-name> - <qname>foo2</qname> - </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding2</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA1</window-name> - <qname>bar1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB2</window-name> - <qname>bar2</qname> - </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding3</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA1</window-name> - <qname>juu1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB2</window-name> - <qname>juu2</qname> - </window-coordination> - </parameter-binding> - - - <parameter-binding> - <name>binding4</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA2</window-name> - <qname>foo1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB1</window-name> - <qname>foo2</qname> - </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding5</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA2</window-name> - <qname>bar1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB1</window-name> - <qname>bar2</qname> - </window-coordination> - </parameter-binding> - <parameter-binding> - <name>binding6</name> - <window-coordination> - <window-name>PublicParametersPortletWindowA2</window-name> - <qname>juu1</qname> - </window-coordination> - <window-coordination> - <window-name>PublicParametersPortletWindowB1</window-name> - <qname>juu2</qname> - </window-coordination> - </parameter-binding> - - - </bindings> - </coordination> </page> - - </page> </deployment> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml 2008-07-22 23:39:47 UTC (rev 11548) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml 2008-07-22 23:59:40 UTC (rev 11549) @@ -41,7 +41,7 @@ <supported-public-render-parameter>foo1</supported-public-render-parameter> <supported-public-render-parameter>bar1</supported-public-render-parameter> <supported-public-render-parameter>juu1</supported-public-render-parameter> - + <supported-public-render-parameter>daa1</supported-public-render-parameter> </portlet> <portlet> @@ -59,9 +59,9 @@ <supported-public-render-parameter>foo2</supported-public-render-parameter> <supported-public-render-parameter>bar2</supported-public-render-parameter> <supported-public-render-parameter>juu2</supported-public-render-parameter> + <supported-public-render-parameter>daa2</supported-public-render-parameter> </portlet> - <portlet> <description>Shopping Catalog Portlet</description> <portlet-name>CoordinationShoppingCatalog</portlet-name> @@ -103,8 +103,10 @@ <value-type>org.jboss.portal.portlet.samples.shoppingcart.CartEvent</value-type> </event-definition> + <!-- Public render parameter definitions --> + <public-render-parameter> - <name>foo1</name> + <name>foo</name> <identifier>foo1</identifier> </public-render-parameter> @@ -112,13 +114,19 @@ <name>bar1</name> <identifier>bar1</identifier> </public-render-parameter> - + <public-render-parameter> - <name>juu1</name> + <qname xmlns:juu="urn:jboss:portal:samples:juu">juu:juu</qname> <identifier>juu1</identifier> </public-render-parameter> + <public-render-parameter> - <name>foo2</name> + <qname xmlns:daa1="urn:jboss:portal:samples:daa1">daa1:daa1</qname> + <identifier>daa1</identifier> + </public-render-parameter> + + <public-render-parameter> + <name>foo</name> <identifier>foo2</identifier> </public-render-parameter> @@ -128,8 +136,13 @@ </public-render-parameter> <public-render-parameter> - <name>juu2</name> + <qname xmlns:juu="urn:jboss:portal:samples:juu">juu:juu</qname> <identifier>juu2</identifier> </public-render-parameter> + <public-render-parameter> + <qname xmlns:daa2="urn:jboss:portal:samples:daa2">daa2:daa2</qname> + <identifier>daa2</identifier> + </public-render-parameter> + </portlet-app>