Return-Path: 
 <cvs-return-25211-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 92530 invoked from network); 7 Nov 2005 16:44:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Nov 2005 16:44:58 -0000
Received: (qmail 9821 invoked by uid 500); 7 Nov 2005 16:44:57 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 9755 invoked by uid 500); 7 Nov 2005 16:44:57 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 9738 invoked by uid 99); 7 Nov 2005 16:44:57 -0000
X-ASF-Spam-Status: No, hits=-7.9 required=10.0
	tests=ALL_TRUSTED,FUZZY_CREDIT,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 07 Nov 2005 08:44:55 -0800
Received: (qmail 92240 invoked by uid 65534); 7 Nov 2005 16:44:35 -0000
Message-ID: <20051107164435.92239.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r331544 - in /cocoon/blocks: axis/trunk/samples/
 core-samples-additional/trunk/samples/modules/
 core-samples-main/trunk/samples/i18n/
 core-samples-main/trunk/samples/i18n/translations/
 javaflow/trunk/samples/forms/ proxy/trunk/samples/
Date: Mon, 07 Nov 2005 16:44:27 -0000
To: cvs@cocoon.apache.org
From: sylvain@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: sylvain
Date: Mon Nov  7 08:44:03 2005
New Revision: 331544

URL: http://svn.apache.org/viewcvs?rev=331544&view=rev
Log:
Porting small fixes from 2.1.8

Modified:
    cocoon/blocks/axis/trunk/samples/status.xsp
    cocoon/blocks/core-samples-additional/trunk/samples/modules/menu.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/menu.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xsp
    cocoon/blocks/core-samples-main/trunk/samples/i18n/tiered.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_de.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_el.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_en.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_in.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ja.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ko.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ru.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_CN.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_TW.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_de.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_el.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_en.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_es.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr_CH.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_hy.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_in.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ja.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ko.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pl.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pt.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ru.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_tr.xml
    cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_zh_TW.xml
    cocoon/blocks/javaflow/trunk/samples/forms/form2-binding.xml
    cocoon/blocks/proxy/trunk/samples/samples.xml

Modified: cocoon/blocks/axis/trunk/samples/status.xsp
URL: http://svn.apache.org/viewcvs/cocoon/blocks/axis/trunk/samples/status.xsp?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/axis/trunk/samples/status.xsp (original)
+++ cocoon/blocks/axis/trunk/samples/status.xsp Mon Nov  7 08:44:03 2005
@@ -16,7 +16,7 @@
 -->
 
 <!--
-  -- $Id$
+   $Id$
   -->
 <xsp:page language="java"
           xmlns:xsp="http://apache.org/xsp"

Modified: cocoon/blocks/core-samples-additional/trunk/samples/modules/menu.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/modules/menu.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/modules/menu.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/modules/menu.xml Mon Nov  7 08:44:03 2005
@@ -54,9 +54,4 @@
     <external label="API Docs" href="../../api/java/org/apache/cocoon/components/modules/input/package-summary.html"/>
   </menu>
 
-  <menu label="Credits">
-    <menu-item label="Christian Haul" href="mailto:haul@apache.org"/>
-    <menu-item label="Konstantin Piroumian" href="mailto:kpiroumian@apache.org"/>
-    <menu-item label="Many others..." href="/docs/who.html"/>
-  </menu>
 </book>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/menu.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/menu.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/menu.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/menu.xml Mon Nov  7 08:44:03 2005
@@ -61,9 +61,4 @@
     <external label="LocaleAction Javadoc" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/acting/LocaleAction.html" i18n:attr="label"/>   
   </menu>
   
-  <menu label="Credits" i18n:attr="label">
-    <menu-item label="Konstantin Piroumian" href="mailto:kpiroumian@apache.org" i18n:attr="label" />  
-    <menu-item label="Many others..." href="http://cocoon.apache.org/2.1/who.html" i18n:attr="label"/>      
-  </menu>  
-   
 </book>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xml Mon Nov  7 08:44:03 2005
@@ -85,8 +85,6 @@
   </content>
 
   <bottom>
-    <copyright>
-      <i18n:text>copyright</i18n:text>
-    </copyright>
+    <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
   </bottom>
 </document>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xsp
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xsp?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xsp (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/simple.xsp Mon Nov  7 08:44:03 2005
@@ -121,9 +121,7 @@
     </content>
 
     <bottom>
-      <copyright>
-        <i18n:text>copyright</i18n:text>
-      </copyright>
+      <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
     </bottom>
   </document>
 </xsp:page>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/tiered.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/tiered.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/tiered.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/tiered.xml Mon Nov  7 08:44:03 2005
@@ -81,8 +81,6 @@
   </content>
 
   <bottom>
-    <copyright>
-      <i18n:text>copyright</i18n:text>
-    </copyright>
+     <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
   </bottom>
 </document>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu.xml Mon Nov  7 08:44:03 2005
@@ -39,7 +39,4 @@
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
 
-    <message key="Credits">Credits</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Many others...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_de.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_de.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_de.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_de.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs"><![CDATA[<I18ntransformer> docs]]></message>
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
-    <message key="Credits">Kredite</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Viele Andere...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_el.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_el.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_el.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_el.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
 	<message key="i18n transformer docs">i18n transformer docs</message>
 	<message key="i18n transformer Javadoc">i18n transformer Javadoc</message>
 	<message key="LocaleAction Javadoc">LocaleAction Javadoc</message>
-	<message key="Credits">Πιστώσεις</message>
-	<message key="Konstantin Piroumian">Κωνσταντίνος Πιρουμιάν</message>
-	<message key="Many others...">Και πολλοί άλλοι...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_en.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_en.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_en.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_en.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs"><![CDATA[<I18ntransformer> docs]]></message>
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
-    <message key="Credits">Credits</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Many others...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_in.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_in.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_in.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_in.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs"><![CDATA[<I18ntransformer> docs]]></message>
     <message key="i18n transformer Javadoc"><![CDATA[<I18ntransformer> Javadoc]]></message>
     <message key="LocaleAction Javadoc"><![CDATA[<LocaleAction> Javadoc]]></message>
-    <message key="Credits">Kontribusi</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">Banyak lagi...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ja.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ja.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ja.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ja.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">i18nトランスフォーマ文書</message>
     <message key="i18n transformer Javadoc">i18nトランスフォーマJavaDoc</message>
     <message key="LocaleAction Javadoc">LocaleAction JavaDoc</message>
-    <message key="Credits">謝辞</message>
-    <message key="Konstantin Piroumian">コンスタンティン・ピルミャン</message>
-    <message key="Many others...">その他大勢の方々...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ko.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ko.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ko.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ko.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">국제화 변환기 문서</message>
     <message key="i18n transformer Javadoc">국제화 변환기 자바독</message>
     <message key="LocaleAction Javadoc">LocaleAction 자바독</message>
-    <message key="Credits">제공자</message>
-    <message key="Konstantin Piroumian">콘스탄틴 피오루미안</message>
-    <message key="Many others...">그밖은 많은 분들...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ru.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ru.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ru.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_ru.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">Документация по трансформеру i18n</message>
     <message key="i18n transformer Javadoc">Javadoc по трансформеру i18n</message>
     <message key="LocaleAction Javadoc">Javadoc по LocaleAction</message>
-    <message key="Credits">Разработчики</message>
-    <message key="Konstantin Piroumian">Константин Пирумян</message>
-    <message key="Many others...">Многие другие...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_CN.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_CN.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_CN.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_CN.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">国际化 变换机 文书</message>
     <message key="i18n transformer Javadoc">国际化 变换机 Javadoc</message>
     <message key="LocaleAction Javadoc">LocaleAction Javadoc</message>
-    <message key="Credits">提供者</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">别的多位...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_TW.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_TW.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_TW.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/menu_zh_TW.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,4 @@
     <message key="i18n transformer docs">國際化 變換機 文書</message>
     <message key="i18n transformer Javadoc">國際化 變換機 Javadoc</message>
     <message key="LocaleAction Javadoc">LocaleAction Javadoc</message>
-    <message key="Credits">提供者</message>
-    <message key="Konstantin Piroumian">Konstantin Piroumian</message>
-    <message key="Many others...">別的多位...</message>
 </catalogue>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
     <message key="article">Article</message>
     <message key="article_text1">This is a i18n paragraph.</message>
     <message key="article_text2">This is another i18n paragraph and is also a cool one.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. No rights are reserved.</message>
     <message key="Hello">Hello, {0}! Glad to see you!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">None</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_de.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_de.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_de.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_de.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Artikel</message>
     <message key="article_text1">Dies ist ein Absatz nach i18n.</message>
     <message key="article_text2">Dies ist ein weiterer Absatz nach i18n und auch noch ein ziemlich cooler dazu.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Deutsche Übersetzung von Jörg Prante, Tommy Santoso.</message>
     <message key="Hello">Hallo {0}! Schön, dich zu sehen!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">nichts</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_el.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_el.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_el.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_el.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
 	<message key="article">Αρθρο</message>
 	<message key="article_text1">Μία παράγραφος  i18n.</message>
 	<message key="article_text2">Ακόμα μία παράγραφος  i18n.</message>
-	<message key="copyright">Copyright © 2001 Κωνσταντίνος Πιρουμιάν. Δεν έχουν κατοχυρωθεί δικαιώματα.</message>
 	<message key="Hello">Γειά σου , {0}! Είμαι ευτυχής που σε βλέπω!</message>
 	<message key="Kot">Tomcat (τομκατ)</message>
 	<message key="none">κανένα</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_en.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_en.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_en.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_en.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
     <message key="article">Article</message>
     <message key="article_text1">This is a i18n paragraph.</message>
     <message key="article_text2">This is another i18n paragraph and is also a cool one.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. No rights are reserved.</message>
     <message key="Hello">Hello, {0}! Glad to see you!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">None</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_es.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_es.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_es.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_es.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Artículo</message>
     <message key="article_text1">Esto es un párrafo i18n.</message>
     <message key="article_text2">Esto es otro párrafo i18n y también es 'cool'.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Sin derechos reservados.</message>
     <message key="Hello">¡¡Hola!, {0}! ¡Encantado de verte!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Ninguno</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Article</message>
     <message key="article_text1">Ceci est un paragraphe auquel une transformation i18n a été appliquée.</message>
     <message key="article_text2">Ceci est autre un paragraphe auquel une transformation i18n a été appliquée et il s'en porte d'autant mieux!</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Traduction française de Olivier Lange.</message>
     <message key="Hello">Salut {0}! Ravi de te rencontrer!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">inconnu</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr_CH.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr_CH.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr_CH.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_fr_CH.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
     <message key="article">Article</message>
     <message key="article_text1">Ceci est un paragraphe i18n.</message>
     <message key="article_text2">Ceci est un autre paragraphe i18n, et en plus, il est particulièrement drôle.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Aucun droit reservé. Traduction française (CH) de Hahn Kurt.</message>
     <message key="Hello">Bonjour, {0}! Enchanté de vous voir!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Aucun</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_hy.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_hy.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_hy.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_hy.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Հոդված</message>
     <message key="article_text1">Սա միջազգային պարագրաֆ է:</message>
     <message key="article_text2">Սա էլ է միջազգային պարագրաֆ և նույն պես ցենտր :)</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Ոչինչ պաշտպանված չէ:</message>
     <message key="Hello">Ողջու՜յն {0}, ուրախ եմ քեզ տեսնել:</message>
     <message key="Kot">Ô¿Õ¸Õ¿Õ¸</message>
     <message key="none">ոչ ոք</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_in.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_in.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_in.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_in.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Artikel</message>
     <message key="article_text1">Kalimat ini berdasarkan i18n.</message>
     <message key="article_text2">Kalimat lain berdasarkan i18n, canggih deh.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Translasi bahasa indonesia oleh Tommy Santoso.</message>
     <message key="Hello">Hallo {0}! Senang bertemu dengan anda!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">tidak ada</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ja.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ja.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ja.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ja.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
     <message key="article">アーティクル</message>
     <message key="article_text1">ここは、多言語化されたパラグラフです。</message>
     <message key="article_text2">ここは、もう一つの多言語化されたパラグラフであり、多少イカしています。</message>
-    <message key="copyright">Copyright c 2002 - 2003 Konstantin Piroumian　日本語訳　北畠徹也</message>
     <message key="Hello">はじめまして {0}さん、よろしくお願いします</message>
     <message key="Kot">トムキャット</message>
     <message key="none">なし</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ko.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ko.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ko.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ko.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
   <message key="article">논문</message>
   <message key="article_text1">이것은 국제화된 문단입니다.</message>
   <message key="article_text2">이것은 또하나의 국제화된 문단이며, 역시 멋지죠.</message>
-  <message key="copyright">Copyright © 2002 Konstantin Piroumian. 번역 이아스.</message>
   <message key="Hello">안녕하세요, {0}! 만나서 반갑습니다!</message>
   <message key="Kot">톰켓</message>
   <message key="none">없음</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pl.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pl.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pl.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pl.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Artykuł</message>
     <message key="article_text1">To jest paragraf w i18n.</message>
     <message key="article_text2">To jest następny paragraf w i18n i jest takze fajny.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian i Krzysztof Zieliński. Żadne prawa nie są zastrzeżone:)</message>
     <message key="Hello">Witam, {0}! Miło Cię widzieć!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Nic</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pt.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pt.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pt.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_pt.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Artigo</message>
     <message key="article_text1">Isto é um i18n parágrafo.</message>
     <message key="article_text2">Isto é outro i18n parágrafo, tambem é bem legal.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Direitos não reservados.</message>
     <message key="Hello">Oi, {0}! Prazer em ver você!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">Nenhum</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ru.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ru.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ru.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_ru.xml Mon Nov  7 08:44:03 2005
@@ -34,7 +34,6 @@
     <message key="article">Статья</message>
     <message key="article_text1">Это интернационализированный абзац.</message>
     <message key="article_text2">Это тоже интернационализированный абзац и такой же классный.</message>
-    <message key="copyright">Авторские права © 2001 Константин Пирумян. Ничто не защищено.</message>
     <message key="Hello">Привет, {0}! Рад тебя видеть!</message>
     <message key="Kot">Кот</message>
     <message key="none">Незнакомец</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_tr.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_tr.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_tr.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_tr.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
     <message key="article">Makale</message>
     <message key="article_text1">Bu bir i18n paragrafıdır.</message>
     <message key="article_text2">Bu da bir i18n paragrafı ve aynı zamanda çok hoş.</message>
-    <message key="copyright">Copyright © 2001 Konstantin Piroumian. Hiçbir hakkı saklı değildir. Thanks to Vadim Gritsenko.</message>
     <message key="Hello, {0}! Glad to see you!">Merhaba, {0}! Seni gördüğüme memnum oldum!</message>
     <message key="Kot">Tekir</message>
     <message key="none">bilinmeyen</message>

Modified: cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_zh_TW.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_zh_TW.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_zh_TW.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/i18n/translations/messages_zh_TW.xml Mon Nov  7 08:44:03 2005
@@ -33,7 +33,6 @@
     <message key="article">論文</message>
     <message key="article_text1">這個是國際化的段落.</message>
     <message key="article_text2">這個還是國際化的段落, 并且出色.</message>
-    <message key="copyright">Copyright © 2002 Konstantin Piroumian. 翻譯 李蒼信.</message>
     <message key="Hello">您好, {0}! 見到你很高興!</message>
     <message key="Kot">Tomcat</message>
     <message key="none">零</message>

Modified: cocoon/blocks/javaflow/trunk/samples/forms/form2-binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/javaflow/trunk/samples/forms/form2-binding.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/javaflow/trunk/samples/forms/form2-binding.xml (original)
+++ cocoon/blocks/javaflow/trunk/samples/forms/form2-binding.xml Mon Nov  7 08:44:03 2005
@@ -50,14 +50,16 @@
   <!-- (it is of course possible to implement other binding strategies) -->
   <fb:repeater id="contacts"
     parent-path="."
-    row-path="contacts"
-    unique-row-id="id"
-    unique-path="@id">
+    row-path="contacts">
 
 	<!-- compare to xml-binding: the convertor is not needed here -->
 
     <!-- important note: the row-path is used inside jxpath-createPath context,
     as a consequence it cannot have dependent children or predicates -->
+
+    <fb:identity>
+      <fb:value id="id" path="@id"/>
+    </fb:identity>
 
     <fb:on-bind>
       <!-- executed on updates AND right after the insert -->

Modified: cocoon/blocks/proxy/trunk/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/proxy/trunk/samples/samples.xml?rev=331544&r1=331543&r2=331544&view=diff
==============================================================================
--- cocoon/blocks/proxy/trunk/samples/samples.xml (original)
+++ cocoon/blocks/proxy/trunk/samples/samples.xml Mon Nov  7 08:44:03 2005
@@ -21,6 +21,12 @@
     <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
   </group>
 
+  <group name="No samples">
+    <note>There are currently no samples for this block. It will be revisited in
+          in a future version</note>
+  </group>
+
+  <!-- Samples disabled
   <group name="Web Site Syndication">
     <sample name="Examples" href="wsproxy/">
       Demonstrates how to embed one website's functionality into another.
@@ -33,5 +39,6 @@
       Only styling is used in addition to the proxy.
     </sample>
   </group> 
+  -->
 
 </samples>