Return-Path: 
 <cvs-return-24275-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 74757 invoked from network); 11 Sep 2005 16:32:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 11 Sep 2005 16:32:35 -0000
Received: (qmail 20776 invoked by uid 500); 11 Sep 2005 16:32:34 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 20716 invoked by uid 500); 11 Sep 2005 16:32:33 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 20703 invoked by uid 99); 11 Sep 2005 16:32:33 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 11 Sep 2005 09:32:32 -0700
Received: (qmail 74720 invoked by uid 65534); 11 Sep 2005 16:32:31 -0000
Message-ID: <20050911163231.74719.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r280148 - in /cocoon/blocks:
 portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
 portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
Date: Sun, 11 Sep 2005 16:32:30 -0000
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Sun Sep 11 09:31:49 2005
New Revision: 280148

URL: http://svn.apache.org/viewcvs?rev=280148&view=rev
Log:
Correct sample configuration

Modified:
    cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
    cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf

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=280148&r1=280147&r2=280148&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 Sun Sep 11 09:31:49 2005
@@ -59,11 +59,15 @@
       <layout-user-save uri="cocoon:raw:/save-user-profile?profile=layout"/>
     </profiles>
   </component>
-  <component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager" logger="portal" role="org.apache.cocoon.portal.profile.ProfileManager/Cowarp">
+  <component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager"
+             logger="portal"
+             role="org.apache.cocoon.portal.profile.ProfileManager/Cowarp">
     <parameter name="userinfo-provider" value="org.osoco.cowarp.portal.UserInfoProviderImpl"/>
   </component>
 
-  <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal" role="org.apache.cocoon.portal.PortalService">
+  <component class="org.apache.cocoon.portal.impl.PortalServiceImpl"
+             logger="portal"
+             role="org.apache.cocoon.portal.PortalService">
    <portals>
      <portal name="portal">
        <!-- This is the sample portal: 
@@ -87,303 +91,339 @@
    </portals>
   </component>
 
- <component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager" logger="portal" role="org.apache.cocoon.portal.profile.ProfileManager/Auth">
- </component>
+  <component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager"
+             logger="portal"
+             role="org.apache.cocoon.portal.profile.ProfileManager/Auth"/>
 
- <!-- Renderer configuration -->
- <component class="org.apache.cocoon.core.container.DefaultServiceSelector" role="org.apache.cocoon.portal.layout.renderer.RendererSelector">
-     <renderer name="column" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" >
-         <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" logger="portal" >
-         <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" logger="portal" >
-         <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="history"/>
-             <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" logger="portal" >
-         <aspects>
-             <aspect type="parameter">
-                 <parameter name="tag-name" value="tab-layout"/>
-             </aspect>
-             <aspect type="history"/>
-             <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" logger="portal">
-         <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="history"/>
-             <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" logger="portal" >
-         <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="coplet-removing"/>
-             <aspect type="coplet-full-screen"/>
-             <aspect type="coplet-sizing"/>
-             <aspect type="history"/>
-             <aspect type="basket"/>
-             <aspect type="coplet-cinclude"/>
-         </aspects>
-     </renderer>
-     <renderer name="borderless-window" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" >
-         <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="coplet-removing"/>
-             <aspect type="coplet-full-screen"/>
-             <aspect type="coplet-sizing"/>
-             <aspect type="history"/>
-             <aspect type="basket"/>
-             <aspect type="coplet-cinclude"/>
-         </aspects>
-     </renderer>
-     <renderer name="frame" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" >
-         <aspects>
-             <aspect type="frame">
-                 <parameter name="store" value="request"/>
-             </aspect>
-         </aspects>
-     </renderer>
-     <renderer name="nowindow" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal">
-         <aspects>
-             <aspect type="history"/>
-             <aspect type="coplet-cinclude">
-                <parameter name="root-tag" value="false"/>
-             </aspect>
-         </aspects>
-     </renderer>
-     <renderer name="portlet-window"
-               class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
-               logger="portal">
-         <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="portlet-window">
-                 <parameter name="root-tag" value="false"/>
-             </aspect>
-             <aspect type="coplet-removing"/>
-             <aspect type="history"/>
-             <aspect type="basket"/>
-             <aspect type="coplet-cinclude"/>
-         </aspects>
-     </renderer>
-     <renderer name="wsrp-window"
-               class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
-               logger="portal">
-         <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="wsrp-window">
-                 <parameter name="root-tag" value="false"/>
-             </aspect>
-             <aspect type="coplet-removing"/>
-             <aspect type="history"/>
-             <aspect type="basket"/>
-             <aspect type="coplet-cinclude"/>
-         </aspects>
-     </renderer>
-     <renderer name="link" 
-               class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer" 
-               logger="portal"/>
-     <renderer name="decorated-frame" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal">
-         <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 configuration -->
+  <component class="org.apache.cocoon.core.container.DefaultServiceSelector"
+             role="org.apache.cocoon.portal.layout.renderer.RendererSelector">
+    <renderer name="column"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal" >
+      <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"
+              logger="portal" >
+      <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"
+              logger="portal" >
+      <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="history"/>
+        <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"
+              logger="portal" >
+      <aspects>
+        <aspect type="parameter">
+          <parameter name="tag-name" value="tab-layout"/>
+        </aspect>
+        <aspect type="history"/>
+        <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"
+              logger="portal">
+      <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="history"/>
+        <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"
+              logger="portal" >
+      <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="coplet-removing"/>
+        <aspect type="coplet-full-screen"/>
+        <aspect type="coplet-sizing"/>
+        <aspect type="history"/>
+        <aspect type="basket"/>
+        <aspect type="coplet-cinclude"/>
+      </aspects>
+    </renderer>
+    <renderer name="borderless-window"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal" >
+      <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="coplet-removing"/>
+        <aspect type="coplet-full-screen"/>
+        <aspect type="coplet-sizing"/>
+        <aspect type="history"/>
+        <aspect type="basket"/>
+        <aspect type="coplet-cinclude"/>
+      </aspects>
+    </renderer>
+    <renderer name="frame"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal" >
+      <aspects>
+        <aspect type="frame">
+          <parameter name="store" value="request"/>
+        </aspect>
+      </aspects>
+    </renderer>
+    <renderer name="nowindow"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal">
+      <aspects>
+        <aspect type="history"/>
+        <aspect type="coplet-cinclude">
+          <parameter name="root-tag" value="false"/>
+        </aspect>
+      </aspects>
+    </renderer>
+    <renderer name="portlet-window"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal">
+      <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="portlet-window">
+          <parameter name="root-tag" value="false"/>
+        </aspect>
+        <aspect type="coplet-removing"/>
+        <aspect type="history"/>
+        <aspect type="basket"/>
+        <aspect type="coplet-cinclude"/>
+      </aspects>
+    </renderer>
+    <renderer name="wsrp-window"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal">
+      <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="wsrp-window">
+          <parameter name="root-tag" value="false"/>
+        </aspect>
+        <aspect type="coplet-removing"/>
+        <aspect type="history"/>
+        <aspect type="basket"/>
+        <aspect type="coplet-cinclude"/>
+      </aspects>
     </renderer>
- </component>
+    <renderer name="link" 
+              class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer" 
+              logger="portal"/>
+    <renderer name="decorated-frame"
+              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
+              logger="portal">
+      <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>
+  </component>
  
-<!-- Layout factory configuration -->
-<component class="org.apache.cocoon.portal.layout.impl.DefaultLayoutFactory"
-           role="org.apache.cocoon.portal.layout.LayoutFactory">
+  <!-- Layout factory configuration -->
+  <component class="org.apache.cocoon.portal.layout.impl.DefaultLayoutFactory"
+             role="org.apache.cocoon.portal.layout.LayoutFactory">
     <layouts>
-        <layout name="column" 
-                class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl">
-            <renderers default="column">
-                <renderer name="column"/>
-            </renderers>
-        </layout>
-        <layout name="row" 
-                class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl">
-            <renderers default="row">
-                <renderer name="row"/>
-            </renderers>
-        </layout>
-        <layout name="tab" 
-                class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
-                item-class="org.apache.cocoon.portal.layout.NamedItem">
-            <renderers default="tab">
-                <renderer name="tab"/>
-            </renderers>
-        </layout>
-        <layout name="rawtab" 
-                class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
-                item-class="org.apache.cocoon.portal.layout.NamedItem">
-            <renderers default="rawtab">
-                <renderer name="rawtab"/>
-            </renderers>
-        </layout>
-        <layout name="linktab"
-                class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
-                item-class="org.apache.cocoon.portal.layout.NamedItem">
-            <renderers default="linktab">
-                <renderer name="linktab"/>
-            </renderers>
-        </layout>
-        <layout name="frame" 
-                class="org.apache.cocoon.portal.layout.impl.FrameLayout"
-                create-id="true">
-            <renderers default="frame">
-                <renderer name="frame"/>
-            </renderers>
-        </layout>
-        <layout name="coplet" 
-                class="org.apache.cocoon.portal.layout.impl.CopletLayout">
-            <renderers default="window">
-                <renderer name="window"/>
-                <renderer name="portlet-window"/>
-                <renderer name="nowindow"/>
-            </renderers>
-        </layout>
-        <layout name="link"
-                class="org.apache.cocoon.portal.layout.impl.LinkLayout"
-                create-id="true">
-            <renderers default="link">
-                <renderer name="link"/>
-            </renderers>
-            <aspects>
-               <aspect name="link-layout-key"
-                       class="java.lang.String"
-                       store="session"
-                       auto-create="false">
-               </aspect>
-               <aspect name="link-layout-id"
-                       class="java.lang.String"
-                       store="session"
-                       auto-create="false">
-               </aspect>
-            <!--
+      <layout name="column" 
+              class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl">
+        <renderers default="column">
+          <renderer name="column"/>
+        </renderers>
+      </layout>
+      <layout name="row" 
+              class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl">
+        <renderers default="row">
+          <renderer name="row"/>
+        </renderers>
+      </layout>
+      <layout name="tab" 
+              class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
+              item-class="org.apache.cocoon.portal.layout.NamedItem">
+        <renderers default="tab">
+          <renderer name="tab"/>
+        </renderers>
+      </layout>
+      <layout name="rawtab" 
+              class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
+              item-class="org.apache.cocoon.portal.layout.NamedItem">
+        <renderers default="rawtab">
+          <renderer name="rawtab"/>
+        </renderers>
+      </layout>
+      <layout name="linktab"
+              class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
+              item-class="org.apache.cocoon.portal.layout.NamedItem">
+        <renderers default="linktab">
+          <renderer name="linktab"/>
+        </renderers>
+      </layout>
+      <layout name="frame" 
+              class="org.apache.cocoon.portal.layout.impl.FrameLayout"
+              create-id="true">
+        <renderers default="frame">
+          <renderer name="frame"/>
+        </renderers>
+      </layout>
+      <layout name="coplet" 
+              class="org.apache.cocoon.portal.layout.impl.CopletLayout">
+        <renderers default="window">
+          <renderer name="window"/>
+          <renderer name="portlet-window"/>
+          <renderer name="nowindow"/>
+        </renderers>
+      </layout>
+      <layout name="link"
+              class="org.apache.cocoon.portal.layout.impl.LinkLayout"
+              create-id="true">
+        <renderers default="link">
+          <renderer name="link"/>
+        </renderers>
+        <aspects>
+          <aspect name="link-layout-key"
+                  class="java.lang.String"
+                  store="session"
+                  auto-create="false">
+          </aspect>
+          <aspect name="link-layout-id"
+                  class="java.lang.String"
+                  store="session"
+                  auto-create="false">
+          </aspect>
+          <!--
                <aspect name="static"
                        class="java.lang.Boolean"
                        store="persistent"
                        auto-create="true"
                        value="false">
                </aspect>
-             -->
-            </aspects>
-         </layout>
+          -->
+        </aspects>
+      </layout>
     </layouts>
-</component>
+  </component>
 
-<!-- Coplet factory configuration -->
-<component class="org.apache.cocoon.portal.coplet.impl.DefaultCopletFactory"
-           role="org.apache.cocoon.portal.coplet.CopletFactory">
+  <!-- Coplet factory configuration -->
+  <component class="org.apache.cocoon.portal.coplet.impl.DefaultCopletFactory"
+             role="org.apache.cocoon.portal.coplet.CopletFactory">
     <coplets>
-        <coplet name="standard"
-                class="org.apache.cocoon.portal.coplet.CopletData">
-            <coplet-data-aspects>
-                <!-- Use only the 'memory' aspect store with aspect datas! -->
-                <aspect auto-create="true" class="java.lang.Boolean" name="sizable" store="memory" value="true"/>
-                <aspect auto-create="true" class="java.lang.Boolean" name="mandatory" store="memory" value="false"/>
-               <!--         
+      <coplet name="standard"
+              class="org.apache.cocoon.portal.coplet.CopletData">
+        <coplet-data-aspects>
+          <!-- Use only the 'memory' aspect store with aspect datas! -->
+          <aspect auto-create="true" class="java.lang.Boolean" name="sizable" store="memory" value="true"/>
+          <aspect auto-create="true" class="java.lang.Boolean" name="mandatory" store="memory" value="false"/>
+          <!--         
                 <aspect name="maxpageable"
                         class="java.lang.Boolean"
                         store="memory"
                         auto-create="true"
                         value="true"/>
-               -->
-            </coplet-data-aspects>
+          -->
+          </coplet-data-aspects>
             
-            <coplet-instance-data-aspects>
-                <!-- Choose from tempory, request and session aspect store: -->
-                <aspect name="size"
-                        class="java.lang.Integer"
-                        store="session"
-                        auto-create="true"
-                        value="1"/>
-                <aspect name="fullScreen"
-                        class="java.lang.Boolean"
-                        store="temporary"
-                        auto-create="true"
-                        value="false"/>
-            </coplet-instance-data-aspects>
-        </coplet>
+          <coplet-instance-data-aspects>
+            <!-- Choose from tempory, request and session aspect store: -->
+            <aspect name="size"
+                    class="java.lang.Integer"
+                    store="session"
+                    auto-create="true"
+                    value="1"/>
+            <aspect name="fullScreen"
+                    class="java.lang.Boolean"
+                    store="temporary"
+                    auto-create="true"
+                    value="false"/>
+        </coplet-instance-data-aspects>
+      </coplet>
     </coplets>
   </component>
+  
+  <!-- This is the basket manager -->
+  <component class="org.apache.cocoon.portal.coplets.basket.BasketManagerImpl" 
+             role="org.apache.cocoon.portal.coplets.basket.BasketManager"
+             logger="portal">
+    <!-- This is only a sample configuration, it doesn't really work -->
+    <parameter name="basket:action:print" value="cocoon://print-basket"/>
+    <parameter name="basket:action:email" value="cocoon://email-basket"/>
+    <parameter name="briefcase:action:print" value="cocoon://print-briefcase"/>
+    <parameter name="briefcase:action:email" value="cocoon://email-briefcase"/>
+    <parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
+  </component>
+
 </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=280148&r1=280147&r2=280148&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf Sun Sep 11 09:31:49 2005
@@ -232,16 +232,4 @@
             class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl"
             logger="portal"/>
 
- <!-- This is the basket manager -->
- <component class="org.apache.cocoon.portal.coplets.basket.BasketManagerImpl" 
-            role="org.apache.cocoon.portal.coplets.basket.BasketManager"
-            logger="portal">
-     <!-- This is only a sample configuration, it doesn't really work -->
-     <parameter name="basket:action:print" value="cocoon://print-basket"/>
-     <parameter name="basket:action:email" value="cocoon://email-basket"/>
-     <parameter name="briefcase:action:print" value="cocoon://print-briefcase"/>
-     <parameter name="briefcase:action:email" value="cocoon://email-briefcase"/>
-     <parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
- </component>
-
 </components>