You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/08/15 21:27:50 UTC
svn commit: r431683 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
Author: cziegeler
Date: Tue Aug 15 12:27:49 2006
New Revision: 431683
URL: http://svn.apache.org/viewvc?rev=431683&view=rev
Log:
Correct config and clean up wsrp adapter
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
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-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf?rev=431683&r1=431682&r2=431683&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf Tue Aug 15 12:27:49 2006
@@ -83,14 +83,11 @@
The portal manager can be extended with different aspects.
Currently the JSR-168 aspect is configured/activated.
If you don't need the JSR-168 support uncomment the aspect.
- In a similar manner the wsrp support works.
-->
<portal-manager>
<aspects>
<!-- JSR-168 support: -->
<aspect adapter="portlet"/>
- <!-- wsrp support: -->
- <aspect adapter="wsrp"/>
</aspects>
</portal-manager>
@@ -154,142 +151,6 @@
<!-- Turn on/off hot deployment: -->
<hot-deployment>true</hot-deployment>
</portal-deployment-manager>
-
- <!-- Renderer configuration -->
- <renderer name="column"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="column-layout"/>
- </aspect>
- <aspect type="composite-content">
- <parameter name="root-tag" value="false"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="row"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="row-layout"/>
- </aspect>
- <aspect type="composite-content">
- <parameter name="root-tag" value="false"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="tab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="tab-layout"/>
- </aspect>
- <aspect type="tab-content">
- <parameter name="root-tag" value="false"/>
- <parameter name="store" value="session"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="rawtab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="parameter">
- <parameter name="tag-name" value="tab-layout"/>
- </aspect>
- <aspect type="tab-content">
- <parameter name="root-tag" value="false"/>
- <parameter name="store" value="session"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="linktab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/linktab.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="linktab-layout"/>
- </aspect>
- <aspect type="tab-content">
- <parameter name="root-tag" value="false"/>
- <parameter name="store" value="session"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="window"/>
- </aspect>
- <aspect type="window">
- <parameter name="root-tag" value="false"/>
- </aspect>
- <aspect type="basket"/>
- <aspect type="coplet-cinclude"/>
- </aspects>
- </renderer>
- <renderer name="borderless-window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/borderless-window.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="window"/>
- </aspect>
- <aspect type="window">
- <parameter name="root-tag" value="false"/>
- </aspect>
- <aspect type="basket"/>
- <aspect type="coplet-cinclude"/>
- </aspects>
- </renderer>
- <renderer name="frame"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="frame">
- <parameter name="store" value="request"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="nowindow"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="coplet-cinclude">
- <parameter name="root-tag" value="false"/>
- </aspect>
- </aspects>
- </renderer>
- <renderer name="link"
- class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"/>
- <renderer name="decorated-frame"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
- <aspects>
- <aspect type="xslt">
- <parameter name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/>
- </aspect>
- <aspect type="parameter">
- <parameter name="tag-name" value="frame"/>
- </aspect>
- <aspect type="frame">
- <parameter name="store" value="request"/>
- </aspect>
- </aspects>
- </renderer>
<!-- Layout factory configuration -->
<portal-layout-factory>
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=431683&r1=431682&r2=431683&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 Tue Aug 15 12:27:49 2006
@@ -21,7 +21,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -45,11 +44,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.wrapper.RequestParameters;
-import org.apache.cocoon.portal.PortalManagerAspect;
-import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
-import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
@@ -116,8 +111,7 @@
*/
public class WSRPAdapter
extends AbstractCopletAdapter
- implements PortalManagerAspect,
- CopletDecorationProvider,
+ implements CopletDecorationProvider,
Parameterizable,
Receiver {
@@ -181,7 +175,7 @@
* @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
*/
public void parameterize(Parameters params) throws ParameterException {
- this.wsrpConfigLocation = params.getParameter("wsrp-config");
+ this.wsrpConfigLocation = params.getParameter("wsrp-config", "config/wsrp-config.xml");
this.parameters = params;
}
@@ -657,27 +651,6 @@
} finally {
this.setCurrentCopletInstanceData(null);
}
- }
-
- /**
- * @see org.apache.cocoon.portal.PortalManagerAspect#prepare(org.apache.cocoon.portal.PortalManagerAspectPrepareContext, org.apache.cocoon.portal.PortalService)
- */
- public void prepare(PortalManagerAspectPrepareContext aspectContext,
- PortalService service)
- throws ProcessingException {
- // process the events
- aspectContext.invokeNext();
- }
-
- /**
- * @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,
- Properties properties)
- throws SAXException {
- aspectContext.invokeNext(ch, properties);
}
/**