[prev in list] [next in list] [prev in thread] [next in thread] 

List:       forrest-svn
Subject:    svn commit: r397661 -
From:       thorsten () apache ! org
Date:       2006-04-27 22:26:06
Message-ID: 20060427222607.55817.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: thorsten
Date: Thu Apr 27 15:25:58 2006
New Revision: 397661

URL: http://svn.apache.org/viewcvs?rev=397661&view=rev
Log:
Fixing the note I left last time about ' FIXME the {url} is always null. Could be \
that extracting the match out of the resources fixes this'. It does. ;) Meaning that \
there is a bug in the cocoon resource component we should report this (cannot do it \
myself ATM). This really finished FOR-872.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap
                
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap?rev=397661&r1=397660&r2=397661&view=diff
 ==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap \
                (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap \
Thu Apr 27 15:25:58 2006 @@ -16,33 +16,25 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:resources>
-    <map:resource name="file-resolver">
+
+  <map:pipelines>
+    <map:pipeline internal="true">
+      <map:match pattern="**.xml">
       <map:select type="exists">
-        <map:when test="{lm:project.{uri}.odt}">
+        <map:when test="{lm:project.{1}.odt}">
           <map:aggregate element="odt">
-            <map:part src="cocoon:/{uri}.meta.odt.xml" element="meta" />
-            <map:part src="cocoon:/{uri}.content.odt.xml"
+            <map:part src="cocoon:/{1}.meta.odt.xml" element="meta" />
+            <map:part src="cocoon:/{1}.content.odt.xml"
               element="content" />
           </map:aggregate>
           <map:transform src="{lm:transform.odt-forrest.xhtml}">
-            <!-- FIXME the {url} is always null. Could be that extracting the match \
                out of the resources fixes this -->
-            <!-- <map:parameter name="filename" value="test-{url}" /> -->
+            <map:parameter name="filename" value="{1}" /> 
           </map:transform>
           <map:transform src="{lm:transform.xml.xml-namespace-stripped}" />
           <map:transform src="{lm:transform.html.document}" />
           <map:serialize type="xml" />
         </map:when>
       </map:select>
-    </map:resource>
-  </map:resources>
-
-  <map:pipelines>
-    <map:pipeline internal="true">
-      <map:match pattern="**.xml">
-        <map:call resource="file-resolver">
-          <map:parameter name="uri" value="{1}" />
-        </map:call>
       </map:match>
     </map:pipeline>
     <map:pipeline internal="true">


[prev in list] [next in list] [prev in thread] [next in thread]