Return-Path: 
 <dev-return-20329-apmail-forrest-dev-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-dev-archive@www.apache.org
Received: (qmail 47488 invoked from network); 13 Oct 2005 13:59:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 13 Oct 2005 13:59:33 -0000
Received: (qmail 38379 invoked by uid 500); 13 Oct 2005 13:59:32 -0000
Delivered-To: apmail-forrest-dev-archive@forrest.apache.org
Received: (qmail 38310 invoked by uid 500); 13 Oct 2005 13:59:31 -0000
Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@forrest.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@forrest.apache.org>
List-Post: <mailto:dev@forrest.apache.org>
Reply-To: dev@forrest.apache.org
List-Id: <dev.forrest.apache.org>
Delivered-To: mailing list dev@forrest.apache.org
Received: (qmail 38298 invoked by uid 99); 13 Oct 2005 13:59:31 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2005 06:59:31 -0700
Received-SPF: neutral (asf.osuosl.org: local policy)
Received: from [81.169.145.161] (HELO natfrord.rzone.de) (81.169.145.161)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2005 06:59:33 -0700
Received: from [172.26.0.5] (242.Red-213-97-135.staticIP.rima-tde.net
 [213.97.135.242])
	(authenticated bits=0)
	by post.webmailer.de (8.13.1/8.13.1) with ESMTP id j9DDx7en015128
	for <dev@forrest.apache.org>; Thu, 13 Oct 2005 15:59:08 +0200 (MEST)
Subject: Re: [Pelt with Structurer]
From: Thorsten Scherler <thorsten@apache.org>
To: dev@forrest.apache.org
In-Reply-To: <1129211653.8749.70.camel@localhost>
References: <434E6038.6000506@pcotech.fr>
	 <1129211653.8749.70.camel@localhost>
Content-Type: multipart/mixed; boundary="=-yYyJ47Uavy3ly85OoLlJ"
Date: Thu, 13 Oct 2005 15:59:05 +0200
Message-Id: <1129211946.8749.73.camel@localhost>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.1.1 
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N


--=-yYyJ47Uavy3ly85OoLlJ
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Whoops, there were some unrelated stuff in it!

> Attached the patch, can you try to apply it?

please use the new one

-- 
thorsten

"Together we stand, divided we fall!" 
Hey you (Pink Floyd)

--=-yYyJ47Uavy3ly85OoLlJ
Content-Disposition: attachment; filename=pelt.conflict.diff
Content-Type: text/x-patch; name=pelt.conflict.diff; charset=utf-8
Content-Transfer-Encoding: 8bit

Index: whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/views/pelt.fv
===================================================================
--- whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/views/pelt.fv	(revisión: 320769)
+++ whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/views/pelt.fv	(copia de trabajo)
@@ -16,7 +16,9 @@
   limitations under the License.
 -->
 
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0" >
+<forrest:views 
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:view type="xhtml">
     <forrest:css url="default.css" media="screen" rel="alternate stylesheet" title="leather-dev"/>
     <forrest:css url="leather-dev.css" media="screen" rel="alternate stylesheet" title="leather-dev"/>
@@ -27,7 +29,7 @@
     <forrest:contract name="siteinfo-meta">
       <forrest:properties contract="siteinfo-meta">
         <forrest:property name="siteinfo-meta" nugget="get.build.info">
-          <url>build-info</url>
+          <jx:import uri="cocoon://build-info"/>
         </forrest:property>
       </forrest:properties>
     </forrest:contract>
@@ -102,7 +104,7 @@
           <forrest:contract name="nav-main">
             <forrest:properties contract="nav-main">
               <forrest:property name="nav-main" nugget="get.navigation">
-                <url>${cocoon.parameters.getRequest}.navigation.xml</url>
+                <jx:import uri="cocoon://${cocoon.parameters.getRequest}.navigation.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>
@@ -110,7 +112,7 @@
             <forrest:contract name="nav-main-sub">
               <forrest:properties contract="nav-main-sub">
                 <forrest:property name="nav-main-sub" nugget="get.navigation">
-                  <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
+                  <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
                 </forrest:property>
               </forrest:properties>
             </forrest:contract>
@@ -134,7 +136,7 @@
           <forrest:contract name="nav-section">
             <forrest:properties contract="nav-section">
               <forrest:property name="nav-section" nugget="get.navigation">
-                <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>
@@ -201,7 +203,7 @@
           </forrest:contract>
           <forrest:contract name="nav-section-round-bottom"/>
         </forrest:hook>
-        <forrest:call-template name="export-link"/>
+        <jx:import uri="cocoon://prepare.tiles.export-link"/>
         <forrest:hook name="content">
           <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
           <!--<forrest:hook class="trail">
@@ -210,21 +212,21 @@
           <forrest:contract name="content-title">
             <forrest:properties contract="content-title">
               <forrest:property name="content-title" nugget="get.body">
-                <url>#{$cocoon/parameters/getRequest}.body.xml</url>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>
           <forrest:contract name="content-abstract">
             <forrest:properties contract="content-abstract">
               <forrest:property name="content-abstract" nugget="get.abstract">
-                <url>#{$cocoon/parameters/getRequest}.abstract.xml</url>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.abstract.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>
           <forrest:contract name="content-minitoc">
             <forrest:properties contract="content-minitoc">
               <forrest:property name="content-minitoc-toc" nugget="get.toc">
-                <url>#{$cocoon/parameters/getRequest}.toc.xml</url>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
               </forrest:property>
               <forrest:property name="content-minitoc-conf" >
                 <toc max-depth="2" 
@@ -235,7 +237,7 @@
           <forrest:contract name="content-main">
             <forrest:properties contract="content-main">
               <forrest:property name="content-main" nugget="get.body">
-                <url>#{$cocoon/parameters/getRequest}.body.xml</url>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
               </forrest:property>
               <forrest:property name="content-main-conf">
                 <headings type="underlined"/>
@@ -245,7 +247,7 @@
           <forrest:contract name="content-authors">
             <forrest:properties contract="content-authors">
               <forrest:property name="content-authors" nugget="get.authors">
-                <url>#{$cocoon/parameters/getRequest}.authors.xml</url>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>

--=-yYyJ47Uavy3ly85OoLlJ--