cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r292020 - in /cocoon/blocks/portal-sample/trunk: WEB-INF/xconf/ samples/ samples/conf/
Date Tue, 27 Sep 2005 19:33:11 GMT
Author: cziegeler
Date: Tue Sep 27 12:32:53 2005
New Revision: 292020

URL: http://svn.apache.org/viewcvs?rev=292020&view=rev
Log:
Use per sitemap configuration for portal sample

Added:
    cocoon/blocks/portal-sample/trunk/samples/conf/
    cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
      - copied, changed from r292009, cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
    cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf   (with props)
Removed:
    cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf
Modified:
    cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
    cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap
    cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap

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=292020&r1=292019&r2=292020&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 Tue Sep 27
12:32:53 2005
@@ -19,482 +19,6 @@
     | SVN $Id: cocoon-portal-samples.xconf 125443 2005-01-17 20:39:52Z cziegeler $
     +-->
 <components>
-  <!--+
-      |                       THIS IS A SAMPLE PORTAL
-      |
-      | It demonstrates several features of the portal engine,
-      | so it's not neither configured for *your* environment nor
-      | optimized for production. If you use the portal for your
-      | own projects make sure that you remove all unused stuff
-      | from the configuration and that you configure the remaining
-      | components properly.
-      +-->
-
-  <!-- Include dependencies -->
-  <include src="context://WEB-INF/xconf/cocoon-portal.xconf"/>
-
-  <!-- Include portal roles -->
-  <include src="resource://org/apache/cocoon/portal/portal.roles"/>
-  <!-- If you don't need JSR 168 support, you can remove the following include: -->
-  <include src="resource://org/apache/cocoon/portal/pluto/portal.roles"/>
-  <!-- If you don't need WSRP support, you can remove the following include: -->
-  <include src="resource://org/apache/cocoon/portal/wsrp/portal.roles"/>
-
-  <input-modules>
-    <component-instance name="portalpath"
-                        class="org.apache.cocoon.components.modules.input.ProjectPathModule">
-      <uri-prefix>samples/blocks/portal-sample/</uri-prefix>
-    </component-instance>
-  </input-modules>
-
-  <component role="org.osoco.cowarp.ApplicationManager"
-             class="org.osoco.cowarp.impl.StandardApplicationManager"/>
-  <!-- This security handler uses OJB and the hsqldb for the authentication: -->
-  <component role="org.osoco.cowarp.SecurityHandler/portal" 
-             class="org.apache.cocoon.portal.security.DBSecurityHandler"/>
-  <!-- If you want to use a pipeline for the authentication use this configuration:
-    <component role="org.osoco.cowarp.SecurityHandler/portal" 
-               class="org.osoco.cowarp.impl.PipelineSecurityHandler">
-      <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
-    </component>
-  -->
-  <component role="org.osoco.cowarp.Application/portal" 
-             class="org.osoco.cowarp.portal.StandardPortalApplication" 
-             security-handler="portal">
-    <profiles>
-      <copletbasedata-global-load uri="cocoon:raw:/load-global-profile?profile=copletbasedata"/>
-      <copletdata-global-load uri="cocoon:raw:/load-global-profile?profile=copletdata"/>
-      <copletdata-role-load uri="cocoon:raw:/load-role-profile?profile=copletdata"/>
-      <copletdata-user-load uri="cocoon:raw:/load-user-profile?profile=copletdata"/>
-      <copletinstancedata-global-load uri="cocoon:raw:/load-global-profile?profile=copletinstancedata"/>
-      <copletinstancedata-role-load uri="cocoon:raw:/load-role-profile?profile=copletinstancedata"/>
-      <copletinstancedata-user-load uri="cocoon:raw:/load-user-profile?profile=copletinstancedata"/>
-      <copletinstancedata-user-save uri="cocoon:raw:/save-user-profile?profile=copletinstancedata"/>
-      <layout-global-load uri="cocoon:raw:/load-global-profile?profile=layout"/>
-      <layout-role-load uri="cocoon:raw:/load-role-profile?profile=layout"/>
-      <layout-user-load uri="cocoon:raw:/load-user-profile?profile=layout"/>
-      <layout-user-save uri="cocoon:raw:/save-user-profile?profile=layout"/>
-    </profiles>
-  </component>
-  <component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager"
-             role="org.apache.cocoon.portal.profile.ProfileManager/Cowarp">
-    <parameter name="userinfo-provider" value="org.osoco.cowarp.portal.UserInfoProviderImpl"/>
-  </component>
-
-  <portal-service>
-    <portals>
-      <portal name="portal">
-        <!-- This is the sample portal: 
-            - we use the cowarp profile manager
-        -->
-        <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Cowarp</profile-manager>
-        <!-- If you want to use the authentication framework, comment out the above line
-             and uncomment the following line:
-         <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager>
-        -->
-        <!-- These are the skins the user can choose from: -->
-        <skins>
-          <skin name="basic" base-path="context://samples/blocks/portal-sample/skins/basic">
-            <thumbnail-path>images/thumb.jpg</thumbnail-path>
-          </skin>
-          <skin name="common" base-path="context://samples/blocks/portal-sample/skins/common">
-            <thumbnail-path>images/thumb.jpg</thumbnail-path>
-          </skin>
-        </skins>
-      </portal>
-    </portals>
-  </portal-service>
-
-  <!-- This is the portal manager.
-       The portal manager can be extended with different aspects.
-       Currently the JSR-168 aspect is configured/activated.
-       If you don't need the JSR-168 support uncomment the aspect.
-       In a similar manner the wsrp support works.       
-  -->
-  <portal-manager>
-    <aspects>
-      <!-- JSR-168 support: -->
-      <aspect adapter="portlet"/>
-      <!-- wsrp support: -->
-      <aspect adapter="wsrp"/>
-    </aspects>
-  </portal-manager>
-
-  <portal-event-manager>
-    <event-aspects>
-        <!--  The client should not cache the page. -->
-        <aspect type="no-client-caching"/>
-        <!-- Uncomment this aspect when marshalling JSR168 portlet events 
-        <aspect type="convertable"/>
-        -->
-        <!-- Use the action counter with great care. We recommend turning it off. -->
-        <!-- Remove action-counter when using PageLabels -->
-        <!-- aspect type="action-counter"/ -->
-        <aspect type="frame"/>
-        <aspect type="link"/>
-        <aspect type="full-screen-coplet"/>
-  <!-- Uncomment the following when using PageLabels
-        <aspect type="page-label"/>
-        -->
-        <!-- Comment the following out if you don't need WSRP: -->
-        <aspect type="wsrp"/>
-        <aspect type="request-parameter">
-          <!-- Uncomment the following when marshalling JSR168 portlet events
-          <parameter name="parameter-name" value="cocoon-portal-event,url"/>
-          -->
-        </aspect>
-    </event-aspects>
-    <!-- add a new instance of each class as a receiver: -->
-    <receiver-classes>
-        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
-        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
-        <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
-    </receiver-classes>
-    <!-- add each component as a receiver (the component should be thread safe): -->
-    <receiver-roles>
-        <!-- <role name="AVALON-ROLE"/> -->
-    </receiver-roles>
-  </portal-event-manager>
-
-  <!--+
-      | Page Labels.
-      | To enable PageLabels uncomment the following definition:
-  <portal-event-converter class="org.apache.cocoon.portal.event.impl.PageLabelEventConverter"/>
-      +-->
-
-  <page-label-manager>
-    <!-- Uncomment to marshall JSR-168 portlet events
-    <marshallEvents>true</marshallEvents>
-    -->
-    <!-- Uncomment to enable non sticky tabs
-    <nonStickyTabs>true</nonStickyTabs>
-    -->
-  </page-label-manager>
-
-  <!--+
-      | Page Labels.
-      | To enable PageLabels add a "class" attribute to the following
-      | definition with the value "org.apache.cocoon.portal.impl.PageLabelLinkService"
-      +-->
-  <portal-link-service>
-    <parameter name="defaultPort" value="8888"/>
-    <parameter name="defaultSecurePort" value="443"/>
-  </portal-link-service>
-
-  <component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager"
-             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">
-      <aspects>
-        <aspect type="xslt">
-          <parameter name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/>
-        </aspect>
-        <aspect type="parameter">
-          <parameter name="tag-name" value="column-layout"/>
-        </aspect>
-        <aspect type="composite-content">
-          <parameter name="root-tag" value="false"/>
-        </aspect>
-      </aspects>
-    </renderer>
-    <renderer name="row"
-              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
-      <aspects>
-        <aspect type="xslt">
-          <parameter name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/>
-        </aspect>
-        <aspect type="parameter">
-          <parameter name="tag-name" value="row-layout"/>
-        </aspect>
-        <aspect type="composite-content">
-          <parameter name="root-tag" value="false"/>
-        </aspect>
-      </aspects>
-    </renderer>
-    <renderer name="tab"
-              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
-      <aspects>
-        <aspect type="xslt">
-          <parameter name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/>
-        </aspect>
-        <aspect type="parameter">
-          <parameter name="tag-name" value="tab-layout"/>
-        </aspect>
-        <aspect type="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">
-      <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">
-      <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">
-      <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">
-      <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">
-      <aspects>
-        <aspect type="frame">
-          <parameter name="store" value="request"/>
-        </aspect>
-      </aspects>
-    </renderer>
-    <renderer name="nowindow"
-              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
-      <aspects>
-        <aspect type="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">
-      <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">
-      <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"/>
-    <renderer name="decorated-frame"
-              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
-      <aspects>
-        <aspect type="xslt">
-          <parameter name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/>
-        </aspect>
-        <aspect type="parameter">
-           <parameter name="tag-name" value="frame"/>
-        </aspect>
-        <aspect type="frame">
-           <parameter name="store" value="request"/>
-        </aspect>
-      </aspects>
-    </renderer>
-  </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.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>
-    </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-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">
-    <!-- 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>
-
-  <!-- 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"/>
-
-  <wsrp-adapter>
-     <!-- This is the WSRP configuration containing the producers etc. -->
-     <parameter name="wsrp-config" value="profiles/wsrp-config.xml"/>
-  </wsrp-adapter>
+   <!--  Dummy configuration for dependencies. -->
 
 </components>

Copied: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf (from r292009,
cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf?p2=cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf&p1=cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf&r1=292009&r2=292020&rev=292020&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf Tue Sep 27 12:32:53
2005
@@ -30,9 +30,6 @@
       | components properly.
       +-->
 
-  <!-- Include dependencies -->
-  <include src="context://WEB-INF/xconf/cocoon-portal.xconf"/>
-
   <!-- Include portal roles -->
   <include src="resource://org/apache/cocoon/portal/portal.roles"/>
   <!-- If you don't need JSR 168 support, you can remove the following include: -->

Added: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf?rev=292020&view=auto
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf (added)
+++ cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf Tue Sep 27 12:32:53
2005
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<!--+
+    |
+    | SVN $Id$
+    +-->
+<components>
+
+  <component class="org.apache.cocoon.portal.tools.PortalToolManager" 
+             role="org.apache.cocoon.portal.tools.PortalToolManager">
+	<parameter name="root" value="context://samples/blocks/portal-sample/tools/"/>
+	<parameter name="conf" value="conf.xml"/>
+	<parameter name="auth" value="auth.xml"/>
+  </component>
+
+</components>
\ No newline at end of file

Propchange: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-tools.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap?rev=292020&r1=292019&r2=292020&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap Tue Sep 27 12:32:53 2005
@@ -19,39 +19,28 @@
 
   <!-- ========================= Components ================================ -->
 
-  <map:components>
+  <map:components logger="portal">
     <map:generators default="file">
       <map:generator name="portal" src="org.apache.cocoon.portal.generation.PortalGenerator"/>
     </map:generators>
     <map:transformers default="xslt">
       <map:transformer name="portal-coplet" 
-                       src="org.apache.cocoon.portal.transformation.CopletTransformer" 
-                       logger="sitemap.transformer.portal" />
-      <map:transformer name="htmlroot" src="org.apache.cocoon.portal.transformation.HTMLRootTransformer"
-        logger="sitemap.transformer.htmlroot" />
-      <map:transformer name="rss" src="org.apache.cocoon.portal.transformation.RSSTransformer"
-        logger="sitemap.transformer.rss" />
-      <map:transformer name="portal-proxy" src="org.apache.cocoon.portal.transformation.ProxyTransformer"
-        logger="sitemap.transformer.portal.proxy">
+                       src="org.apache.cocoon.portal.transformation.CopletTransformer"/>
+      <map:transformer name="htmlroot" src="org.apache.cocoon.portal.transformation.HTMLRootTransformer"/>
+      <map:transformer name="rss" src="org.apache.cocoon.portal.transformation.RSSTransformer"/>
+      <map:transformer name="portal-proxy" src="org.apache.cocoon.portal.transformation.ProxyTransformer">
         <parameter name="envelope-tag" value="div"/>
       </map:transformer>
-      <map:transformer name="portal-new-eventlink" src="org.apache.cocoon.portal.transformation.NewEventLinkTransformer"
-        logger="sitemap.transformer.portal.eventlink" />
-      <map:transformer name="portal-html-eventlink" src="org.apache.cocoon.portal.transformation.HTMLEventLinkTransformer"
-        logger="sitemap.transformer.portal.eventlink.html"/>
-      <map:transformer name="portal-html-linktoeventlink" src="org.apache.cocoon.portal.transformation.LinkTransformer"
-        logger="sitemap.transformer.portal.eventlink" />
+      <map:transformer name="portal-new-eventlink" src="org.apache.cocoon.portal.transformation.NewEventLinkTransformer"/>
+      <map:transformer name="portal-html-eventlink" src="org.apache.cocoon.portal.transformation.HTMLEventLinkTransformer"/>
+      <map:transformer name="portal-html-linktoeventlink" src="org.apache.cocoon.portal.transformation.LinkTransformer"/>
     </map:transformers>
     <map:readers default="resource">
-      <map:reader name="portal-proxy" src="org.apache.cocoon.portal.reading.ProxyReader"
-        logger="sitemap.reader.portal.proxy" />
+      <map:reader name="portal-proxy" src="org.apache.cocoon.portal.reading.ProxyReader"/>
     </map:readers>
     <map:serializers default="html">
-      <map:serializer name="html-include"
-        logger="sitemap.serializer.html"
-        mime-type="text/html"
-        pool-max="32"
-        src="org.apache.cocoon.portal.serialization.IncludingHTMLSerializer">
+      <map:serializer name="html-include" mime-type="text/html" pool-max="32"
+                      src="org.apache.cocoon.portal.serialization.IncludingHTMLSerializer">
         <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
         <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
       </map:serializer>

Modified: cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap?rev=292020&r1=292019&r2=292020&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap Tue Sep 27 12:32:53 2005
@@ -20,6 +20,9 @@
   <!-- ========================= Components ================================ -->
 
   <map:components logger="portal">
+    <map:include src="conf/cocoon-portal-sample.xconf"/>
+    <map:include src="conf/cocoon-portal-tools.xconf"/>
+
     <map:generators default="file">
       <map:generator name="portal" src="org.apache.cocoon.portal.generation.PortalGenerator"/>
     </map:generators>



Mime
View raw message