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 2005/09/26 15:54:14 UTC

svn commit: r291625 - in /cocoon/blocks: portal-sample/trunk/WEB-INF/xconf/ portal/trunk/WEB-INF/xconf/ portal/trunk/java/org/apache/cocoon/components/persistence/ portal/trunk/java/org/apache/cocoon/portal/ portal/trunk/java/org/apache/cocoon/portal/w...

Author: cziegeler
Date: Mon Sep 26 06:54:02 2005
New Revision: 291625

URL: http://svn.apache.org/viewcvs?rev=291625&view=rev
Log:
Clean up configuration

Added:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles
Modified:
    cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
    cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java

Modified: cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf?rev=291625&r1=291624&r2=291625&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf Mon Sep 26 06:54:02 2005
@@ -411,4 +411,9 @@
     <parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
   </component>
 
+  <!-- This is the special basket renderer -->
+  <component role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/basket"
+             class="org.apache.cocoon.portal.coplets.basket.AddToBasketAspect"
+             logger="portal"/>
+
 </components>

Modified: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf?rev=291625&r1=291624&r2=291625&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf Mon Sep 26 06:54:02 2005
@@ -20,6 +20,10 @@
     | SVN $Id$
     +-->
 <components>
+  <!-- Include roles -->
+  <include src="resource://org/apache/cocoon/portal/portal.roles"/>
+  <include src="resource://org/apache/cocoon/portal/wsrp/portal.roles"/>
+
   <!-- Portal service definition template
   <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal" role="org.apache.cocoon.portal.PortalService">
    <portals>
@@ -42,29 +46,6 @@
       </component-instance>
   </input-modules>
 
-  <!-- Event Aspect configuration -->
-  <component class="org.apache.cocoon.core.container.DefaultServiceSelector" role="org.apache.cocoon.portal.event.aspect.EventAspectSelector">
-    <aspect logger="portal" name="action-counter" class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
-    <aspect logger="portal" name="request-parameter" class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
-    <aspect logger="portal" name="frame" class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
-    <aspect logger="portal" name="link"  class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect" />    
-    <aspect logger="portal" name="page-label" class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"/>
-    <aspect logger="portal" name="convertable" class="org.apache.cocoon.portal.event.aspect.impl.ConvertableEventAspect"/>
-
-    <aspect logger="portal" name="full-screen-coplet" class="org.apache.cocoon.portal.event.aspect.impl.FullScreenCopletEventAspect"/>
-
-    <!-- This aspect sets headers on the response that tell the client to not cache the response: -->
-    <aspect logger="portal" name="no-client-caching" class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"/>
-    <!-- This aspect is required for wsrp: -->
-    <aspect logger="portal" name="wsrp" class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"/>
-  </component>
-
-  <!-- Portal Manager Aspect Configuration -->
-  <component class="org.apache.cocoon.core.container.DefaultServiceSelector"
-             role="org.apache.cocoon.portal.PortalManagerAspectSelector">
-      <!--  You can add own aspects here. -->
-  </component>
-
   <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal" role="org.apache.cocoon.portal.event.EventManager">
     <event-aspects>
         <!--  The client should not cache the page. -->
@@ -101,13 +82,6 @@
     </receiver-roles>
   </component>
 
-  <!-- Event Factory configuration -->
- <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.event.ConvertableEventFactorySelector">
-   <!-- The events that can be marshalled. The name must match the Event's request parameter. -->
-   <factory logger="portal" name="cocoon-portal-fs" class="org.apache.cocoon.portal.event.impl.FullScreenCopletEventFactory"/>
-   <factory logger="portal" name="url" class="org.apache.cocoon.portal.pluto.PortletURLProviderFactory"/>
- </component>
-
   <!-- This is the portal manager.
        The portal manager can be extended with different aspects.
        Currently the JSR-168 aspect is configured/activated.
@@ -173,68 +147,5 @@
       <parameter name="wsrp-config" value="profiles/wsrp-config.xml"/>
     </coplet-adapter>
   </component>
-
-
- <!-- Renderer Aspect configuration -->
- <component class="org.apache.cocoon.core.container.DefaultServiceSelector" role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector">
-    <aspect logger="portal" name="composite-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
-    <aspect logger="portal" name="tab-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
-    <aspect logger="portal" name="window" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
-    <aspect logger="portal" name="portlet-window"
-            class="org.apache.cocoon.portal.layout.renderer.aspect.impl.PortletWindowAspect"/>
-    <aspect logger="portal" name="wsrp-window"
-            class="org.apache.cocoon.portal.wsrp.adapter.WSRPPortletWindowAspect"/>
-
-    <!-- This aspect can be used to render the minimize/maximize buttons -->
-    <aspect logger="portal" name="coplet-sizing" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
-
-    <!-- This aspect can be used to render the remove button -->
-    <aspect logger="portal" name="coplet-removing" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.RemovableAspect"/>
-
-    <!-- This aspect can be used to render a full-screen button -->
-    <aspect logger="portal" name="coplet-full-screen" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FullScreenCopletAspect"/>
-
-    <!-- This aspect can be used to render cinclude statements that will be used to include the coplet content,
-         use the coplet aspect below to directly stream the content -->
-    <aspect logger="portal" name="coplet-cinclude" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect"/>
-
-    <!-- This aspect creates a history of all layout aspect datas,
-         coplet aspect datas and coplet attributes. It can be used by
-         the bookmark action to browse the history -->
-    <aspect logger="portal" name="history" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.HistoryAspect"/>
-    
-    <!-- This aspect can be used to render the content of the coplet -->
-    <aspect logger="portal" name="coplet" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
-    <aspect logger="portal" name="frame" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
-    <aspect logger="portal" name="xslt" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
-    <aspect logger="portal" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect" name="parameter"/>
-    <!-- This is the special basket renderer -->
-    <aspect logger="portal" class="org.apache.cocoon.portal.coplets.basket.AddToBasketAspect" name="basket"/>
- </component>
-
- <!-- Aspect Storage configuration -->
- <component class="org.apache.cocoon.core.container.DefaultServiceSelector" 
-            role="org.apache.cocoon.portal.aspect.AspectDataStoreSelector">
-    <store name="temporary" logger="portal" class="org.apache.cocoon.portal.aspect.impl.TemporaryAspectDataStore"/>
-    <store name="request"  logger="portal" class="org.apache.cocoon.portal.aspect.impl.RequestAspectDataStore"/>
-    <store name="session" logger="portal" class="org.apache.cocoon.portal.aspect.impl.SessionAspectDataStore"/>
-    <store name="persistent" logger="portal" class="org.apache.cocoon.portal.aspect.impl.PersistentAspectDataStore"/>
-    <store name="memory" logger="portal" class="org.apache.cocoon.portal.aspect.impl.MemoryAspectDataStore"/>
- </component>
-
- <component class="org.apache.cocoon.components.persistence.CastorSourceConverter" role="org.apache.cocoon.components.persistence.CastorSourceConverter" logger="portal">
- 	<mapping-source source="layout">resource://org/apache/cocoon/portal/layout/layout.xml</mapping-source>
- 	<mapping-source source="copletbasedata">resource://org/apache/cocoon/portal/coplet/copletbasedata.xml</mapping-source>
- 	<mapping-source source="copletdata">resource://org/apache/cocoon/portal/coplet/copletdata.xml</mapping-source>
- 	<mapping-source source="copletinstancedata">resource://org/apache/cocoon/portal/coplet/copletinstancedata.xml</mapping-source>
- </component>
- <component class="org.apache.cocoon.portal.profile.impl.MapProfileLS" role="org.apache.cocoon.portal.profile.ProfileLS" logger="portal"/>
-
- <component class="org.apache.cocoon.components.variables.DefaultVariableResolverFactory" role="org.apache.cocoon.components.variables.VariableResolverFactory" logger="portal"/>
-
- <!--  User Context Provider for WSRP -->
- <component role="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"
-            class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl"
-            logger="portal"/>
 
 </components>

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java?rev=291625&r1=291624&r2=291625&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java Mon Sep 26 06:54:02 2005
@@ -117,10 +117,19 @@
      */
     public void configure(Configuration config) throws ConfigurationException {
     	Configuration[] children = config.getChildren("mapping-source");
-    	for (int i=0; i<children.length; i++) {
-    		Configuration mappingSource = children[i];
-    		this.mappingSources.put(mappingSource.getAttribute("source"), mappingSource.getValue());
-    	}
+        if ( children.length == 0 ) {
+            // default configuration
+            final String prefix = "resource://org/apache/cocoon/portal/";
+            this.mappingSources.put("layout", prefix + "layout/layout.xml");
+            this.mappingSources.put("copletbasedata", prefix + "coplet/copletbasedata.xml");
+            this.mappingSources.put("copletdata", prefix + "coplet/copletdata.xml");
+            this.mappingSources.put("copletinstancedata", prefix + "coplet/copletinstancedata.xml");
+        } else {
+        	for (int i=0; i<children.length; i++) {
+        	    Configuration mappingSource = children[i];
+    	        this.mappingSources.put(mappingSource.getAttribute("source"), mappingSource.getValue());
+    	    }
+        }
         this.defaultSuppressXSIType = config.getChild("suppressXSIType").getValueAsBoolean(false);
     }
 

Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles?rev=291625&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles Mon Sep 26 06:54:02 2005
@@ -0,0 +1,185 @@
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<role-list>
+
+  <!--+ 
+      | Event Aspects
+      |
+      +-->
+    <!-- Legacy service selector. -->
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspectSelector"
+          default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+    
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/action-counter"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
+
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/request-parameter"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
+
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/frame"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
+
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/link"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect"/>
+
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/page-label"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"/>
+
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/convertable"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.ConvertableEventAspect"/>
+
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/full-screen-coplet"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.FullScreenCopletEventAspect"/>
+
+    <!--+
+        | This aspect sets headers on the response telling the client to not cache
+        | the response.
+        +-->
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/no-client-caching"
+          default-class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"/>
+
+
+  <!--+
+      | Portal Manager Aspects
+      |
+      +-->
+    <!-- Legacy service selector. -->
+    <role name="org.apache.cocoon.portal.PortalManagerAspectSelector"
+          default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+
+  <!--+
+      | Renderer Aspects
+      |
+      +-->
+    <!-- Legacy service selector. -->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector"
+          default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/composite-content"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/tab-content"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/window"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/portlet-window"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.PortletWindowAspect"/>
+
+    <!--+
+        | This aspect can be used to render the minimize/maximize buttons.
+        +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-sizing"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
+
+    <!--+
+        | This aspect can be used to render the remove button.
+        +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-removing"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.RemovableAspect"/>
+
+    <!--+
+        | This aspect can be used to render a full-screen button-
+        +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-full-screen"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FullScreenCopletAspect"/>
+
+    <!--+
+        | This aspect can be used to render cinclude statements that will be used to include
+        | the coplet content, use the coplet aspect below to directly stream the content.
+        +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-cinclude"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect"/>
+
+    <!--+
+        | This aspect creates a history of all layout aspect datas,
+        | coplet aspect datas and coplet attributes. It can be used by
+        | the bookmark action to browse the history.
+        +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/history"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.HistoryAspect"/>
+    
+    <!--+
+        | This aspect can be used to render the content of the coplet.
+        +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/frame"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/xslt"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
+
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/parameter"
+          default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect"/>
+
+
+  <!--+
+      | Aspect Storages
+      |
+      +-->
+    <!-- Legacy service selector. -->
+    <role name="org.apache.cocoon.portal.aspect.AspectDataStoreSelector"
+          default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+    <role name="org.apache.cocoon.portal.aspect.AspectDataStore/temporary"
+          default-class="org.apache.cocoon.portal.aspect.impl.TemporaryAspectDataStore"/>
+
+    <role name="org.apache.cocoon.portal.aspect.AspectDataStore/request"
+          default-class="org.apache.cocoon.portal.aspect.impl.RequestAspectDataStore"/>
+
+    <role name="org.apache.cocoon.portal.aspect.AspectDataStore/session"
+          default-class="org.apache.cocoon.portal.aspect.impl.SessionAspectDataStore"/>
+
+    <role name="org.apache.cocoon.portal.aspect.AspectDataStore/persistent"
+          default-class="org.apache.cocoon.portal.aspect.impl.PersistentAspectDataStore"/>
+
+    <role name="org.apache.cocoon.portal.aspect.AspectDataStore/memory"
+          default-class="org.apache.cocoon.portal.aspect.impl.MemoryAspectDataStore"/>
+
+
+  <!--+
+      | Event Factory configuration
+      | The events that can be marshalled. The name must match the Event's request parameter.
+      +-->
+    <!-- Legacy service selector. -->
+    <role name="org.apache.cocoon.portal.event.ConvertableEventFactorySelector"
+          default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+    <role name="org.apache.cocoon.portal.event.ConvertableEventFactory/cocoon-portal-fs"
+          default-class="org.apache.cocoon.portal.event.impl.FullScreenCopletEventFactory"/>
+
+    <role name="org.apache.cocoon.portal.event.ConvertableEventFactory/url"
+          default-class="org.apache.cocoon.portal.pluto.PortletURLProviderFactory"/>
+
+
+  <!--+
+      | Components.
+      +-->
+    <role name="org.apache.cocoon.components.persistence.CastorSourceConverter"
+          default-class="org.apache.cocoon.components.persistence.CastorSourceConverter"/>
+
+    <role name="org.apache.cocoon.portal.profile.ProfileLS"
+          default-class="org.apache.cocoon.portal.profile.impl.MapProfileLS"/>
+
+    <role name="org.apache.cocoon.components.variables.VariableResolverFactory"
+          default-class="org.apache.cocoon.components.variables.DefaultVariableResolverFactory"/>
+
+</role-list>
\ No newline at end of file

Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles?rev=291625&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles Mon Sep 26 06:54:02 2005
@@ -0,0 +1,43 @@
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<role-list>
+
+  <!--+ 
+      | Event Aspects
+      |
+      +-->
+    <!--+
+        | This aspect is required for WSRP.
+        +-->
+    <role name="org.apache.cocoon.portal.event.aspect.EventAspect/wsrp"
+          default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"/>
+
+
+  <!--+
+      | Renderer Aspects
+      |
+      +-->
+    <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/wsrp-window"
+          default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPPortletWindowAspect"/>
+
+  <!--+
+      | Default User Context Provider for WSRP.
+      +-->
+  <role name="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"
+        default-class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl"/>
+
+</role-list>
\ No newline at end of file