You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/12/18 14:16:16 UTC

cvs commit: cocoon-2.1/src/blocks/portal/samples/news/content/resources/images pyramid-model.gif

cziegeler    2003/12/18 05:16:16

  Modified:    src/blocks/portal/conf portal.samplesxconf portal.xconf
               src/blocks/portal/java/org/apache/cocoon/portal/util
                        AspectDataFieldHandler.java
                        ParameterFieldHandler.java
               src/blocks/portal/java/org/apache/cocoon/portal/coplet
                        copletdata.xml copletinstancedata.xml
               src/blocks/portal/java/org/apache/cocoon/portal/layout
                        layout.xml
               src/blocks/portal/samples/profiles/layout portal.xml
                        portal-user-anonymous.xml
               src/blocks/portal/samples sitemap.xmap
               src/blocks/portal/samples/profiles/copletdata portal.xml
               src/blocks/portal/samples/profiles/copletinstancedata
                        portal.xml
  Added:       src/blocks/portal/java/org/apache/cocoon/portal/util
                        AttributedMapItem.java
               src/blocks/portal/samples/coplets/news/offline ml_weblog.xml
                        nyt_business.xml cnet_business.xml cnet_news.xml
                        cnet_news2.xml cz_weblog.xml nyt_sport.xml
                        cst_news.xml bbc_news.xml cnn_europe.xml
                        nn_weblog.xml newsweek.xml
               src/blocks/portal/samples/coplets/docs portal-demo.xml
                        portal-right.xml portal-left.xml sitemap.xmap
                        portal-intro.xml portal-bottom.xml
               src/blocks/portal/samples/coplets/docs/styles
                        document2html.xsl
               src/blocks/portal/samples/coplets/history path.xsp path.xsl
                        sitemap.xmap
               src/blocks/portal/samples/coplets/news/styles rss2html.xsl
               src/blocks/portal/samples/coplets/news sitemap.xmap
               src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl
                        MemoryAspectDataStore.java
  Removed:     src/blocks/portal/java/org/apache/cocoon/portal/util
                        MapItem.java
               src/blocks/portal/samples/news/content/rss CSTNews.xml
                        CZ_weblog.xml CNET_business.xml BBCNews.xml
                        NYTBusiness.xml NYTSport.xml ML_weblog.xml
                        CNET_news.xml CNNEurope.xml newsweek.xml Weblog.xml
                        CNET_news2.xml
               src/blocks/portal/samples/news/content/xdocs
                        portal-right.xml portal-intro.xml portal-left.xml
                        introduction.xml portal-bottom.xml overview.xml
                        portal-demo.xml
               src/blocks/portal/samples/news sitemap.xmap
               src/blocks/portal/samples/news/content/resources/xsl
                        rss2html_news.xsl document2html.xsl
               src/blocks/portal/samples/news/content/resources/images
                        pyramid-model.gif
  Log:
  Cleaning up the portal demo
  Fixing profile handling for aspects of coplet datas
  
  Revision  Changes    Path
  1.12      +5 -11     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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- portal.samplesxconf	12 Dec 2003 15:53:19 -0000	1.11
  +++ portal.samplesxconf	18 Dec 2003 13:16:10 -0000	1.12
  @@ -213,26 +213,20 @@
           <coplet name="standard"
                   class="org.apache.cocoon.portal.coplet.CopletData">
               <coplet-data-aspects>
  -                <aspect name="sizable"
  -                        class="java.lang.Boolean"
  -                        store="persistent"
  -                        auto-create="true"
  -                        value="true"/>
  -                <aspect name="mandatory"
  -                        class="java.lang.Boolean"
  -                        store="persistent"
  -                        auto-create="true"
  -                        value="false"/>
  +                <!-- 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="persistent"
  +                        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"
  
  
  
  1.30      +1 -0      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- portal.xconf	12 Dec 2003 10:13:34 -0000	1.29
  +++ portal.xconf	18 Dec 2003 13:16:10 -0000	1.30
  @@ -86,6 +86,7 @@
       <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">
  
  
  
  1.5       +2 -1      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AspectDataFieldHandler.java
  
  Index: AspectDataFieldHandler.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AspectDataFieldHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AspectDataFieldHandler.java	19 Aug 2003 14:09:34 -0000	1.4
  +++ AspectDataFieldHandler.java	18 Dec 2003 13:16:11 -0000	1.5
  @@ -55,6 +55,7 @@
   import java.util.Map;
   
   import org.apache.cocoon.portal.aspect.Aspectalizable;
  +import org.exolab.castor.mapping.MapItem;
   
   /**
    * Field handler for aspects of an Aspectizable object.
  
  
  
  1.5       +4 -5      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/ParameterFieldHandler.java
  
  Index: ParameterFieldHandler.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/ParameterFieldHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParameterFieldHandler.java	19 Aug 2003 14:09:34 -0000	1.4
  +++ ParameterFieldHandler.java	18 Dec 2003 13:16:11 -0000	1.5
  @@ -55,7 +55,6 @@
   import java.util.Map;
   
   import org.apache.cocoon.portal.layout.Parameters;
  -import org.exolab.castor.mapping.MapItem;
   
   /**
    * Field handler for parameters.
  @@ -75,13 +74,13 @@
           while (iterator.hasNext()) {
               entry = (Map.Entry) iterator.next();
               key = entry.getKey();
  -            map.put(key, new MapItem(key, entry.getValue()));
  +            map.put(key, new AttributedMapItem(key, entry.getValue()));
           }
           return map;
       }
   
       public Object newInstance(Object parent) {
  -        return new MapItem();
  +        return new AttributedMapItem();
       }
   
       public void resetValue(Object object) {
  @@ -89,7 +88,7 @@
       }
   
       public void setValue(Object object, Object value) {
  -        MapItem item = (MapItem) value;
  +        AttributedMapItem item = (AttributedMapItem) value;
           ((Parameters) object).getParameters().put(
               item.getKey(),
               item.getValue());
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributedMapItem.java
  
  Index: AttributedMapItem.java
  ===================================================================
  /*
  
   ============================================================================
  				   The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
  	this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
  	this list of conditions and the following disclaimer in the documentation
  	and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
  	include  the following  acknowledgment:  "This product includes  software
  	developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  	Alternately, this  acknowledgment may  appear in the software itself,  if
  	and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
  	used to  endorse or promote  products derived from  this software without
  	prior written permission. For written permission, please contact
  	apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
  	"Apache" appear  in their name,  without prior written permission  of the
  	Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <st...@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.portal.util;
  
  
  /**
   * Used by the ParameterFieldHandler for Castor.
   * This MapItem is used by the mapping each time key and value are
   * mapped to attributes in the xml (as opposed to elements)
   *
   * @author <a href="mailto:bluetkemeier@s-und-n.de">Bj&ouml;rn L&uuml;tkemeier</a>
   * 
   * @version CVS $Id: AttributedMapItem.java,v 1.1 2003/12/18 13:16:11 cziegeler Exp $
   */
  public class AttributedMapItem
  extends org.exolab.castor.mapping.MapItem {
  
  	public AttributedMapItem() {
  		super();
  	}
  
  	public AttributedMapItem(Object key, Object value) {
  		super(key, value);
  	}
  }
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/ml_weblog.xml
  
  Index: ml_weblog.xml
  ===================================================================
  <?xml version="1.0" ?> 
  <rss version="2.0">
   <channel>
    <title>Matthew Langham's Radio Weblog</title> 
    <link>http://radio.weblogs.com/0103021/</link> 
    <description><br/><small>Most of the time, for most of the world, no matter how hard people work at it, nothing of any significance happens. (G. Weinberg)</small></description> 
    <copyright>Copyright 2003 Matthew Langham</copyright> 
    <lastBuildDate>Sat, 26 Apr 2003 09:51:54 GMT</lastBuildDate> 
    <docs>http://backend.userland.com/rss</docs> 
    <generator>Radio UserLand v8.0.7</generator> 
    <managingEditor>mlangham@s-und-n.de</managingEditor> 
    <webMaster>mlangham@s-und-n.de</webMaster> 
    <category domain="http://www.weblogs.com/rssUpdates/changes.xml">rssUpdates</category> 
   <skipHours>
    <hour>5</hour> 
    <hour>4</hour> 
    <hour>2</hour> 
    <hour>3</hour> 
    <hour>6</hour> 
    <hour>23</hour> 
    <hour>1</hour> 
    <hour>0</hour> 
    </skipHours>
    <cloud domain="radio.xmlstoragesystem.com" port="80" path="/RPC2" registerProcedure="xmlStorageSystem.rssPleaseNotify" protocol="xml-rpc" /> 
    <ttl>60</ttl> 
   <item>
    <title>Hotel California</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/26.html#a994</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>Hotel California</STRONG>: Russell is at it <A href="http://www.russellbeattie.com/notebook/20030426.html#010547">again</A>. Just when you thought he'd settled down - <EM>Bang</EM>. This time he's decided to go back to California and take up a mobile/java related consulting position. Sounds just like the sort of thing he should do as well. And California...well...what can I say....envy.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/26.html#a994</guid> 
    <pubDate>Sat, 26 Apr 2003 09:26:09 GMT</pubDate> 
    </item>
   <item>
    <title>Saturday summary</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/26.html#a993</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif"><FONT size="2"><STRONG>Saturday summary</STRONG>: This morning I'm waiting for the <STRIKE>mob</STRIKE>gang to arrive back from their UK trip. I've cleared away all the leftovers from last-nights party (Yeah right) and made sure most of the stuff I bought is hidden or looks as though it has always been here :-).</FONT></FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/26.html#a993</guid> 
    <pubDate>Sat, 26 Apr 2003 09:22:33 GMT</pubDate> 
    </item>
   <item>
    <title>7 Habits of Blogging</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/25.html#a992</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>7 Habits of Blogging</STRONG>: I laughed out loud at </FONT><A href="http://www.russellbeattie.com/notebook/20030424.html#170238"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">this</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">. So good.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/25.html#a992</guid> 
    <pubDate>Fri, 25 Apr 2003 14:50:23 GMT</pubDate> 
    </item>
   <item>
    <title>Founders licence</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/25.html#a991</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>Founders licence</STRONG>: O'Reilly to </FONT><A href="http://creativecommons.org/projects/founderscopyright/oreilly"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">release</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"> over a hundred out-of-print books for free download.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/25.html#a991</guid> 
    <pubDate>Fri, 25 Apr 2003 11:38:49 GMT</pubDate> 
    </item>
   <item>
    <title>Read all about it</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/25.html#a990</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif"><FONT size="2"><STRONG>Read all about it</STRONG>: If you're looking for some of the presentation material from ETCon then go </FONT></FONT><A href="http://www.socialtext.net/etech/index.cgi?PowerPoint%20Gallery"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">here</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/25.html#a990</guid> 
    <pubDate>Fri, 25 Apr 2003 11:22:41 GMT</pubDate> 
    </item>
   <item>
    <title>Hydra - a collaborative experience</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/25.html#a989</link> 
    <description><P><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif"><FONT size="2"><STRONG>Hydra - a collaborative experience</STRONG>: The Mac OS X tool </FONT></FONT><A href="http://hydra.globalse.org/"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">Hydra</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"> is popular at ETCon. It's being used there to aid group-notetaking at the various presentations. What's even more interesting is the fact that the authors are a group of <A href="http://www.codingmonkeys.de/">students</A> out of Munich university.</FONT></P></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/25.html#a989</guid> 
    <pubDate>Fri, 25 Apr 2003 06:42:27 GMT</pubDate> 
    </item>
   <item>
    <title>Alan Kay on children</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/25.html#a988</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>Alan Kay on children</STRONG>: At ETCon, Alan Kay gave a keynote "Daddy are we there yet" and talked on how children use computers. Interesting picture </FONT><A href="http://www.oreillynet.com/pub/a/network/et2003/thursday_photos.html?page=6"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">here</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/25.html#a988</guid> 
    <pubDate>Fri, 25 Apr 2003 06:30:11 GMT</pubDate> 
    </item>
   <item>
    <title>FM on iPod</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/24.html#a987</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>FM on iPod</STRONG>: Add <A href="http://www.griffintechnology.com/products/ifm/">this</A> to your <A href="http://www.apple.com/ipod">iPod</A> and you get radio as well.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/24.html#a987</guid> 
    <pubDate>Thu, 24 Apr 2003 11:19:03 GMT</pubDate> 
    </item>
   <item>
    <title>Stefano, Linotype and weblogs:</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/24.html#a986</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>Stefano, Linotype and weblogs</STRONG>: Stefano </FONT><A href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&amp;m=105111976011472&amp;w=2"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">starts</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"> his own </FONT><A href="http://www.betaversion.org/~stefano/linotype/"><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2">weblog</FONT></A><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"> using Linotype (which is Cocoon plus his own additions).</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/24.html#a986</guid> 
    <pubDate>Thu, 24 Apr 2003 06:46:07 GMT</pubDate> 
    </item>
   <item>
    <title>Blogger meets TypePad</title> 
    <link>http://radio.weblogs.com/0103021/2003/04/24.html#a985</link> 
    <description><FONT face="Verdana,Geneva,Arial,Helvetica,Sans-Serif" size="2"><STRONG>Blogger meets TypePad</STRONG>: In an interesting development on the blogging scene, Ben and Mena Trott (the <A href="http://www.movabletype.org/">MovableType</A> husband and wife team) have quietly launched <A href="http://www.typepad.com">TypePad</A>. Basically an enhanced version of the Movable Type software - but hosted (like <A href="http://www.blogger.com">blogger</A>). Read <A href="http://www.benhammersley.com/">Ben's</A> <A href="http://www.guardian.co.uk/online/news/0,12597,942024,00.html">article</A> for more. With the recent "Google buys blogger" move, this means that TypePad will be facing stiff competition. On the other hand I really like MT and so look forward to the start of TP.</FONT></description> 
    <guid>http://radio.weblogs.com/0103021/2003/04/24.html#a985</guid> 
    <pubDate>Thu, 24 Apr 2003 06:37:00 GMT</pubDate> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/nyt_business.xml
  
  Index: nyt_business.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1" ?> 
   <rss version="0.91">
   <channel>
    <title>New York Times: Business</title> 
    <link>http://www.nytimes.com/pages/business/</link> 
    <description>(By http://www.newsisfree.com/syndicate.php - FOR PERSONAL AND NON COMMERCIAL USE ONLY!)</description> 
    <language>en</language> 
    <webMaster>mkrus@newsisfree.com</webMaster> 
    <lastBuildDate>04/29/03 14:26 CEST</lastBuildDate> 
   <image>
    <link>http://www.newsisfree.com/sources/info/759/</link> 
    <url>http://www.newsisfree.com/HPE/Images/button.gif</url> 
    <title>Powered by NewsIsFree</title> 
    <width>88</width> 
    <height>31</height> 
    </image>
   <item>
    <title>In a Wall St. Hierarchy, Short Shrift to Little Guy</title> 
    <link>http://www.newsisfree.com/click/-2,17188428,759/</link> 
    </item>
   <item>
    <title>10 Wall St. Firms Settle With U.S. in Analyst Inquiry</title> 
    <link>http://www.newsisfree.com/click/-2,17188429,759/</link> 
    </item>
   <item>
    <title>Airline Workers Losing Perks</title> 
    <link>http://www.newsisfree.com/click/-2,17188430,759/</link> 
    </item>
   <item>
    <title>MasterCard Settles Case With Retailers Ahead of Trial</title> 
    <link>http://www.newsisfree.com/click/-2,17188431,759/</link> 
    </item>
   <item>
    <title>Radio Performance Closely Watched at Viacom</title> 
    <link>http://www.newsisfree.com/click/-2,17188432,759/</link> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/cnet_business.xml
  
  Index: cnet_business.xml
  ===================================================================
  <?xml version="1.0"?> 
   <rss version="2.0">
   <channel>
    <title>CNET News.com - E-Business</title> 
    <link>http://www.news.com/</link> 
    <description>Tech News First</description> 
    <language>en-us</language> 
    <pubDate>Tue, 29 Apr 2003 07:35:23 PDT</pubDate> 
    <lastBuildDate>Tue, 29 Apr 2003 07:35:23 PDT</lastBuildDate> 
    <category domain="syndic8">14173</category> 
    <category>CNET News.com - E-Business</category> 
    <generator>CNET</generator> 
    <docs>http://news.com.com/2009-1090-980549.html</docs> 
    <ttl>20</ttl> 
   <image>
    <title>CNET News.com</title> 
    <url>http://i.i.com.com/cnwk.1d/i/ne/gr/prtnr/rss_logo.gif</url> 
    <link>http://www.news.com/</link> 
    <width>88</width> 
    <height>31</height> 
    </image>
   <item>
    <title>OASIS: Net procurement needs to align</title> 
    <link>http://rss.com.com</link> 
    <description>The Web services standards group launches an effort to create uniform practices for the way companies procure supplies over the Internet.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1019-998596.html</guid> 
    <pubDate>Mon, 28 Apr 2003 12:34:00 PDT</pubDate> 
    </item>
   <item>
    <title>Earnings: Amazon tapers loss</title> 
    <link>http://rss.com.com</link> 
    <description><!-- PLEASE BE SURE TO UPDATE THE BRIEF WITH THE LATEST HEADLINES -->The Web retailer narrows loss...Nortel posts surprise profit...Spider-Man can't save Sony from slipping into the red.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2009-1017-255584.html</guid> 
    <pubDate>Sun, 27 Apr 2003 06:00:00 PDT</pubDate> 
    </item>
   <item>
    <title>Monster backpedals on listings purge</title> 
    <link>http://rss.com.com</link> 
    <description>Amid protests from Arab-American groups, the career Web site partially backs away from a decision to exclude references to job postings and r&#233;sum&#233;s from seven countries.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1022-998357.html</guid> 
    <pubDate>Fri, 25 Apr 2003 17:08:00 PDT</pubDate> 
    </item>
   <item>
    <title>VC Watch: Nanosys receives $30 million</title> 
    <link>http://rss.com.com</link> 
    <description>The company is an intellectual property licensing player in nanotechnology...Demantra rakes in $16 million...NeoScale Systems whips up $12 million.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1021-998356.html</guid> 
    <pubDate>Fri, 25 Apr 2003 09:35:00 PDT</pubDate> 
    </item>
   <item>
    <title>Taiwan dreads Computex ghost town</title> 
    <link>http://rss.com.com</link> 
    <description>Fears of empty halls at Computex Taipei due to the SARS outbreak have prompted the city's mayor to send out 200,000 letters of reassurance to overseas buyers.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1021-998329.html</guid> 
    <pubDate>Fri, 25 Apr 2003 06:26:00 PDT</pubDate> 
    </item>
   <item>
    <title>Amazon lifted by international sales</title> 
    <link>http://rss.com.com</link> 
    <description>The Web retailer reports a narrower loss and higher revenue on the back of a 68 percent rise in overseas sales, special promotions and cost-cutting.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1021-998280.html</guid> 
    <pubDate>Thu, 24 Apr 2003 15:22:00 PDT</pubDate> 
    </item>
   <item>
    <title>Best Software reshuffles, cuts jobs</title> 
    <link>http://rss.com.com</link> 
    <description /> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2110-1021-998278.html</guid> 
    <pubDate>Thu, 24 Apr 2003 14:54:00 PDT</pubDate> 
    </item>
   <item>
    <title>SEC set to swoop in insider trading suit</title> 
    <link>http://rss.com.com</link> 
    <description>A wife-and-husband pair of Wall Street high-flyers will reportedly soon face civil suit charges of irregularities in trading in shares of eBay and Drugstore.com.</description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1021-998215.html</guid> 
    <pubDate>Thu, 24 Apr 2003 11:02:00 PDT</pubDate> 
    </item>
   <item>
    <title>Federal charges shock Silicon Valley</title> 
    <link>http://rss.com.com</link> 
    <description>To many in Silicon Valley, there is a growing sense that the once high-flying banker Frank P. Quattrone is taking the heat for the entire industry. <br /><span class="a1">The New York Times</span></description> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1021-998124.html</guid> 
    <pubDate>Wed, 23 Apr 2003 21:30:00 PDT</pubDate> 
    </item>
   <item>
    <title>eBay to stay in San Jose</title> 
    <link>http://rss.com.com</link> 
    <description /> 
    <category>E-Business</category> 
    <guid isPermaLink="true">http://rss.com.com/2110-1018-998123.html</guid> 
    <pubDate>Wed, 23 Apr 2003 21:00:00 PDT</pubDate> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/cnet_news.xml
  
  Index: cnet_news.xml
  ===================================================================
  <?xml version="1.0" ?> 
   <rss version="2.0">
   <channel>
    <title>CNET News.com</title> 
    <link>http://www.news.com/</link> 
    <description>Tech News First</description> 
    <language>en-us</language> 
    <pubDate>Tue, 29 Apr 2003 07:29:05 PDT</pubDate> 
    <lastBuildDate>Tue, 29 Apr 2003 07:29:05 PDT</lastBuildDate> 
    <category domain="syndic8">14171</category> 
    <category>CNET News.com</category> 
    <generator>CNET</generator> 
    <docs>http://news.com.com/2009-1090-980549.html</docs> 
    <ttl>20</ttl> 
   <image>
    <title>CNET News.com</title> 
    <url>http://i.i.com.com/cnwk.1d/i/ne/gr/prtnr/rss_logo.gif</url> 
    <link>http://www.news.com/</link> 
    <width>88</width> 
    <height>31</height> 
    </image>
   <item>
    <title>Intel worker accused of aiding terrorists</title> 
    <link>http://rss.com.com</link> 
    <description>The Justice Department charges engineer Mike Hawash, who has been in solitary confinement since March 20, with conspiracy to levy war against America and of supporting terror groups.</description> 
    <category>Media</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1028-998718.html</guid> 
    <pubDate>Tue, 29 Apr 2003 07:15:00 PDT</pubDate> 
    </item>
   <item>
    <title>Commentary: Breaking the digital music logjam</title> 
    <link>http://rss.com.com</link> 
    <description>The iTunes Music Store will raise the bar for digital music under Windows and change the industry, but it won't get Apple out of its 5 percent ghetto in the PC business.</description> 
    <category>News.Commentary</category> 
    <guid isPermaLink="true">http://rss.com.com/2009-1122-998707.html</guid> 
    <pubDate>Tue, 29 Apr 2003 06:10:00 PDT</pubDate> 
    </item>
   <item>
    <title>Off the hype meter</title> 
    <link>http://rss.com.com</link> 
    <description>Industry watcher <b>Jon Oltsik</b> offers his nominations for technology categories in which the elevation of hype has become an art form.</description> 
    <category>Perspectives</category> 
    <guid isPermaLink="true">http://rss.com.com/2010-1071-998529.html</guid> 
    <pubDate>Tue, 29 Apr 2003 04:00:00 PDT</pubDate> 
    </item>
   <item>
    <title>Sweet Semel of success</title> 
    <link>http://rss.com.com</link> 
    <description>After two years as leader of Yahoo, CEO Terry Semel is silencing naysayers with the results of his low-key approach.</description> 
    <category>Media</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1030-998665.html</guid> 
    <pubDate>Tue, 29 Apr 2003 04:00:00 PDT</pubDate> 
    </item>
   <item>
    <title>Apple's music: Evolution, not revolution</title> 
    <link>http://rss.com.com</link> 
    <description>For all the glitz surrounding the unveiling of Apple's new music service, a quick look suggests that it's a solid, but hardly revolutionary, addition to the market.</description> 
    <category>Media</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1027-998675.html</guid> 
    <pubDate>Tue, 29 Apr 2003 04:00:00 PDT</pubDate> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/cnet_news2.xml
  
  Index: cnet_news2.xml
  ===================================================================
  <?xml version="1.0"?>
   <rss version="2.0">
   <channel>
   <image>
    <title>CNET News.com</title> 
    <url>http://i.i.com.com/cnwk.1d/i/ne/gr/prtnr/rss_logo.gif</url> 
    <link>http://www.news.com/</link> 
    <width>88</width> 
    <height>31</height> 
    </image>
   <item>
    <title>Intel worker accused of aiding terrorists</title> 
    <link>http://rss.com.com</link> 
    <description>The Justice Department charges engineer Mike Hawash, who has been in solitary confinement since March 20, with conspiracy to levy war against America and of supporting terror groups.</description> 
    <category>Media</category> 
    <guid isPermaLink="true">http://rss.com.com/2100-1028-998718.html</guid> 
    <pubDate>Tue, 29 Apr 2003 07:15:00 PDT</pubDate> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/cz_weblog.xml
  
  Index: cz_weblog.xml
  ===================================================================
  <?xml version="1.0" ?> 
   <rss version="2.0">
   <channel>
    <title>Cocoon and more</title> 
    <link>http://radio.weblogs.com/0107211/</link> 
    <description>This is the personal weblog of Carsten Ziegeler.</description> 
    <copyright>Copyright 2003 Carsten Ziegeler</copyright> 
    <lastBuildDate>Tue, 29 Apr 2003 07:56:00 GMT</lastBuildDate> 
    <docs>http://backend.userland.com/rss</docs> 
    <generator>Radio UserLand v8.0.8</generator> 
    <managingEditor>cziegeler@s-und-n.de</managingEditor> 
    <webMaster>cziegeler@s-und-n.de</webMaster> 
    <category domain="http://www.weblogs.com/rssUpdates/changes.xml">rssUpdates</category> 
   <skipHours>
    <hour>23</hour> 
    <hour>0</hour> 
    <hour>1</hour> 
    <hour>2</hour> 
    <hour>3</hour> 
    <hour>4</hour> 
    <hour>5</hour> 
    <hour>6</hour> 
    </skipHours>
    <cloud domain="radio.xmlstoragesystem.com" port="80" path="/RPC2" registerProcedure="xmlStorageSystem.rssPleaseNotify" protocol="xml-rpc" /> 
    <ttl>60</ttl> 
   <item>
    <title>Growing Up</title> 
    <link>http://petergabriel.com/moonclub/tours/tour_page.html</link> 
    <description><P>Tomorrow: <A href="http://www.koenig-pilsener-arena.de/index.htm">Live in Oberhausen</A></P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/04/29.html#a111</guid> 
    <pubDate>Tue, 29 Apr 2003 07:55:59 GMT</pubDate> 
    </item>
   <item>
    <title>Cocoon Milestone 1</title> 
    <link>http://radio.weblogs.com/0107211/2003/04/28.html#a110</link> 
    <description>Hurray, it seems that Cocoon is reaching a new milestone: 2.1-M1 (a.k.a. 2.1-Beta1). Although we don't have such a detailed plan as for example Eclipse, I guess we will reach the release candidate phase this year :)</description> 
    <guid>http://radio.weblogs.com/0107211/2003/04/28.html#a110</guid> 
    <pubDate>Mon, 28 Apr 2003 13:24:46 GMT</pubDate> 
    </item>
   <item>
    <title>Home, sweet home - sort of</title> 
    <link>http://radio.weblogs.com/0107211/2003/04/28.html#a109</link> 
    <description>After travelling around for the last four weeks, I'm finally back in my home...eh...office and can work at my own desk again. Don't get me wrong, I like being at customer sites but most times you are limited with respect to emails, internet access, cvs etc.</description> 
    <guid>http://radio.weblogs.com/0107211/2003/04/28.html#a109</guid> 
    <pubDate>Mon, 28 Apr 2003 13:23:28 GMT</pubDate> 
    </item>
   <item>
    <title>Books about open source</title> 
    <link>http://radio.weblogs.com/0107211/2003/04/17.html#a108</link> 
    <description><P>I just read a book about using open source in own projects and I was a little bit disappointed. In general the book is good as it details different open source projects, for example for logging, for persistence, for server-site programming etc. And then I came to the Struts chapter...and read this: "Whenever you start a project, you should not ask 'can we use Struts for this?', you should ask 'Why not using Struts?' Struts is the perfect fit for every web application."</P> <P>Now, I really value Struts and I think it makes perfect sense in some cases, but Struts is not the golden hammer tool, if you understand what I mean. It doesn't make sense to use the same tool for every problem. This is nonsense for Struts and this is nonsense for Cocoon and this is nonsense for every server-site programming as well. </P> <P>The key in successful programming is to choose the right tools or frameworks or libraries for the job to do.</P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/04/17.html#a108</guid> 
    <pubDate>Thu, 17 Apr 2003 13:51:26 GMT</pubDate> 
    </item>
   <item>
    <title>CruiseControl - the endless story has an end</title> 
    <link>http://radio.weblogs.com/0107211/2003/04/07.html#a107</link> 
    <description><P>Finally I got CruiseControl 2.0.2 running - it wasn't that easy as the documentation is a little bit confusing, the default settings are unusable and sometimes you have to guess what the correct settings are.</P> <P>Ok, I guess, most of you have cruisecontrol or anthill or whatever running since years, anyway; but for me it's a little success because during the last months I accidentally tried to install it from time to time and always failed :(. But I never gave up!So after all: a little success.</P> <P>The next question is: Where to use it? Hmm....</P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/04/07.html#a107</guid> 
    <pubDate>Mon, 07 Apr 2003 13:12:35 GMT</pubDate> 
    </item>
   <item>
    <title>New music</title> 
    <link>http://radio.weblogs.com/0107211/2003/04/07.html#a106</link> 
    <description><P>Over the weekend I had some time to listen to some new music:</P> <P>The new album "Sleeping with Ghosts" from <A href="http://www.placeboworld.co.uk/">Placebo</A> is very good. Now, putting it simple: it's like the other albums with new songs. So if you like this kind of music, it's a must buy.</P> <P>The new album "Long gone before daylight" from the <A href="http://www.cardigans.com">Cardigans</A> is in my eyes not so good. The released single is nice to listen to (again, as always :) ), but the other songs are in my ears only nice, like the usual everyday songs.</P> <P>Next up is a copy of the latest Coldplay album - I only listened to two tracks.</P> <P>I will upload the albums to my (new) mp3 player with 20GB space for all my CDs; so I can listen everywhere to "my" music without carrying tons of CDs with me.</P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/04/07.html#a106</guid> 
    <pubDate>Mon, 07 Apr 2003 12:28:13 GMT</pubDate> 
    </item>
   <item>
    <title>The Lion King</title> 
    <link>http://radio.weblogs.com/0107211/2003/03/31.html#a105</link> 
    <description><P>Last week I visited the <A href="http://www.loewenkoenig.de/index2.php">Lion King</A> in Hamburg. It's really a great musical with very good sound and visual effects.</P> <P>Ok, the story is not very good and the texts are not very sophisticated - so, at the end it's like a good action movie: the story doesn't matter but the effects are worth seeing it. Especially the african music (sounded a little bit like some PG songs) and the interesting animal costumes.</P> <P>So, if you have time to see the musical, watch it! The stage is located in the habor of Hamburg at the opposite site of the city. So you can take a boat for free to travel over the river to the stage or you can use the old tunnel and walk by feet under(!) the river (which takes some time).</P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/03/31.html#a105</guid> 
    <pubDate>Mon, 31 Mar 2003 13:38:43 GMT</pubDate> 
    </item>
   <item>
    <title>The Cocoon Family</title> 
    <link>http://radio.weblogs.com/0107211/2003/03/31.html#a104</link> 
    <description><FONT size="2"> <P>Some users/readers might be wondering what's going on in Cocoonland and perhaps some users might get worried about the "mysterious things" taking place in the mailing list over the past weeks. And this might scare them.</P> <P>So, what's going on and what will be the meaning for Cocoon? Now, to be honest I currently don't know what's going on (well at least, I know some things that are happening, but unfortunately not all). But I'm trying to figure it out.</P> <P>So, what does this mean for using Cocoon? I really think: viewed globally: nothing. There were some bad comments over the last weeks, one important committer left the project (which is really sad) because of that, and currently others are thinking about leaving/taking a break as well. </P> <P>Everything seems quiet now, but I still think that the storm is not over yet. Perhaps we can get the new release out without any problems, but it's unlikely that sooner or later the same problems will arise, because I guess that the root of the problems is not really solved yet - and the root is not clearly visible by now, but again, I'm trying to figure it out.</P> <P>But on the other hand, there are many other committers keeping on the great work taking place over the last years, and there are many users helping as well. Most of them were active over the last years and are still committed to Cocoon, and they will not discontinue their work because of some stupid comments. And even more important, there is a big commercial committment to Cocoon, and all these (big) companies will asure that Cocoon will continue.</P> <P>So don't worry if you see these ego-fights and verbal attacks in the mailing list; this happens from time to time, but it has no real impact on the success of the project. It's like a big family - there is not always sunshine and from time to time some black sheep arrive and try to cause confusion and discredit. But after a time, the problems will be solved and the family can keep on living happily.</P></FONT></description> 
    <guid>http://radio.weblogs.com/0107211/2003/03/31.html#a104</guid> 
    <pubDate>Mon, 31 Mar 2003 13:33:39 GMT</pubDate> 
    </item>
   <item>
    <title>Once Upon a Time</title> 
    <link>http://radio.weblogs.com/0107211/2003/03/21.html#a103</link> 
    <description><P>Today I had some time to think about the good old past: the first time I got in contact with Cocoon. So here are some facts:</P> <P>It's nearly three years ago.  I started in June 2000 by exploring the differences between Cocoon 1 - which was the current version of that time - and the pre-pre-pre alpha version of Cocoon 2.</P> <P>Although most features of Cocoon 2 were even not implemented, for example the sitemap did not compile well, actions were not defined, selectors were not implemented etc, it became clear that Cocoon 2 would be the way to go.</P> <P>And then a time with real fun started (and I really mean it the way I say). As we started in July 2000 with using the available Cocoon 2 version, we ran into several problems, bugs and missing features from day to day. And we tried to fix each issue and submit a patch to the community. Don't get me wrong, it's absolutely natural, that a project at that stage has bugs and problems. So we knew what lay ahead of us.</P> <P>Although this was a hard time, we believed the community of Cocoon that a first version of 2.0 would be available in November 2000 - now, we know that this was wrong :) The first version was indeed released in November, but in 2001.</P> <P>Then one day, the Cocoon community had enough of my patches ;) and voted me in as a committer! Wow! It became evident that some important parts were still missing, like caching, internal cocoon calls etc. As I already implemented such things for our product called sunShine, I added those things to Cocoon as well.</P> <P>The whole time between June 2000 and November 2001 was really fun, because we acted really like a community (or family if you want). When a problem was detected, you were never alone. Most time, the problem was fixed by working together. And also new things were always discussed by most committers and then implemented.</P> <P>This changed after the first release of Cocoon 2.0 in November 2001, because there were no real itches to scratch. Everything (well, at least the core) was working very well.</P> <P>So, looking back it was a real great time to be directly involved in the development of such a great open source project. </P> <P>Today, it's still fun to be part of the great Cocoon community but I'm really missing the collaboration between the different committers.<br/>From time to time two or three committers try to solve together a problem/add a feature but mostly this lasts only for this single issue.</P> <P>But it's <EM>still</EM> fun even if the weather is not too sunny at the moment.</P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/03/21.html#a103</guid> 
    <pubDate>Fri, 21 Mar 2003 10:17:49 GMT</pubDate> 
    </item>
   <item>
    <title>Everything about Cocoon - JAX Speaker</title> 
    <link>http://www.jax2003.de</link> 
    <description><P>If you want to get to know something about Cocoon, well the <A href="http://www.jax2003.de/">JAX 2003</A> might be the right place for it. I will present two sessions about Cocoon (in German) and together with <A href="http://www.need-a-cake.com">Matthew</A> I will give a one day power workshop about Cocoon! And Matthew gives of course some sessions as well, so you have to be there.</P> <P>Apart from our presentations, the JAX will have several other very interesting talks as well. So make sure that you mark the date in your calendar.</P></description> 
    <guid>http://radio.weblogs.com/0107211/2003/03/20.html#a102</guid> 
    <pubDate>Thu, 20 Mar 2003 12:25:33 GMT</pubDate> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/nyt_sport.xml
  
  Index: nyt_sport.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1" ?> 
   <rss version="0.91">
   <channel>
   <item>
    <title>High-Priced Mets Struggle With K's and E's</title> 
    <link>http://www.newsisfree.com/click/-2,17186485,760/</link> 
    </item>
   <item>
    <title>Suddenly, Pacers' Miller Loses Postseason Prowess</title> 
    <link>http://www.newsisfree.com/click/-2,17186486,760/</link> 
    </item>
   <item>
    <title>Sorenstam Tunes Up and Tunes Out</title> 
    <link>http://www.newsisfree.com/click/-2,17186487,760/</link> 
    </item>
   <item>
    <title>A First Draft of the Winners and Losers</title> 
    <link>http://www.newsisfree.com/click/-2,17186488,760/</link> 
    </item>
   <item>
    <title>Defying Odds on Road to Derby</title> 
    <link>http://www.newsisfree.com/click/-2,17186489,760/</link> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/cst_news.xml
  
  Index: cst_news.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1" ?> 
   <rss version="0.91">
   <channel>
   <item>
    <title>Number of missing DCFS wards doubles</title> 
    <link>http://www.newsisfree.com/click/-2,17198736,2282/</link> 
    </item>
   <item>
    <title>13 reported killed in shootout with soldiers</title> 
    <link>http://www.newsisfree.com/click/-2,17203867,2282/</link> 
    </item>
   <item>
    <title>Waukegan awaits Catholic high school</title> 
    <link>http://www.newsisfree.com/click/-2,17203868,2282/</link> 
    </item>
   <item>
    <title>Rogues help themselves to X-Men movie posters</title> 
    <link>http://www.newsisfree.com/click/-2,17203869,2282/</link> 
    </item>
   <item>
    <title>Teens take a pass on exclusive relationships</title> 
    <link>http://www.newsisfree.com/click/-2,17198737,2282/</link> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/bbc_news.xml
  
  Index: bbc_news.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1" ?> 
   <rss version="0.91">
   <channel>
    <title>BBC News | World | UK Edition</title> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/default.stm</link> 
    <description>Updated every minute of every day</description> 
    <language>en-gb</language> 
    <lastBuildDate>Tue, 29 Apr 03 14:41:21 GMT</lastBuildDate> 
    <copyright>Copyright: (C) British Broadcasting Corporation, http://news.bbc.co.uk/2/shared/bsp/hi/services/copyright/html/default.stm</copyright> 
    <docs>http://www.bbc.co.uk/syndication/</docs> 
   <image>
    <title>BBC News Online</title> 
    <url>http://news.bbc.co.uk/furniture/syndication/bbc_news_120x60.gif</url> 
    <link>http://news.bbc.co.uk</link> 
    </image>
   <item>
    <title>US pulls out of Saudi Arabia</title> 
    <description>The United States says virtually all its troops, except some training personnel, are to be withdrawn from Saudi Arabia.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/middle_east/2984547.stm</link> 
    </item>
   <item>
    <title>Sars 'a long-term epidemic'</title> 
    <description>The outbreak of the Sars virus in China is a grave and long-term problem, Prime Minister Wen Jiabao says.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/asia-pacific/2985649.stm</link> 
    </item>
   <item>
    <title>PM rejects Mid-East violence</title> 
    <description>The Palestinian prime minister-designate says there is no military solution to the Isralei conflict, as he faces a crucial vote.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/middle_east/2983939.stm</link> 
    </item>
   <item>
    <title>Charges over Serb PM murder</title> 
    <description>Serbian ultra-nationalist Vojislav Seselj and 44 others are charged over the killing of PM Zoran Djindjic.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/europe/2985423.stm</link> 
    </item>
   <item>
    <title>'Anti-war' four stress euro-role</title> 
    <description>Four anti-war EU leaders end a summit reaffirming their commitment to Nato - but seeking closer European ties.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/europe/2984021.stm</link> 
    </item>
   <item>
    <title>Vajpayee 'not to go to Pakistan'</title> 
    <description>India's prime minister is unlikely to visit Pakistan for talks in the near future, despite an invitation from his counterpart.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/south_asia/2984265.stm</link> 
    </item>
   <item>
    <title>Croat 'war crimes' general dies</title> 
    <description>The former head of the Croatian army, seen as a national hero but indicted by the war crimes tribunal, dies.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/europe/2985633.stm</link> 
    </item>
   <item>
    <title>Militant killed in Gaza attack</title> 
    <description>A Palestinian militant dies in a strike by Israeli helicopter gunships in Gaza, while two others are reported killed in the West Bank.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/middle_east/2984559.stm</link> 
    </item>
   <item>
    <title>Blair arrives for Russia talks</title> 
    <description>The UK prime minister is holding his first meeting with President Putin since the start of the Iraq war.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/uk_politics/2983789.stm</link> 
    </item>
   <item>
    <title>Iraqis killed in anti-US protest</title> 
    <description>US troops open fire on demonstrators in the town of Falluja, killing at least 13 people according to witnesses.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/middle_east/2984663.stm</link> 
    </item>
   <item>
    <title>Iraqi antiquities summit held</title> 
    <description>Museum experts meet in London to discuss how to help restore the looted cultural heritage of Iraq.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/europe/2984171.stm</link> 
    </item>
   <item>
    <title>US anger at war crimes threat</title> 
    <description>The US warns Belgium not to proceed with a possible war crimes case against Iraq war commander Tommy Franks.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/middle_east/2983911.stm</link> 
    </item>
   <item>
    <title>Wimbledon ups prize money</title> 
    <description>This year's Wimbledon men's singles champion will receive �575,000.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/sport1/hi/tennis/2985277.stm</link> 
    </item>
   <item>
    <title>Kiwis bat out Colombo draw</title> 
    <description>New Zealand and Sri Lanka draw the first Test, despite three late wickets for Muttiah Muralitharan.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/sport1/hi/cricket/2984095.stm</link> 
    </item>
   <item>
    <title>Fears for Nigerian oil hostages</title> 
    <description>Negotiations are under way to free foreign oil workers - including 50 Britons - held on rigs off the Nigerian coast.</description> 
    <link>http://news.bbc.co.uk/go/click/rss/0.91/public/-/1/hi/world/africa/2983577.stm</link> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/cnn_europe.xml
  
  Index: cnn_europe.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1" ?> 
   <rss version="0.91">
   <channel>
    <title>CNN Europe</title> 
    <link>http://edition.cnn.com/EUROPE/</link> 
    <description>Current news with audio and video clips; latest news headlines for business, world, weather, sport, entertainment, technology (By http://www.newsisfree.com/syndicate.php - FOR PERSONAL AND NON COMMERCIAL USE ONLY!)</description> 
    <language>en</language> 
    <webMaster>mkrus@newsisfree.com</webMaster> 
    <lastBuildDate>04/29/03 16:50 CEST</lastBuildDate> 
   <image>
    <link>http://www.newsisfree.com/sources/info/697/</link> 
    <url>http://www.newsisfree.com/HPE/Images/button.gif</url> 
    <title>Powered by NewsIsFree</title> 
    <width>88</width> 
    <height>31</height> 
    </image>
   <item>
    <title>Customize this feed</title> 
    <link>http://www.newsisfree.com/sources/rss/697/</link> 
    <description>Add more items, descriptions, time stamps, select your version of RSS, aggregate several feeds... Check out NewsIsFree's premium syndication services! (18)</description> 
    </item>
   <item>
    <title>French business morale slumps</title> 
    <link>http://www.newsisfree.com/click/-2,17203200,697/</link> 
    </item>
   <item>
    <title>War helps BP to record profits</title> 
    <link>http://www.newsisfree.com/click/-2,17203201,697/</link> 
    </item>
   <item>
    <title>Ericsson to slash 13,000 jobs</title> 
    <link>http://www.newsisfree.com/click/-2,17198132,697/</link> 
    </item>
   <item>
    <title>Europe shares up on job cuts</title> 
    <link>http://www.newsisfree.com/click/-2,17198133,697/</link> 
    </item>
   <item>
    <title>Soyuz crew dock with space station</title> 
    <link>http://www.newsisfree.com/click/-1,17136548,697/</link> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/nn_weblog.xml
  
  Index: nn_weblog.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1" ?> 
   <rss version="0.91">
   <channel>
   <item>
    <title>Giving the world a pluggable Gnutella</title> 
    <link>http://writetheweb.com/read.php?item=24</link> 
    <description>WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing.</description> 
    </item>
   <item>
    <title>Syndication discussions hot up</title> 
    <link>http://writetheweb.com/read.php?item=23</link> 
    <description>After a period of dormancy, the Syndication mailing list has become active again, with contributions from leaders in traditional media and Web syndication.</description> 
    </item>
   <item>
    <title>Personal web server integrates file sharing and messaging</title> 
    <link>http://writetheweb.com/read.php?item=22</link> 
    <description>The Magi Project is an innovative project to create a combined personal web server and messaging system that enables the sharing and synchronization of information across desktop, laptop and palmtop devices.</description> 
    </item>
   <item>
    <title>Syndication and Metadata</title> 
    <link>http://writetheweb.com/read.php?item=21</link> 
    <description>RSS is probably the best known metadata format around. RDF is probably one of the least understood. In this essay, published on my O'Reilly Network weblog, I argue that the next generation of RSS should be based on RDF.</description> 
    </item>
   <item>
    <title>UK bloggers get organised</title> 
    <link>http://writetheweb.com/read.php?item=20</link> 
    <description>Looks like the weblogs scene is gathering pace beyond the shores of the US. There's now a UK-specific page on weblogs.com, and a mailing list at egroups.</description> 
    </item>
   <item>
    <title>Yournamehere.com more important than anything</title> 
    <link>http://writetheweb.com/read.php?item=19</link> 
    <description>Whatever you're publishing on the web, your site name is the most valuable asset you have, according to Carl Steadman.</description> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/offline/newsweek.xml
  
  Index: newsweek.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1" ?> 
  <!--  <!DOCTYPE rss (View Source for full doctype...)>  -->
   <rss version="0.91">
   <channel>
    <title>Moreover - moreover...</title> 
    <link>http://www.moreover.com</link> 
    <description>moreover... - news headlines from around the web, refreshed every 15 minutes</description> 
    <language>en-us</language> 
   <image>
    <title>moreover...</title> 
    <url>http://i.moreover.com/pics/rss.gif</url> 
    <link>http://www.moreover.com</link> 
    <width>144</width> 
    <height>16</height> 
    <description>News headlines from more than 4,000 sources, harvested every 15 minutes...</description> 
    </image>
   <item>
    <title>The Hunt Goes On</title> 
    <link>http://c.moreover.com/click/here.pl?r69731069</link> 
    <description>Newsweek Apr 29 2003 1:21AM ET</description> 
    </item>
   <item>
    <title>Iraq: Another Chem Weapon False Alarm</title> 
    <link>http://c.moreover.com/click/here.pl?r69700317</link> 
    <description>Newsweek Apr 28 2003 5:52PM ET</description> 
    </item>
   <item>
    <title>Online Forum: Facing the Future</title> 
    <link>http://c.moreover.com/click/here.pl?r69655016</link> 
    <description>Newsweek Apr 28 2003 10:40AM ET</description> 
    </item>
   <item>
    <title>American Idol is taking over the world and an interview with former Yankee pitcher Jim Bouton</title> 
    <link>http://c.moreover.com/click/here.pl?r69536024</link> 
    <description>Newsweek Apr 27 2003 7:44AM ET</description> 
    </item>
   <item>
    <title>Look forward to a high-flying season at the movies</title> 
    <link>http://c.moreover.com/click/here.pl?r69536021</link> 
    <description>Newsweek Apr 27 2003 7:44AM ET</description> 
    </item>
   <item>
    <title>Next month the second installment of The Matrix will storm into theatersand launch a high-flying season at t</title> 
    <link>http://c.moreover.com/click/here.pl?r69536019</link> 
    <description>Newsweek Apr 27 2003 7:44AM ET</description> 
    </item>
   <item>
    <title>Still Leaving The Light On</title> 
    <link>http://c.moreover.com/click/here.pl?r69531391</link> 
    <description>Newsweek Apr 27 2003 6:25AM ET</description> 
    </item>
   <item>
    <title>State Parks: Gas, Food and Lodging</title> 
    <link>http://c.moreover.com/click/here.pl?r69531380</link> 
    <description>Newsweek Apr 27 2003 6:25AM ET</description> 
    </item>
   <item>
    <title>The father of the American Navy was an insecure, brash, brave officer who would have fit right in with Donald</title> 
    <link>http://c.moreover.com/click/here.pl?r69519968</link> 
    <description>Newsweek Apr 27 2003 3:43AM ET</description> 
    </item>
   <item>
    <title>Singer Ibrahim Ferrers got highly placed friends</title> 
    <link>http://c.moreover.com/click/here.pl?r69519966</link> 
    <description>Newsweek Apr 27 2003 3:43AM ET</description> 
    </item>
   <item>
    <title>How to sell a hip-hop movie: make it about white people. Blacks arent amused</title> 
    <link>http://c.moreover.com/click/here.pl?r69519962</link> 
    <description>Newsweek Apr 27 2003 3:43AM ET</description> 
    </item>
   <item>
    <title>Ready to rage against the machines? Next month the second installment of The Matrix will storm into theaters</title> 
    <link>http://c.moreover.com/click/here.pl?r69519954</link> 
    <description>Newsweek Apr 27 2003 3:43AM ET</description> 
    </item>
   <item>
    <title>Bush Looks Ahead</title> 
    <link>http://c.moreover.com/click/here.pl?r69506774</link> 
    <description>Newsweek Apr 26 2003 11:01PM ET</description> 
    </item>
   <item>
    <title>An Excerpt From Gearheads: The Turbulent Rise of Robotic Sports</title> 
    <link>http://c.moreover.com/click/here.pl?r69493898</link> 
    <description>Newsweek Apr 26 2003 5:16PM ET</description> 
    </item>
   <item>
    <title>Dickey: Beware Long Occupations</title> 
    <link>http://c.moreover.com/click/here.pl?r69430244</link> 
    <description>Newsweek Apr 26 2003 1:10AM ET</description> 
    </item>
    </channel>
    </rss>
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/portal-demo.xml
  
  Index: portal-demo.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <document> 
    <header> 
  	 <title>The Cocoon Portal</title>
  	 <version>0.1</version> 
  	 <type>Overview document</type> 
    </header> 
    <body> 
  	 <s1 title="The Apache Cocoon Portal"> 
  		<p>This is a demo of the Cocoon Portal Engine.</p>
          <p>The Cocoon portal page you currently view displays some so called
            <em>Coplets</em> (= Cocoon Portlets). Each coplet displays
            a select content.</p> 
          <p>The different tabs display/demonstrate different aspects of the portal.</p>
          <ul>
            <li>The TabDemo1 shows a tab inside a tab, which is useful for structuring content.</li>
            <li>The TabDemo2 shows the same content as TabDemo2 but with just a different stylesheet for the tab.</li>
            <li>The Gallery tab shows some more coplets.</li>
          </ul>
          <p><strong>THIS IS A SAMPLE PORTAL!</strong></p>
          <p>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! Every configured
            feature might have an impact on the performance.
          </p>
          <p>For more information <fork href="http://cocoon.apache.org">visit the Cocoon Homepage</fork>.</p>
       </s1> 
  
    </body>
  </document>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/portal-right.xml
  
  Index: portal-right.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <document> 
    <header> 
  	 <title>Customization</title>
  	 <version>0.1</version> 
  	 <type>Overview document</type> 
    </header> 
    <body> 
  <s1 title="Customization"> 
  <p>The whole portal engine is built up by a set of (Avalon) components.
    You can customize (change/enhance) every aspect of the portal by
    using a different component for the same task.</p>
     </s1> 
  
    </body>
  </document>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/portal-left.xml
  
  Index: portal-left.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <document> 
    <header> 
  	 <title>Flexible Layout</title>
  	 <version>0.1</version> 
  	 <type>Overview document</type> 
    </header> 
    <body> 
  	 <s1 title="Flexible Layout"> 
         <p>You are absolutly free in defining the portal layout. You can combine
           the usual layout elements, like rows and columns, in any order and
           even can nest them.</p>
         <p>By this you can create coplets, like the sample above and below, that span
           more than one column etc.</p>
         <p>Even more complex elements, like tabs are possible.</p>
     </s1> 
  
    </body>
  </document>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  <?xml version="1.0"?>
  
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  
  <map:pipelines>
      
    <map:pipeline>	
  
      <map:match pattern="*.html">
          <map:generate type="file" src="{1}.xml" label="content" />
          <map:transform type="xslt" src="styles/document2html.xsl"/>
          <map:serialize type="html"/>
      </map:match>
  
    </map:pipeline>
  
  </map:pipelines>
  
  </map:sitemap>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/portal-intro.xml
  
  Index: portal-intro.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <document> 
    <header> 
  	 <title>The Cocoon Portal</title>
  	 <version>0.1</version> 
  	 <type>Overview document</type> 
    </header> 
    <body> 
  	 <s1 title="The Apache Cocoon Portal"> 
  		<p>This is a demo of the Cocoon Portal Engine.</p>
          <p>The Cocoon portal page you currently view displays some so called
            <em>Coplets</em> (= Cocoon Portlets). Each coplet displays
            a select content.</p> 
          <p><strong>THIS IS A SAMPLE PORTAL!</strong></p>
          <p>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! Every configured
            feature might have an impact on the performance.
          </p>
          <p>For more information <fork href="http://cocoon.apache.org">visit the Cocoon Homepage</fork>.</p>
       </s1> 
  
    </body>
  </document>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/portal-bottom.xml
  
  Index: portal-bottom.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <document> 
    <header> 
  	 <title>Further Information</title>
  	 <version>0.1</version> 
  	 <type>Overview document</type> 
    </header> 
    <body> 
  	 <s1 title="Further Information"> 
  		<p>For further information have a look at the Cocoon documentation
                and at the other portal demos available using the tab above.</p>
     </s1> 
  
    </body>
  </document>
  
  
  
  1.4       +1 -11     cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletdata.xml
  
  Index: copletdata.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletdata.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- copletdata.xml	17 Dec 2003 15:03:27 -0000	1.3
  +++ copletdata.xml	18 Dec 2003 13:16:14 -0000	1.4
  @@ -3,7 +3,7 @@
   	<description>Coplet data mapping file</description>
   
   	<class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
  -        <field name="persistentAspectDatas" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
  +        <field name="persistentAspectDatas" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
               <bind-xml name="aspect"/>
           </field>
       </class>
  @@ -50,15 +50,5 @@
   			<bind-xml name="value"/>
   		</field>
   	</class>
  -	<class name="org.apache.cocoon.portal.util.MapItem">
  -		<field name="key" type="java.lang.String">
  -			<bind-xml name="name"/>
  -		</field>
  -
  -		<field name="value">
  -			<bind-xml name="value"/>
  -		</field>
  -	</class>
  -	
   </mapping>
   
  
  
  
  1.3       +1 -10     cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml
  
  Index: copletinstancedata.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- copletinstancedata.xml	10 Dec 2003 15:09:47 -0000	1.2
  +++ copletinstancedata.xml	18 Dec 2003 13:16:14 -0000	1.3
  @@ -3,7 +3,7 @@
   	<description>Coplet instance data mapping file</description>
   
   	<class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
  -        <field name="persistentAspectDatas" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
  +        <field name="persistentAspectDatas" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
               <bind-xml name="aspect"/>
           </field>
       </class>
  @@ -47,14 +47,5 @@
   		</field>
   	</class>
   
  -	<class name="org.apache.cocoon.portal.util.MapItem">
  -		<field name="key" type="java.lang.String">
  -			<bind-xml name="name"/>
  -		</field>
  -
  -		<field name="value">
  -			<bind-xml name="value"/>
  -		</field>
  -	</class>
   </mapping>
   
  
  
  
  1.3       +9 -9      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/layout.xml
  
  Index: layout.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/layout.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- layout.xml	2 Sep 2003 08:34:17 -0000	1.2
  +++ layout.xml	18 Dec 2003 13:16:14 -0000	1.3
  @@ -4,7 +4,7 @@
   
   
   	<class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
  -        <field name="persistentAspectData" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
  +        <field name="persistentAspectData" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler">
               <bind-xml name="aspect"/>
           </field>
       </class>
  @@ -20,7 +20,7 @@
       </class>
   
   	<class name="org.apache.cocoon.portal.layout.AbstractParameters">
  -        <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ParameterFieldHandler">
  +        <field name="parameters" type="org.apache.cocoon.portal.util.AttributedMapItem" collection="map" handler="org.apache.cocoon.portal.util.ParameterFieldHandler">
               <bind-xml name="parameter" />
           </field>
       </class>
  @@ -80,21 +80,21 @@
   
   	<class name="org.exolab.castor.mapping.MapItem">
   		<field name="key" type="java.lang.String">
  -			<bind-xml name="name" node="attribute"/>
  +			<bind-xml name="name"/>
   		</field>
   
  -		<field name="value" type="java.lang.String">
  -			<bind-xml name="value" node="attribute"/>
  +		<field name="value">
  +			<bind-xml name="value"/>
   		</field>
   	</class>
   
  -	<class name="org.apache.cocoon.portal.util.MapItem">
  +	<class name="org.apache.cocoon.portal.util.AttributedMapItem">
   		<field name="key" type="java.lang.String">
  -			<bind-xml name="name"/>
  +			<bind-xml name="name" node="attribute"/>
   		</field>
   
  -		<field name="value">
  -			<bind-xml name="value"/>
  +		<field name="value" type="java.lang.String">
  +			<bind-xml name="value" node="attribute"/>
   		</field>
   	</class>
   
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/docs/styles/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  <?xml version="1.0"?>
  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
    <xsl:param name="isfaq"/>
    <xsl:template match="document">
    	<!-- Allready done by portal!
      <td colspan="2" valign="top" class="content"-->
        <xsl:if test="normalize-space(header/title)!=''">
          <h1>
            <xsl:value-of select="header/title"/>
          </h1>
        </xsl:if>
        <xsl:if test="normalize-space(header/subtitle)!=''">
          <h3>
            <xsl:value-of select="header/subtitle"/>
          </h3>
        </xsl:if>
        <xsl:if test="header/authors">
          <p>
            <font size="-2">
              <xsl:for-each select="header/authors/person">
                <xsl:choose>
                  <xsl:when test="position()=1">by&#160;</xsl:when>
                  <xsl:otherwise>,&#160;</xsl:otherwise>
                </xsl:choose>
                <xsl:value-of select="@name"/>
              </xsl:for-each>
            </font>
          </p>
        </xsl:if>
        <xsl:apply-templates select="body"/>
      <!--/td  see above!-->
    </xsl:template>
    <xsl:template match="body">
      <xsl:if test="section and not($isfaq='true')">
        <ul class="minitoc">
          <xsl:for-each select="section">
            <li>
              <a href="#{generate-id()}">
                <xsl:value-of select="title"/>
              </a>
              <xsl:if test="section">
                <ul class="minitoc">
                  <xsl:for-each select="section">
                    <li>
                      <a href="#{generate-id()}">
                        <xsl:value-of select="title"/>
                      </a>
                    </li>
                  </xsl:for-each>
                </ul>
              </xsl:if>
            </li>
          </xsl:for-each>
        </ul>
      </xsl:if>
      <xsl:apply-templates/>
    </xsl:template>
  <!--  section handling
    - <a name/> anchors are added if the id attribute is specified
    - generated anchors are still included for TOC - what should we do about this?
    - FIXME: provide a generic facility to process section irrelevant to their
      nesting depth
  -->
    <xsl:template match="section">
      <a name="{generate-id()}"/>
      <xsl:if test="normalize-space(@id)!=''">
        <a name="{@id}"/>
      </xsl:if>
      <h3>
        <xsl:value-of select="title"/>
      </h3>
      <xsl:apply-templates select="*[not(self::title)]"/>
    </xsl:template>
    <xsl:template match="section/section">
      <a name="{generate-id()}"/>
      <xsl:if test="normalize-space(@id)!=''">
        <a name="{@id}"/>
      </xsl:if>
      <h4>
        <xsl:value-of select="title"/>
      </h4>
      <xsl:apply-templates select="*[not(self::title)]"/>
    </xsl:template>
    <xsl:template match="note | warning | fixme">
      <div class="frame {local-name()}">
        <div class="label">
          <xsl:choose>
            <xsl:when test="local-name() = 'note'">Note</xsl:when>
            <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
            <xsl:otherwise>Fixme (
                 <xsl:value-of select="@author"/>
  
                 )</xsl:otherwise>
          </xsl:choose>
        </div>
        <div class="content">
          <xsl:apply-templates/>
        </div>
      </div>
    </xsl:template>
    <xsl:template match="link">
      <a href="{@href}">
        <xsl:apply-templates/>
      </a>
    </xsl:template>
    <xsl:template match="jump">
      <a href="{@href}" target="_top">
        <xsl:apply-templates/>
      </a>
    </xsl:template>
    <xsl:template match="fork">
      <a href="{@href}" target="_blank">
        <xsl:apply-templates/>
      </a>
    </xsl:template>
    <xsl:template match="source">
      <pre class="code">
        <xsl:apply-templates/>
      </pre>
    </xsl:template>
    <xsl:template match="anchor">
      <a name="{@id}"/>
    </xsl:template>
    <xsl:template match="icon">
      <img src="{@src}" alt="{@alt}">
        <xsl:if test="@height">
          <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
        </xsl:if>
        <xsl:if test="@width">
          <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
        </xsl:if>
      </img>
    </xsl:template>
    <xsl:template match="figure">
      <div align="center">
        <img src="{@src}" alt="{@alt}" class="figure">
          <xsl:if test="@height">
            <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
          </xsl:if>
          <xsl:if test="@width">
            <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
          </xsl:if>
        </img>
      </div>
    </xsl:template>
    <xsl:template match="table">
      <table class="table" cellpadding="4" cellspacing="1">
        <xsl:apply-templates/>
      </table>
    </xsl:template>
    <xsl:template match="node()|@*" priority="-1">
      <xsl:copy>
        <xsl:apply-templates select="@*"/>
        <xsl:apply-templates/>
      </xsl:copy>
    </xsl:template>
  </xsl:stylesheet>
  
  
  
  1.17      +8 -27     cocoon-2.1/src/blocks/portal/samples/profiles/layout/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/layout/portal.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- portal.xml	17 Dec 2003 15:03:27 -0000	1.16
  +++ portal.xml	18 Dec 2003 13:16:14 -0000	1.17
  @@ -2,13 +2,12 @@
   <composite-layout name="tab" id="maintab">
       <named-item name="Main">
           <coplet-layout name="coplet">
  -            <coplet-instance-data>Portal-Intro-1</coplet-instance-data>
  +            <coplet-instance-data>Portal-Demo-1</coplet-instance-data>
           </coplet-layout>
       </named-item>
       <named-item name="News">
           <composite-layout name="column">
               <item>
  -                <parameter name="width" value="350" />
                   <composite-layout name="row">
                       <item>
   		                <coplet-layout name="coplet">
  @@ -33,7 +32,7 @@
                           <composite-layout name="column">
                               <item>
                                   <frame-layout name="frame" id="a">
  -                                    <source>cocoon://samples/portal/news/NYTSport.rss</source>
  +                                    <source>cocoon:/coplets/news/nyt_sport.rss</source>
                                   </frame-layout>
                               </item>
                               <item>
  @@ -42,9 +41,9 @@
                                   </coplet-layout>
                               </item>
                           </composite-layout>
  -		            </item>
  +		            </item> 
                   </composite-layout>
  -            </item>
  +            </item> 
               <item>
                   <composite-layout name="row">
                       <item>
  @@ -58,7 +57,7 @@
   		                </coplet-layout>
                       </item>
                   </composite-layout>
  -            </item>
  +            </item> 
           </composite-layout>
       </named-item>
       <named-item name="Weblogs">
  @@ -90,24 +89,6 @@
               </item>
           </composite-layout>
       </named-item>
  -    <named-item name="Cocoon">
  -        <composite-layout name="row">
  -            <item>
  -                <composite-layout name="column">
  -                    <item>
  -		                <coplet-layout name="coplet">
  -		                    <coplet-instance-data>Introduction-1</coplet-instance-data>
  -		                </coplet-layout>
  -                    </item>
  -                    <item>
  -		                <coplet-layout name="coplet">
  -		                    <coplet-instance-data>Overview-1</coplet-instance-data>
  -		                </coplet-layout>
  -                    </item>
  -	            </composite-layout>
  -            </item>
  -        </composite-layout>
  -    </named-item>
       <named-item name="TabDemo1">
           <composite-layout name="tab">
   		    <named-item name="One">
  @@ -122,7 +103,7 @@
   		    </named-item>
   		    <named-item name="Three">
   	            <coplet-layout name="coplet">
  -	                <coplet-instance-data>Overview-1</coplet-instance-data>
  +	                <coplet-instance-data>Weblog-1</coplet-instance-data>
   	            </coplet-layout>
   		    </named-item>
           </composite-layout>
  @@ -141,12 +122,12 @@
   		    </named-item>
   		    <named-item name="Three">
                   <coplet-layout name="coplet">
  -                    <coplet-instance-data>Overview-1</coplet-instance-data>
  +                    <coplet-instance-data>Weblog-1</coplet-instance-data>
                   </coplet-layout>
   		    </named-item>
   		</composite-layout>
       </named-item>
  -    <named-item name="Coplets">
  +    <named-item name="Gallery">
           <composite-layout name="column">
               <item>
   			    <coplet-layout name="coplet">
  
  
  
  1.2       +1 -1      cocoon-2.1/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml
  
  Index: portal-user-anonymous.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portal-user-anonymous.xml	17 Dec 2003 15:03:27 -0000	1.1
  +++ portal-user-anonymous.xml	18 Dec 2003 13:16:14 -0000	1.2
  @@ -8,7 +8,7 @@
   		        </coplet-layout>
               </item>
               <item>
  -		        <coplet-layout name="coplet">
  +		        <coplet-layout name="coplet" layout-renderer-name="nowindow">
   		            <coplet-instance-data>Login-1</coplet-instance-data>
   		        </coplet-layout>
     	        </item>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/history/path.xsp
  
  Index: path.xsp
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <xsp:page language="java" xmlns:xsp="http://apache.org/xsp">
  <xsp:structure>
  <xsp:include>org.apache.cocoon.portal.acting.helpers.*</xsp:include>
  <xsp:include>java.lang.String</xsp:include>
  </xsp:structure>
  <links>
  	
  		<xsp:logic>
  
  			List listHistory = (List) request.getSession().getAttribute( "portal-history");
  			String strData = "untitled";
  			for (int i = 1; i &lt; listHistory.size()-1; i++)
  			{
  				List listItem = (List) listHistory.get( i);
  				for( int j=0; j &lt; listItem.size(); j++)
  				{
  					Mapping mapping = (Mapping) listItem.get( j);
  					if( mapping instanceof org.apache.cocoon.portal.acting.helpers.CopletEventDescription)
  					{
  						CopletEventDescription desc = (CopletEventDescription) listItem.get( j);
  						if( desc.copletId.equals( "MyCoplet"))
  						{
  							strData = (String) desc.data;
  						}
  					}
  					else if( mapping instanceof org.apache.cocoon.portal.acting.helpers.LayoutEventDescription)
  					{
  						LayoutEventDescription desc = (LayoutEventDescription) listItem.get( j);
  						if( desc.layoutId.equals( "maintab") &amp;&amp; desc.path.equals("parameters/title"))
  						{
  							strData = (String) desc.data;
  						}
  					}
  				}
  				<xsp:content>				
  				<link>
  					<number><xsp:expr>i</xsp:expr></number>
  					<title><xsp:expr>strData</xsp:expr></title>
  				</link>
  				</xsp:content>
  			}
  		</xsp:logic>
  	
  </links>
  </xsp:page>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/history/path.xsl
  
  Index: path.xsl
  ===================================================================
  <?xml version="1.0"?>
  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  
  <xsl:template match="/links">
  	<xsl:for-each select="link">
  		<xsl:text> &gt; </xsl:text>
  		<a>
  			<xsl:attribute name="href">
  				<xsl:value-of select="concat('bookmark?history=', number)"/>
  			</xsl:attribute>
  			<xsl:value-of select="title"/>
  		</a>
  	</xsl:for-each>
  </xsl:template>
  
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/history/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  <?xml version="1.0"?>
  
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  
  <map:pipelines>
      
    <map:pipeline>	
  
       <!-- this is a history coplet -->
      <map:match pattern="path">
          <map:generate type="serverpages" src="path.xsp"/>
          <map:transform type="xslt" src="path.xsl"/>             
      	<map:serialize type="html"/>
      </map:match>
  
    </map:pipeline>
  
  </map:pipelines>
  </map:sitemap>
  
  
  
  1.20      +0 -4      cocoon-2.1/src/blocks/portal/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/sitemap.xmap,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- sitemap.xmap	17 Dec 2003 15:03:27 -0000	1.19
  +++ sitemap.xmap	18 Dec 2003 13:16:15 -0000	1.20
  @@ -124,10 +124,6 @@
            <map:redirect-to uri="portal"/>
       </map:match>
   
  -    <map:match pattern="news/**">
  -        <map:mount check-reload="yes" src="news/" uri-prefix="news"/>
  -    </map:match>
  -
      <map:match pattern="coplets/**">
         <map:mount check-reload="yes" src="coplets/" uri-prefix="coplets"/>
       </map:match>
  
  
  
  1.13      +52 -41    cocoon-2.1/src/blocks/portal/samples/profiles/copletdata/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/copletdata/portal.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- portal.xml	17 Dec 2003 15:03:27 -0000	1.12
  +++ portal.xml	18 Dec 2003 13:16:15 -0000	1.13
  @@ -1,11 +1,15 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <coplets>
  +    <!--
  +      + Different news coplets
  +      + Read content from a file - for offline presentation
  +   -->
      <coplet-data id="Newsweek" name="standard">
         <title>Newsweek</title>
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/newsweek.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/newsweek.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -14,7 +18,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/NYTBusiness.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/nyt_business.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -23,7 +27,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/BBCNews.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/bbc_news.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -32,7 +36,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/CNET_news.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnet_news.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -41,7 +45,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/CNET_business.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnet_business.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -50,7 +54,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/CSTNews.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cst_news.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -59,7 +63,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/CNNEurope.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnn_europe.rss</value>
         </attribute>
      </coplet-data>
   
  @@ -68,24 +72,7 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/ML_weblog.rss</value>
  -      </attribute>
  -   </coplet-data>
  -
  -   <coplet-data id="CZ Weblog" name="standard">
  -      <title>CZ's Weblog</title>
  -      <coplet-base-data>URICoplet</coplet-base-data>
  -      <attribute>
  -      	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/liverss?feed=http://radio.weblogs.com/0107211/rss.xml</value>
  -      </attribute>
  -      <attribute>
  -      	<name>buffer</name>
  -      	<value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  -      </attribute>
  -      <attribute>
  -      	<name>error-uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/CZ_weblog.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/ml_weblog.weblog-rss</value>
         </attribute>
      </coplet-data>
   
  @@ -94,25 +81,29 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/Weblog.rss</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/nn_weblog.weblog-rss</value>
         </attribute>
      </coplet-data>
   
  -   <coplet-data id="Introduction" name="standard">
  -      <title>Cocoon Introduction</title>
  +    <!--
  +      + Different news coplets
  +      + Try to read content from the internet. 
  +      + If the net is not available, use static file (for offline presentation)
  +   -->
  +   <coplet-data id="CZ Weblog" name="standard">
  +      <title>CZ's Weblog</title>
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/introduction.html</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/live.weblog-rss?feed=http://radio.weblogs.com/0107211/rss.xml</value>
         </attribute>
  -   </coplet-data>
  -
  -   <coplet-data id="Overview" name="standard">
  -      <title>Cocoon Overview</title>
  -      <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
  -      	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/overview.html</value>
  +      	<name>buffer</name>
  +      	<value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  +      </attribute>
  +      <attribute>
  +      	<name>error-uri</name>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cz_weblog.weblog-rss</value>
         </attribute>
      </coplet-data>
   
  @@ -124,40 +115,60 @@
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/portal-intro.html</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-intro.html</value>
         </attribute>
  +      <aspect>
  +        <name>mandatory</name>
  +        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  +      </aspect>
      </coplet-data>
      <coplet-data id="Portal-Demo" name="standard">
         <title>Introduction</title>
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/portal-demo.html</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-demo.html</value>
         </attribute>
  +      <aspect>
  +        <name>mandatory</name>
  +        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  +      </aspect>
      </coplet-data>
      <coplet-data id="Portal-Right" name="standard">
         <title>Right</title>
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/portal-right.html</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-right.html</value>
         </attribute>
  +      <aspect>
  +        <name>mandatory</name>
  +        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  +      </aspect>
      </coplet-data>
      <coplet-data id="Portal-Left" name="standard">
         <title>Left</title>
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/portal-left.html</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-left.html</value>
         </attribute>
  +      <aspect>
  +        <name>mandatory</name>
  +        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  +      </aspect>
      </coplet-data>
      <coplet-data id="Portal-Bottom" name="standard">
         <title>Bottom</title>
         <coplet-base-data>URICoplet</coplet-base-data>
         <attribute>
         	<name>uri</name>
  -      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/news/portal-bottom.html</value>
  +      	<value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-bottom.html</value>
         </attribute>
  +      <aspect>
  +        <name>mandatory</name>
  +        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
  +      </aspect>
      </coplet-data>
   
      <!--
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/styles/rss2html.xsl
  
  Index: rss2html.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  
  <!-- $Id: rss2html.xsl,v 1.1 2003/12/18 13:16:16 cziegeler Exp $ 
  
  -->
  <xsl:param name="fullscreen"/>
  
  <xsl:template match="rss">
    <xsl:apply-templates select="channel"/>
  </xsl:template>
  
  <xsl:template match="channel">
    <xsl:if test="title">
      <b><a href="{link}"><xsl:value-of select="title"/></a></b>
      <br/>
    </xsl:if>
    <xsl:if test="description">
      <font size="-3">&#160;(<xsl:value-of select="description"/>)</font>
    </xsl:if>
    <table>
      <xsl:apply-templates select="item"/>
    </table>
  </xsl:template>
  
  <xsl:template match="item">
    <!-- Display the first 5 entries -->
    <xsl:if test="$fullscreen='true' or position() &lt; 6">
      <tr>
        <td>
          <a target="_blank" href="{link}">
            <font size="-1"> 
              <b><xsl:value-of select="title"/></b>
            </font>
          </a>
          <xsl:apply-templates select="description"/>
        </td>
      </tr>
      <tr><td height="5">&#160;</td></tr>
    </xsl:if>
  </xsl:template>
  
  <xsl:template match="description">
    <font size="-2">
      <br/>
      &#160;&#160;<xsl:apply-templates/>
    </font>
  </xsl:template>
  
  <xsl:template match="node()|@*" priority="-1">
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates/>
    </xsl:copy>
  </xsl:template>
  
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/samples/coplets/news/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  <?xml version="1.0"?>
  
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  <map:pipelines>
      
      <map:pipeline>	
  
          <map:match pattern="live.rss">
              <map:generate type="file" src="{request-param:feed}" label="content" />
              <map:transform type="xslt" src="styles/rss2html.xsl">
                  <map:parameter name="fullscreen" value="{coplet:aspectDatas/fullScreen}"/> 
              </map:transform>
              <map:serialize type="xml"/>
          </map:match>
  
          <map:match pattern="live.weblog-rss">
              <map:generate type="file" src="{request-param:feed}" label="content" />
  <!--
              <map:transform type="rss"/>
  -->        
              <map:transform type="xslt" src="styles/rss2html.xsl">
                  <map:parameter name="fullscreen" value="{coplet:aspectDatas/fullScreen}"/> 
              </map:transform>
              <map:serialize type="xml"/>
          </map:match>
  
          <map:match pattern="*.rss">
              <map:generate type="file" src="offline/{1}.xml" label="content" />
              <map:transform type="xslt" src="styles/rss2html.xsl">
                   <map:parameter name="fullscreen" value="{coplet:aspectDatas/fullScreen}"/> 
              </map:transform>
              <map:serialize type="xml"/>
          </map:match>
  
          <map:match pattern="*.weblog-rss">
              <map:generate type="file" src="offline/{1}.xml" label="content" />
              <map:transform type="xslt" src="styles/rss2html.xsl">
                   <map:parameter name="fullscreen" value="{coplet:aspectDatas/fullScreen}"/> 
              </map:transform>
              <map:serialize type="xml"/>
          </map:match>
  
      </map:pipeline>
  
  </map:pipelines>
  </map:sitemap>
  
  
  
  1.7       +0 -8      cocoon-2.1/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- portal.xml	17 Dec 2003 15:03:27 -0000	1.6
  +++ portal.xml	18 Dec 2003 13:16:16 -0000	1.7
  @@ -40,14 +40,6 @@
         <coplet-data>Weblog</coplet-data>
      </coplet-instance-data>
   
  -   <coplet-instance-data id="Introduction-1" name="standard">
  -      <coplet-data>Introduction</coplet-data>
  -   </coplet-instance-data>
  -
  -   <coplet-instance-data id="Overview-1" name="standard">
  -      <coplet-data>Overview</coplet-data>
  -   </coplet-instance-data>
  -
      <coplet-instance-data id="Portal-Intro-1" name="standard">
         <coplet-data>Portal-Intro</coplet-data>
      </coplet-instance-data>
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/MemoryAspectDataStore.java
  
  Index: MemoryAspectDataStore.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <st...@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.portal.aspect.impl;
  
  import java.util.HashMap;
  import java.util.Map;
  
  import org.apache.avalon.framework.component.Component;
  import org.apache.avalon.framework.logger.AbstractLogEnabled;
  import org.apache.avalon.framework.thread.ThreadSafe;
  import org.apache.cocoon.portal.aspect.AspectDataStore;
  import org.apache.cocoon.portal.aspect.Aspectalizable;
  
  /**
   * An aspect data store that holds the aspects in memory.
   * 
   * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
   * 
   * @version CVS $Id: MemoryAspectDataStore.java,v 1.1 2003/12/18 13:16:16 cziegeler Exp $
   */
  public class MemoryAspectDataStore 
      extends AbstractLogEnabled
      implements Component, ThreadSafe, AspectDataStore {
      
      protected final Map objectMap = new HashMap();
      
      /**
       * Get the aspect map for an object
       */
      protected Map getMap(Aspectalizable owner) {
          Map result = (Map)this.objectMap.get(owner);
          if ( result == null ) {
              result = new HashMap();
              this.objectMap.put(owner, result);
          }
          return result;
      }
      
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.aspect.AspectDataStore#getAspectData(org.apache.cocoon.portal.aspect.Aspectalizable, java.lang.String)
       */
      public Object getAspectData(Aspectalizable owner, String aspectName) {
          return this.getMap(owner).get( aspectName );
      }
      
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.aspect.AspectDataStore#setAspectData(org.apache.cocoon.portal.aspect.Aspectalizable, java.lang.String, java.lang.Object)
       */
      public void setAspectData(Aspectalizable owner, String aspectName, Object data) {
          this.getMap(owner).put(aspectName, data);
      }
  
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.aspect.AspectDataStore#isPersistent()
       */
      public boolean isPersistent() {
          return false;
      }
      
  }