Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 93069 invoked from network); 7 Aug 2006 12:49:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Aug 2006 12:49:40 -0000 Received: (qmail 42119 invoked by uid 500); 7 Aug 2006 12:49:39 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 41995 invoked by uid 500); 7 Aug 2006 12:49:39 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 41984 invoked by uid 99); 7 Aug 2006 12:49:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Aug 2006 05:49:39 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Aug 2006 05:49:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F17451A981A; Mon, 7 Aug 2006 05:49:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r429319 - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl... Date: Mon, 07 Aug 2006 12:48:29 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060807124917.F17451A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Mon Aug 7 05:48:29 2006 New Revision: 429319 URL: http://svn.apache.org/viewvc?rev=429319&view=rev Log: Use properties instead of parameters Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspect.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java Mon Aug 7 05:48:29 2006 @@ -15,7 +15,8 @@ */ package org.apache.cocoon.portal; -import org.apache.avalon.framework.parameters.Parameters; +import java.util.Properties; + import org.apache.cocoon.ProcessingException; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; @@ -32,18 +33,19 @@ */ public interface PortalManager { - /** This parameter containing a layout id can be passed to the - * {@link #showPortal(ContentHandler, Parameters)} method. In this + /** This property containing a layout id can be passed to the + * {@link #showPortal(ContentHandler, Properties)} method. In this * case only the tree starting with this layout object is rendered. */ - String PARAMETER_RENDER_LAYOUT = "render-layout"; + String PROPERTY_RENDER_LAYOUT = "render-layout"; - /** This parameter containing a coplet instance id can be passed to the - * {@link #showPortal(ContentHandler, Parameters)} method. In this + /** This property containing a coplet instance id can be passed to the + * {@link #showPortal(ContentHandler, Properties)} method. In this * case only the coplet with the surrounding layout is rendered. */ - String PARAMETER_RENDER_COPLET = "render-coplet"; + String PROPERTY_RENDER_COPLET = "render-coplet"; + /** The bean name of this component. */ String ROLE = PortalManager.class.getName(); /** @@ -57,10 +59,10 @@ /** * Render the portal. * @param ch The content handler receiving the sax events. - * @param parameters A parameters object. + * @param Properties A properties object (can be null) * @throws SAXException */ void showPortal(ContentHandler ch, - Parameters parameters) + Properties properties) throws SAXException; } Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspect.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspect.java Mon Aug 7 05:48:29 2006 @@ -15,7 +15,8 @@ */ package org.apache.cocoon.portal; -import org.apache.avalon.framework.parameters.Parameters; +import java.util.Properties; + import org.apache.cocoon.ProcessingException; import org.apache.cocoon.portal.PortalService; import org.xml.sax.ContentHandler; @@ -37,6 +38,6 @@ void render(PortalManagerAspectRenderContext context, PortalService service, ContentHandler ch, - Parameters parameters) + Properties properties) throws SAXException; } Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java Mon Aug 7 05:48:29 2006 @@ -16,8 +16,8 @@ package org.apache.cocoon.portal; import java.util.Map; +import java.util.Properties; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; /** @@ -33,9 +33,9 @@ throws ProcessingException; /** - * Get the {@link Parameters} of the aspect. + * Get the {@link Properties} of the aspect. */ - Parameters getAspectParameters(); + Properties getAspectProperties(); /** * Get the object model. Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java Mon Aug 7 05:48:29 2006 @@ -16,8 +16,8 @@ package org.apache.cocoon.portal; import java.util.Map; +import java.util.Properties; -import org.apache.avalon.framework.parameters.Parameters; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; @@ -31,13 +31,13 @@ * Invoke next aspect */ void invokeNext(ContentHandler ch, - Parameters parameters) + Properties parameters) throws SAXException; /** - * Get the {@link Parameters} of the aspect. + * Get the {@link Properties} of the aspect. */ - Parameters getAspectParameters(); + Properties getAspectProperties(); /** * Get the object model. Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java Mon Aug 7 05:48:29 2006 @@ -73,7 +73,7 @@ // 2. rendering PortalManager pm = this.portalService.getPortalManager(); pm.process(); - pm.showPortal(this.xmlConsumer, this.parameters); + pm.showPortal(this.xmlConsumer, Parameters.toProperties(this.parameters)); } /** Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java Mon Aug 7 05:48:29 2006 @@ -17,8 +17,8 @@ import java.util.Iterator; import java.util.Map; +import java.util.Properties; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.portal.PortalManagerAspect; import org.apache.cocoon.portal.PortalManagerAspectPrepareContext; @@ -39,7 +39,7 @@ private final Map objectModel; private Iterator iterator; private Iterator configIterator; - private Parameters config; + private Properties config; public DefaultPortalManagerAspectContext(PortalManagerAspectChain chain, PortalService service, @@ -56,28 +56,28 @@ public void invokeNext() throws ProcessingException { if (this.iterator.hasNext()) { - this.config = (Parameters)this.configIterator.next(); + this.config = (Properties)this.configIterator.next(); final PortalManagerAspect aspect = (PortalManagerAspect) iterator.next(); aspect.prepare(this, this.service); } } /** - * @see org.apache.cocoon.portal.PortalManagerAspectPrepareContext#getAspectParameters() + * @see org.apache.cocoon.portal.PortalManagerAspectRenderContext#getAspectProperties() */ - public Parameters getAspectParameters() { + public Properties getAspectProperties() { return this.config; } /** * @see org.apache.cocoon.portal.PortalManagerAspectRenderContext#invokeNext(org.xml.sax.ContentHandler, org.apache.avalon.framework.parameters.Parameters) */ - public void invokeNext(ContentHandler ch, Parameters parameters) + public void invokeNext(ContentHandler ch, Properties properties) throws SAXException { if (this.iterator.hasNext()) { - this.config = (Parameters)this.configIterator.next(); + this.config = (Properties)this.configIterator.next(); final PortalManagerAspect aspect = (PortalManagerAspect) iterator.next(); - aspect.render(this, this.service, ch, parameters); + aspect.render(this, this.service, ch, properties); } } Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java Mon Aug 7 05:48:29 2006 @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Properties; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; @@ -42,7 +43,7 @@ ServiceSelector adapterSelector, Configuration conf, PortalManagerAspect endAspect, - Parameters endAspectParameters) + Properties endAspectProperties) throws ConfigurationException { if ( conf != null ) { final Configuration[] aspectConfigs = conf.getChildren("aspect"); @@ -71,12 +72,12 @@ } } this.aspects.add(pAspect); - Parameters aspectConfiguration = Parameters.fromConfiguration(current); - this.configs.add(aspectConfiguration); + final Parameters aspectConfiguration = Parameters.fromConfiguration(current); + this.configs.add(Parameters.toProperties(aspectConfiguration)); } } this.aspects.add(endAspect); - this.configs.add(endAspectParameters); + this.configs.add(endAspectProperties); } public Iterator getIterator() { Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Mon Aug 7 05:48:29 2006 @@ -17,13 +17,13 @@ import java.util.Iterator; import java.util.List; +import java.util.Properties; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.ServiceSelector; @@ -105,15 +105,15 @@ } /** - * @see PortalManager#showPortal(ContentHandler, Parameters) + * @see PortalManager#showPortal(ContentHandler, Properties) */ - public void showPortal(ContentHandler contentHandler, Parameters parameters) + public void showPortal(ContentHandler contentHandler, Properties properties) throws SAXException { DefaultPortalManagerAspectContext aspectContext = new DefaultPortalManagerAspectContext(this.chain, this.portalService, ContextHelper.getObjectModel(this.context)); - aspectContext.invokeNext(contentHandler, parameters); + aspectContext.invokeNext(contentHandler, properties); } /** @@ -125,7 +125,7 @@ this.adapterSelector, conf.getChild("aspects"), this, - new Parameters()); + new Properties()); } /** @@ -144,12 +144,12 @@ } /** - * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, org.apache.avalon.framework.parameters.Parameters) + * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, java.util.Properties) */ public void render(PortalManagerAspectRenderContext renderContext, PortalService service, ContentHandler ch, - Parameters parameters) + Properties properties) throws SAXException { final ProfileManager profileManager = this.portalService.getProfileManager(); @@ -177,8 +177,8 @@ Layout portalLayout = null; // check for parameters - final String copletId = parameters.getParameter(PortalManager.PARAMETER_RENDER_COPLET, null); - final String layoutId = parameters.getParameter(PortalManager.PARAMETER_RENDER_LAYOUT, null); + final String copletId = (properties == null ? null : properties.getProperty(PortalManager.PROPERTY_RENDER_COPLET, null)); + final String layoutId = (properties == null ? null : properties.getProperty(PortalManager.PROPERTY_RENDER_LAYOUT, null)); if ( StringUtils.isNotEmpty(copletId) && StringUtils.isNotEmpty(layoutId) ) { throw new SAXException("Only one of the paramteters can be specified for rendering: coplet or layout."); } @@ -210,6 +210,6 @@ } // although we should be the last in the queue, // let's invoke the next - renderContext.invokeNext(ch, parameters); + renderContext.invokeNext(ch, properties); } } Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java Mon Aug 7 05:48:29 2006 @@ -17,9 +17,9 @@ import java.util.Iterator; import java.util.List; +import java.util.Properties; import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.portal.PortalManagerAspect; import org.apache.cocoon.portal.PortalManagerAspectPrepareContext; @@ -57,12 +57,12 @@ } /** - * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, org.apache.avalon.framework.parameters.Parameters) + * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, java.util.Properties) */ public void render(PortalManagerAspectRenderContext context, PortalService service, ContentHandler ch, - Parameters parameters) + Properties properties) throws SAXException { // we should be the first aspect for rendering // preload all changed coplets @@ -75,6 +75,6 @@ adapter.toSAX(cid, nullHandler ); } // start "real" rendering - context.invokeNext(ch, parameters); + context.invokeNext(ch, properties); } } Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Mon Aug 7 05:48:29 2006 @@ -398,18 +398,18 @@ } /** - * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, org.apache.avalon.framework.parameters.Parameters) + * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, java.util.Properties) */ public void render(PortalManagerAspectRenderContext aspectContext, PortalService service, ContentHandler ch, - Parameters contextParameters) + Properties properties) throws SAXException { final Map objectModel = aspectContext.getObjectModel(); // don't generate a response, if we issued a redirect if (objectModel.remove("portlet-event") == null) { - aspectContext.invokeNext(ch, contextParameters); + aspectContext.invokeNext(ch, properties); } } Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=429319&r1=429318&r2=429319&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Mon Aug 7 05:48:29 2006 @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import oasis.names.tc.wsrp.v1.types.BlockingInteractionResponse; import oasis.names.tc.wsrp.v1.types.LocalizedString; @@ -669,14 +670,14 @@ } /** - * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, org.apache.avalon.framework.parameters.Parameters) + * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, java.util.Properties) */ public void render(PortalManagerAspectRenderContext aspectContext, PortalService service, ContentHandler ch, - Parameters parameters) + Properties properties) throws SAXException { - aspectContext.invokeNext(ch, parameters); + aspectContext.invokeNext(ch, properties); } /**