cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r157925 - in cocoon/whiteboard/doc-repos/global/src/documentation: content/no-generated-document.xml resources/stylesheets/doc-aggregate2v12.xsl sitemap.xmap
Date Thu, 17 Mar 2005 09:33:33 GMT
Author: reinhard
Date: Thu Mar 17 01:33:30 2005
New Revision: 157925

URL: http://svn.apache.org/viewcvs?view=rev&rev=157925
Log:
sync with trunk forrest

Added:
    cocoon/whiteboard/doc-repos/global/src/documentation/content/no-generated-document.xml
Modified:
    cocoon/whiteboard/doc-repos/global/src/documentation/resources/stylesheets/doc-aggregate2v12.xsl
    cocoon/whiteboard/doc-repos/global/src/documentation/sitemap.xmap

Added: cocoon/whiteboard/doc-repos/global/src/documentation/content/no-generated-document.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/documentation/content/no-generated-document.xml?view=auto&rev=157925
==============================================================================
--- cocoon/whiteboard/doc-repos/global/src/documentation/content/no-generated-document.xml
(added)
+++ cocoon/whiteboard/doc-repos/global/src/documentation/content/no-generated-document.xml
Thu Mar 17 01:33:30 2005
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html><body/></html>
\ No newline at end of file

Modified: cocoon/whiteboard/doc-repos/global/src/documentation/resources/stylesheets/doc-aggregate2v12.xsl
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/documentation/resources/stylesheets/doc-aggregate2v12.xsl?view=diff&r1=157924&r2=157925
==============================================================================
--- cocoon/whiteboard/doc-repos/global/src/documentation/resources/stylesheets/doc-aggregate2v12.xsl
(original)
+++ cocoon/whiteboard/doc-repos/global/src/documentation/resources/stylesheets/doc-aggregate2v12.xsl
Thu Mar 17 01:33:30 2005
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:variable name="content" select="/aggregate/content/document/body"/>
   <xsl:variable name="content-header" select="/aggregate/content/document/header"/>
   <xsl:variable name="comments" select="/aggregate/comments"/>
+  <xsl:variable name="generated-before" select="/aggregate/generated-before"/>
+  <xsl:variable name="generated-after" select="/aggregate/generated-after"/>  
   <xsl:template match="/">
     <document>
       <header>
@@ -11,7 +28,9 @@
         </title>
       </header>
       <body>
+        <xsl:copy-of select="$generated-before/html/body/*"/>
         <xsl:copy-of select="$content/*"/>
+        <xsl:copy-of select="$generated-after/html/body/*"/>
         <xsl:apply-templates select="$comments"/>
       </body>
     </document>

Modified: cocoon/whiteboard/doc-repos/global/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/documentation/sitemap.xmap?view=diff&r1=157924&r2=157925
==============================================================================
--- cocoon/whiteboard/doc-repos/global/src/documentation/sitemap.xmap (original)
+++ cocoon/whiteboard/doc-repos/global/src/documentation/sitemap.xmap Thu Mar 17 01:33:30
2005
@@ -28,7 +28,7 @@
         <map:select type="exists">
           <map:when test="{project:content.xdocs}{1}/content_en.xml">
             <map:generate src="{project:content.xdocs}{1}/content_en.xml"/>
-        <map:transform src="{defaults:stylesheets}/html2document.xsl"/>           

+            <map:transform src="{defaults:stylesheets}/html2document.xsl"/>       
    
           </map:when>
           <map:otherwise>
             <map:generate src="{project:content.xdocs}{1}/content_en.html" type="local-html"/>
@@ -37,6 +37,17 @@
         </map:select>        
         <map:serialize/>
       </map:match>
+      <map:match pattern="generated-*/*">
+        <map:select type="exists">
+          <map:when test="{project:content.xdocs}{2}/generated-{1}_en.xml">
+            <map:generate src="{project:content.xdocs}{2}/generated-{1}_en.xml"/>
+          </map:when>
+          <map:otherwise>
+            <map:generate src="{project:content}no-generated-document.xml"/>
+          </map:otherwise>
+        </map:select>          
+        <map:serialize/>
+      </map:match>
       <map:match pattern="comments/*">
         <map:select type="exists">
           <map:when test="{project:content.xdocs}{1}/comments_en.xml">
@@ -55,7 +66,9 @@
         <map:select type="exists">
           <map:when test="{project:content.xdocs}{1}/meta.xml">
             <map:aggregate element="aggregate">
+              <map:part src="cocoon:/generated-before/{1}" element="generated-before"/>
             
               <map:part src="cocoon:/html2document/{1}" element="content"/>
+              <map:part src="cocoon:/generated-after/{1}" element="generated-after"/>
                
               <map:part src="{project:content.xdocs}{1}/meta.xml"/>
               <map:part src="cocoon:/comments/{1}"/>
             </map:aggregate>



Mime
View raw message