Author: julien(a)jboss.com Date: 2008-01-15 14:07:36 -0500 (Tue, 15 Jan 2008) New Revision: 9515 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletconfig-war/WEB-INF/portlet.xml Log: update public render parameter test case to pass with new public parameter meta data Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -402,12 +402,6 @@ } // - for (String renderParameter : portletMD.getSupportedPublicRenderParameters()) - { - containerPortletInfo.addRenderParameter(renderParameter); - } - - // return containerPortletInfo; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -28,7 +28,6 @@ import java.util.Map; import java.util.HashMap; import java.util.Set; -import java.util.LinkedHashSet; /** * For now implementation that use the portlet container directly. @@ -71,9 +70,6 @@ private final Map<String, String> initParameters; /** . */ - private final Set<String> renderParameterNames; - - /** . */ private final Boolean remotable; /** . */ @@ -105,7 +101,6 @@ this.name = name; this.className = className; this.initParameters = new HashMap<String, String>(); - this.renderParameterNames = new LinkedHashSet<String>(); this.remotable = remotable; this.bundleManager = bundleManager; } @@ -135,7 +130,6 @@ this.name = name; this.className = className; this.initParameters = new HashMap<String, String>(); - this.renderParameterNames = new LinkedHashSet<String>(); this.remotable = remotable; this.bundleManager = bundleManager; } @@ -170,16 +164,6 @@ return initParameters.get(name); } - public void addRenderParameter(String parameterName) - { - renderParameterNames.add(parameterName); - } - - public Set<String> getRenderParameterNames() - { - return renderParameterNames; - } - public ContainerCapabilitiesInfo getCapabilities() { return capabilities; @@ -215,7 +199,7 @@ return remotable; } - public ContainerEventingInfo getEvents() + public ContainerEventingInfo getEventing() { return events; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.jboss.portal.common.i18n.ResourceBundleManager; -import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; +import org.jboss.portal.portlet.impl.info.ContainerParameterInfo; import org.jboss.portal.portlet.info.EventInfo; import javax.portlet.PortletConfig; @@ -64,6 +64,9 @@ /** . */ private List<QName> processingEventQNames; + /** . */ + private List<String> publicRenderParameterNames; + public PortletConfigImpl( ContainerPortletInfo portletInfo, ContainerPortletApplicationInfo portletApplicationInfo, @@ -71,7 +74,7 @@ ResourceBundleManager bundleMgr) { List<QName> publishingEventQNames = new ArrayList<QName>(); - for (EventInfo event : portletInfo.getEvents().getProducedEvents()) + for (EventInfo event : portletInfo.getEventing().getProducedEvents()) { QName eventName = event.getName(); publishingEventQNames.add(eventName); @@ -79,19 +82,27 @@ // List<QName> processingEventQNames = new ArrayList<QName>(); - for (EventInfo event : portletInfo.getEvents().getConsumedEvents()) + for (EventInfo event : portletInfo.getEventing().getConsumedEvents()) { QName eventName = event.getName(); processingEventQNames.add(eventName); } // + List<String> publicRenderParameterNames = new ArrayList<String>(); + for (ContainerParameterInfo parameterInfo : portletInfo.getNavigation().getPublicParameters()) + { + publicRenderParameterNames.add(parameterInfo.getId()); + } + + // this.portletInfo = portletInfo; this.portletApplicationInfo = portletApplicationInfo; this.portletContext = portletContext; this.bundleMgr = bundleMgr; this.publishingEventQNames = publishingEventQNames; this.processingEventQNames = processingEventQNames; + this.publicRenderParameterNames = publicRenderParameterNames; } public String getPortletName() @@ -126,7 +137,7 @@ public Enumeration<String> getPublicRenderParameterNames() { - return Collections.enumeration(portletInfo.getRenderParameterNames()); + return Collections.enumeration(publicRenderParameterNames); } public String getDefaultNamespace() Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -287,7 +287,7 @@ } // - ContainerEventingInfo eventsInfo = preq.container.getInfo().getEvents(); + ContainerEventingInfo eventsInfo = preq.container.getInfo().getEventing(); // Check type for (ContainerEventInfo eventInfo : eventsInfo.getProducedEvents()) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -86,7 +86,7 @@ */ Boolean isRemotable(); - EventingInfo getEvents(); + EventingInfo getEventing(); NavigationInfo getNavigation(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -81,7 +81,7 @@ this.remotable = remotable; } - public EventingInfoSupport getEvents() + public EventingInfoSupport getEventing() { return eventsSupport; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 19:07:36 UTC (rev 9515) @@ -265,7 +265,7 @@ PortletInfo portletInfo = portlet.getInfo(); // - for (EventInfo eventInfo : portletInfo.getEvents().getConsumedEvents()) + for (EventInfo eventInfo : portletInfo.getEventing().getConsumedEvents()) { if (event.getName().equals(eventInfo.getName())) { Modified: modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletconfig-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletconfig-war/WEB-INF/portlet.xml 2008-01-15 18:19:23 UTC (rev 9514) +++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletconfig-war/WEB-INF/portlet.xml 2008-01-15 19:07:36 UTC (rev 9515) @@ -202,4 +202,14 @@ <qname xmlns:a="urn:default-namespace">a:event6</qname> </event-definition> + <public-render-parameter> + <identifier>render_param1</identifier> + <name>render_param_name</name> + </public-render-parameter> + + <public-render-parameter> + <identifier>render_param2</identifier> + <name>render_param_name2</name> + </public-render-parameter> + </portlet-app>