You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2004/01/23 02:24:22 UTC

cvs commit: cocoon-2.1/src/blocks/portal/conf portal.samplesxconf portal.xconf

crossley    2004/01/22 17:24:22

  Modified:    src/blocks/portal/conf portal.samplesxconf portal.xconf
  Log:
  Fix dos2unix line-endings.
  
  Revision  Changes    Path
  1.14      +266 -266  cocoon-2.1/src/blocks/portal/conf/portal.samplesxconf
  
  Index: portal.samplesxconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.samplesxconf,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- portal.samplesxconf	22 Jan 2004 14:12:49 -0000	1.13
  +++ portal.samplesxconf	23 Jan 2004 01:24:22 -0000	1.14
  @@ -1,266 +1,266 @@
  -<?xml version="1.0"?>
  -
  -<samplesxconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.portal.profile.ProfileManager/Auth']">
  -
  - <!-- THIS IS A SAMPLE PORTAL
  -      It demonstrates several features of the portal engine,
  -      so it's not optimized for production. Make sure that
  -      if you use the portal for your own projects that you
  -      remove all unused stuff from the configuration! 
  - -->
  - <component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager" logger="portal" role="org.apache.cocoon.portal.profile.ProfileManager/Auth">
  - </component>
  -
  - <!-- Renderer configuration -->
  - <component class="org.apache.cocoon.components.ExtendedComponentSelector" 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="{global:skin}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="{global:skin}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="{global:skin}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="{global:skin}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="{global:skin}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="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"/>
  -         </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="{global:skin}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="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="{global:skin}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">
  -    <layouts>
  -        <layout name="column" 
  -                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  -            <renderers default="column">
  -                <renderer name="column"/>
  -            </renderers>
  -        </layout>
  -        <layout name="row" 
  -                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  -            <renderers default="row">
  -                <renderer name="row"/>
  -            </renderers>
  -        </layout>
  -        <layout name="tab" 
  -                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  -            <renderers default="tab">
  -                <renderer name="tab"/>
  -            </renderers>
  -        </layout>
  -        <layout name="rawtab" 
  -                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  -            <renderers default="rawtab">
  -                <renderer name="rawtab"/>
  -            </renderers>
  -        </layout>
  -        <layout name="linktab"
  -                class="org.apache.cocoon.portal.layout.impl.CompositeLayout" >
  -            <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>
  -    </layouts>
  -</component>
  -
  -<!-- 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"/>
  -               <!--         
  -                <aspect name="maxpageable"
  -                        class="java.lang.Boolean"
  -                        store="memory"
  -                        auto-create="true"
  -                        value="true"/>
  -               -->
  -            </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>
  -    </coplets>
  -</component>
  -
  -</samplesxconf>
  +<?xml version="1.0"?>
  +
  +<samplesxconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.portal.profile.ProfileManager/Auth']">
  +
  + <!-- THIS IS A SAMPLE PORTAL
  +      It demonstrates several features of the portal engine,
  +      so it's not optimized for production. Make sure that
  +      if you use the portal for your own projects that you
  +      remove all unused stuff from the configuration! 
  + -->
  + <component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager" logger="portal" role="org.apache.cocoon.portal.profile.ProfileManager/Auth">
  + </component>
  +
  + <!-- Renderer configuration -->
  + <component class="org.apache.cocoon.components.ExtendedComponentSelector" 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="{global:skin}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="{global:skin}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="{global:skin}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="{global:skin}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="{global:skin}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="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"/>
  +         </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="{global:skin}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="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="{global:skin}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">
  +    <layouts>
  +        <layout name="column" 
  +                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  +            <renderers default="column">
  +                <renderer name="column"/>
  +            </renderers>
  +        </layout>
  +        <layout name="row" 
  +                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  +            <renderers default="row">
  +                <renderer name="row"/>
  +            </renderers>
  +        </layout>
  +        <layout name="tab" 
  +                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  +            <renderers default="tab">
  +                <renderer name="tab"/>
  +            </renderers>
  +        </layout>
  +        <layout name="rawtab" 
  +                class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
  +            <renderers default="rawtab">
  +                <renderer name="rawtab"/>
  +            </renderers>
  +        </layout>
  +        <layout name="linktab"
  +                class="org.apache.cocoon.portal.layout.impl.CompositeLayout" >
  +            <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>
  +    </layouts>
  +</component>
  +
  +<!-- 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"/>
  +               <!--         
  +                <aspect name="maxpageable"
  +                        class="java.lang.Boolean"
  +                        store="memory"
  +                        auto-create="true"
  +                        value="true"/>
  +               -->
  +            </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>
  +    </coplets>
  +</component>
  +
  +</samplesxconf>
  
  
  
  1.32      +120 -120  cocoon-2.1/src/blocks/portal/conf/portal.xconf
  
  Index: portal.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.xconf,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- portal.xconf	22 Jan 2004 14:12:49 -0000	1.31
  +++ portal.xconf	23 Jan 2004 01:24:22 -0000	1.32
  @@ -1,120 +1,120 @@
  -<?xml version="1.0"?>
  -
  -<xconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.portal.event.aspect.EventAspectSelector']">
  -
  - <!-- Event Aspect configuration -->
  - <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.event.aspect.EventAspectSelector">
  -    <aspect name="action-counter" class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
  -    <aspect name="request-parameter" class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
  -    <aspect name="frame" class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
  -    <aspect name="link"  class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect" />    <aspect name="full-screen-coplet" class="org.apache.cocoon.portal.event.aspect.impl.FullScreenCopletEventAspect"/>
  - </component>
  -
  - <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal" role="org.apache.cocoon.portal.event.EventManager">
  -    <event-aspects>
  -        <aspect type="action-counter"/>
  -        <aspect type="frame"/>
  -        <aspect type="link"/>
  -        <aspect type="full-screen-coplet"/>
  -        <aspect type="request-parameter"/>
  -    </event-aspects>
  -    <!-- add a new instance of each class as a subscriber: -->
  -    <subscriber-classes>
  -        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
  -        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
  -    </subscriber-classes>
  -    <!-- add each component as a subscriber (the component should be thread safe): -->
  -    <subscriber-roles>
  -        <!-- <role name="AVALON-ROLE"/> -->
  -    </subscriber-roles>
  - </component>
  -
  -  <!-- This is the portal manager.
  -       If you don't need the JSR-168 support uncomment the following line and comment out 
  -       the definition below:
  -    <component class="org.apache.cocoon.portal.impl.PortalManagerImpl" 
  -               logger="portal" role="org.apache.cocoon.portal.PortalManager"/>
  -
  -  -->
  -  <component class="org.apache.cocoon.portal.impl.PortletPortalManager" 
  -             logger="portal" role="org.apache.cocoon.portal.PortalManager"/>
  -
  -  <!-- This is the portal service -->
  -  <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal" role="org.apache.cocoon.portal.PortalService">
  -   <portals>
  -     <!-- Configure your portals here: -->
  -   </portals>
  - </component>
  -
  - <component class="org.apache.cocoon.portal.impl.DefaultLinkService" logger="portal" role="org.apache.cocoon.portal.LinkService"/>
  -
  - <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal" role="org.apache.cocoon.portal.event.EventConverter">
  - </component>
  -
  -  <!-- Coplet Adapter configuration -->
  -  <component class="org.apache.cocoon.components.ExtendedComponentSelector" 
  -             role="org.apache.cocoon.portal.coplet.adapter.CopletAdapterSelector">
  -    <!-- This is the pipeline/uri based adapter -->
  -    <coplet-adapter name="uri" 
  -                    class="org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter" 
  -                    logger="portal"/>
  -    <!-- This is the JSR-168 adapter -->
  -    <coplet-adapter name="portlet"
  -                    class="org.apache.cocoon.portal.coplet.adapter.impl.PortletAdapter" 
  -                    logger="portal"/>
  - </component>
  -
  -
  - <!-- Renderer Aspect configuration -->
  - <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector">
  -    <aspect name="composite-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
  -    <aspect name="tab-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
  -    <aspect name="window" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
  -    <aspect name="portlet-window"
  -            class="org.apache.cocoon.portal.layout.renderer.aspect.impl.PortletWindowAspect"/>
  -
  -    <!-- This aspect can be used to render the minimize/maximize buttons -->
  -    <aspect name="coplet-sizing" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
  -
  -    <!-- This aspect can be used to render the remove button -->
  -    <aspect 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 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 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 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 name="coplet" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
  -    <aspect name="frame" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
  -    <aspect name="xslt" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
  -    <aspect class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect" name="parameter"/>
  - </component>
  -
  - <!-- Aspect Storage configuration -->
  - <component class="org.apache.cocoon.components.ExtendedComponentSelector" 
  -            role="org.apache.cocoon.portal.aspect.AspectDataStoreSelector">
  -    <store name="temporary" class="org.apache.cocoon.portal.aspect.impl.TemporaryAspectDataStore"/>
  -    <store name="request" class="org.apache.cocoon.portal.aspect.impl.RequestAspectDataStore"/>
  -    <store name="session" class="org.apache.cocoon.portal.aspect.impl.SessionAspectDataStore"/>
  -    <store name="persistent" class="org.apache.cocoon.portal.aspect.impl.PersistentAspectDataStore"/>
  -    <store name="memory" class="org.apache.cocoon.portal.aspect.impl.MemoryAspectDataStore"/>
  - </component>
  -
  -<component class="org.apache.cocoon.components.persistence.CastorSourceConverter" role="org.apache.cocoon.components.persistence.CastorSourceConverter">
  - 	<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" />
  -
  - <component class="org.apache.cocoon.components.variables.DefaultVariableResolverFactory" role="org.apache.cocoon.components.variables.VariableResolverFactory" />
  -</xconf>
  +<?xml version="1.0"?>
  +
  +<xconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.portal.event.aspect.EventAspectSelector']">
  +
  + <!-- Event Aspect configuration -->
  + <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.event.aspect.EventAspectSelector">
  +    <aspect name="action-counter" class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
  +    <aspect name="request-parameter" class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
  +    <aspect name="frame" class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
  +    <aspect name="link"  class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect" />    <aspect name="full-screen-coplet" class="org.apache.cocoon.portal.event.aspect.impl.FullScreenCopletEventAspect"/>
  + </component>
  +
  + <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal" role="org.apache.cocoon.portal.event.EventManager">
  +    <event-aspects>
  +        <aspect type="action-counter"/>
  +        <aspect type="frame"/>
  +        <aspect type="link"/>
  +        <aspect type="full-screen-coplet"/>
  +        <aspect type="request-parameter"/>
  +    </event-aspects>
  +    <!-- add a new instance of each class as a subscriber: -->
  +    <subscriber-classes>
  +        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
  +        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
  +    </subscriber-classes>
  +    <!-- add each component as a subscriber (the component should be thread safe): -->
  +    <subscriber-roles>
  +        <!-- <role name="AVALON-ROLE"/> -->
  +    </subscriber-roles>
  + </component>
  +
  +  <!-- This is the portal manager.
  +       If you don't need the JSR-168 support uncomment the following line and comment out 
  +       the definition below:
  +    <component class="org.apache.cocoon.portal.impl.PortalManagerImpl" 
  +               logger="portal" role="org.apache.cocoon.portal.PortalManager"/>
  +
  +  -->
  +  <component class="org.apache.cocoon.portal.impl.PortletPortalManager" 
  +             logger="portal" role="org.apache.cocoon.portal.PortalManager"/>
  +
  +  <!-- This is the portal service -->
  +  <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal" role="org.apache.cocoon.portal.PortalService">
  +   <portals>
  +     <!-- Configure your portals here: -->
  +   </portals>
  + </component>
  +
  + <component class="org.apache.cocoon.portal.impl.DefaultLinkService" logger="portal" role="org.apache.cocoon.portal.LinkService"/>
  +
  + <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal" role="org.apache.cocoon.portal.event.EventConverter">
  + </component>
  +
  +  <!-- Coplet Adapter configuration -->
  +  <component class="org.apache.cocoon.components.ExtendedComponentSelector" 
  +             role="org.apache.cocoon.portal.coplet.adapter.CopletAdapterSelector">
  +    <!-- This is the pipeline/uri based adapter -->
  +    <coplet-adapter name="uri" 
  +                    class="org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter" 
  +                    logger="portal"/>
  +    <!-- This is the JSR-168 adapter -->
  +    <coplet-adapter name="portlet"
  +                    class="org.apache.cocoon.portal.coplet.adapter.impl.PortletAdapter" 
  +                    logger="portal"/>
  + </component>
  +
  +
  + <!-- Renderer Aspect configuration -->
  + <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector">
  +    <aspect name="composite-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
  +    <aspect name="tab-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
  +    <aspect name="window" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
  +    <aspect name="portlet-window"
  +            class="org.apache.cocoon.portal.layout.renderer.aspect.impl.PortletWindowAspect"/>
  +
  +    <!-- This aspect can be used to render the minimize/maximize buttons -->
  +    <aspect name="coplet-sizing" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
  +
  +    <!-- This aspect can be used to render the remove button -->
  +    <aspect 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 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 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 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 name="coplet" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
  +    <aspect name="frame" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
  +    <aspect name="xslt" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
  +    <aspect class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect" name="parameter"/>
  + </component>
  +
  + <!-- Aspect Storage configuration -->
  + <component class="org.apache.cocoon.components.ExtendedComponentSelector" 
  +            role="org.apache.cocoon.portal.aspect.AspectDataStoreSelector">
  +    <store name="temporary" class="org.apache.cocoon.portal.aspect.impl.TemporaryAspectDataStore"/>
  +    <store name="request" class="org.apache.cocoon.portal.aspect.impl.RequestAspectDataStore"/>
  +    <store name="session" class="org.apache.cocoon.portal.aspect.impl.SessionAspectDataStore"/>
  +    <store name="persistent" class="org.apache.cocoon.portal.aspect.impl.PersistentAspectDataStore"/>
  +    <store name="memory" class="org.apache.cocoon.portal.aspect.impl.MemoryAspectDataStore"/>
  + </component>
  +
  +<component class="org.apache.cocoon.components.persistence.CastorSourceConverter" role="org.apache.cocoon.components.persistence.CastorSourceConverter">
  + 	<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" />
  +
  + <component class="org.apache.cocoon.components.variables.DefaultVariableResolverFactory" role="org.apache.cocoon.components.variables.VariableResolverFactory" />
  +</xconf>