Author: reinhard Date: Sun Jan 23 23:05:48 2005 New Revision: 126261 URL: http://svn.apache.org/viewcvs?view=rev&rev=126261 Log: reflect the results of our latest dicsussions; (global repository will follow soon) Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/comments_en.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/content_en.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/meta.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/content_en.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/meta.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/resources/stylesheets/correct-img-links.xsl Removed: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/1.meta.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/1.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.comments.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.meta.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/2.meta.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/2.xml Modified: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap
Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/1.meta.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/1.meta.xml?view=auto&rev=126260 ============================================================================== Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/1.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/1.xml?view=auto&rev=126260 ============================================================================== Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.comments.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.comments.xml?view=auto&rev=126260 ============================================================================== Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.meta.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.meta.xml?view=auto&rev=126260 ============================================================================== Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/17.xml?view=auto&rev=126260 ============================================================================== Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/2.meta.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/2.meta.xml?view=auto&rev=126260 ============================================================================== Deleted: /cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/2.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/2.xml?view=auto&rev=126260 ============================================================================== Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/comments_en.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/comments_en.xml?view=auto&rev=126261 ============================================================================== --- (empty file) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/comments_en.xml Sun Jan 23 23:05:48 2005 @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<comments> + <comment name="Reinhard Poetz" by="http://www.poetz.cc"; subject="the first comment"> + my first comment + </comment> +</comments> Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/content_en.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/content_en.xml?view=auto&rev=126261 ============================================================================== --- (empty file) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/content_en.xml Sun Jan 23 23:05:48 2005 @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<html> + <head> + <title>Cocoon concepts</title> + </head> + <body> + <h1>Sepration of Concerns (SoC)</h1> + <p>Unter SoC versteht man ...</p> + </body> +</html> Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/meta.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/meta.xml?view=auto&rev=126261 ============================================================================== --- (empty file) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/concepts/meta.xml Sun Jan 23 23:05:48 2005 @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<meta> + <authors> + <author contact="http://www.poetz.cc";>Reinhard Poetz</author> + </authors> +</meta> Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/content_en.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/content_en.xml?view=auto&rev=126261 ============================================================================== --- (empty file) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/content_en.xml Sun Jan 23 23:05:48 2005 @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<html> + <head> + <title>Getting started with Cocoon</title> + </head> + <body> + <h1>Download Cocoon</h1> + <p>...</p> + </body> +</html> Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/meta.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/meta.xml?view=auto&rev=126261 ============================================================================== --- (empty file) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/getting-started/meta.xml Sun Jan 23 23:05:48 2005 @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<meta> + <authors> + <author contact="http://www.poetz.cc";>Reinhard Poetz</author> + </authors> +</meta> Modified: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml?view=diff&rev=126261&p1=cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml&r1=126260&p2=cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml&r2=126261 ============================================================================== --- cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml (original) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml Sun Jan 23 23:05:48 2005 @@ -18,76 +18,76 @@ <site label="Apache Cocoon" href="" xmlns="http://apache.org/forrest/linkmap/1.0"; tab="docs"> <docs label="Documentation" href="" tab="docs"> - <doc1 label="Overview" href="1.html"/> - <doc100 label="Core Technologies"> - <doc17 label="Concepts" href="17.html"/> - <doc200 label="Sitemap"> - <doc18 label="sitemap.xmap"/> - <doc15 label="Aggregation"/> - <doc29 label="..."/> - <doc15 label="Components"> - <doc6 label="Generators"/> - <doc7 label="Transformers"/> - <doc34 label="..."/> - </doc15> - </doc200> - <doc3 label="Control Flow"> - <doc4 label="Flowscript"> - <doc32 label="..."/> - </doc4> - <doc5 label="Javaflow"> - <doc33 label="..."/> - </doc5> - </doc3> - <doc8 label="Cocoon Forms"> - <doc25 label="Widgets"/> - <doc26 label="Binding"/> - <doc27 label="Flowscript API"/> - <doc31 label="..."/> - </doc8> - </doc100> + <doc label="Overview" href="index.html"/> + <doc label="Core Technologies"> + <doc label="Concepts" href="concepts.html"/> + <doc label="Sitemap"> + <doc label="sitemap.xmap"/> + <doc label="Aggregation"/> + <doc label="..."/> + <doc label="Components"> + <doc label="Generators"/> + <doc label="Transformers"/> + <doc label="..."/> + </doc> + </doc> + <doc label="Control Flow"> + <doc label="Flowscript"> + <doc label="..."/> + </doc> + <doc label="Javaflow"> + <doc label="..."/> + </doc> + </doc> + <doc label="Cocoon Forms"> + <doc label="Widgets"/> + <doc label="Binding"/> + <doc label="Flowscript API"/> + <doc label="..."/> + </doc> + </doc> - <doc19 label="Configuration"> - <doc20 label="Overview"/> - <doc21 label="sitemap.xmap"/> - <doc22 label="cocoon.xconf"/> - <doc23 label="web.xml"/> - <doc24 label="Logging"/> - <doc40 label="Choosing implementations"> - <doc41 label="XSLT Processor"/> - <doc42 label="Store"/> - </doc40> - <doc43 label="Caching"/> - <doc44 label="Performance"/> - <doc60 label="..."/> - </doc19> + <doc label="Configuration"> + <doc label="Overview"/> + <doc label="sitemap.xmap"/> + <doc label="cocoon.xconf"/> + <doc label="web.xml"/> + <doc label="Logging"/> + <doc label="Choosing implementations"> + <doc label="XSLT Processor"/> + <doc label="Store"/> + </doc> + <doc label="Caching"/> + <doc label="Performance"/> + <doc label="..."/> + </doc> - <doc9 label="More technologies"> - <doc10 label="Protocols"/> - <doc11 label="Input Modules"/> - <doc12 label="Internationalization"/> - <doc13 label="Encoding & Entity resolution"/> - <doc30 label="..."/> - </doc9> + <doc label="More technologies"> + <doc label="Protocols"/> + <doc label="Input Modules"/> + <doc label="Internationalization"/> + <doc label="Encoding & Entity resolution"/> + <doc label="..."/> + </doc> - <doc25 label="Your own project"> - <doc50 label="Building Cocoon"/> - <doc26 label="Ant integration"/> - <doc27 label="Maven inegration"/> - <doc28 label="Eclipse integration"/> - <doc70 label="Deployment"> - <doc71 label="Tomcat"/> - <doc72 label="Jetty"/> - </doc70> - <doc29 label="..."/> - </doc25> + <doc label="Your own project"> + <doc label="Building Cocoon"/> + <doc label="Ant integration"/> + <doc label="Maven inegration"/> + <doc label="Eclipse integration"/> + <doc label="Deployment"> + <doc label="Tomcat"/> + <doc label="Jetty"/> + </doc> + <doc label="..."/> + </doc> - <doc35 label="Extending Cocoon"> - <doc26 label="Understanding the Cocoon Container"/> - <doc27 label="Custom sitemap components"/> - <doc28 label="Custom general components"/> - <doc29 label="..."/> - </doc35> + <doc label="Extending Cocoon"> + <doc label="Understanding the Cocoon Container"/> + <doc label="Custom sitemap components"/> + <doc label="Custom general components"/> + <doc label="..."/> + </doc> <doc label="External resources"> <doc label="Articles"/> @@ -98,7 +98,7 @@ </docs> <get label="Getting started" tab="getting-started"> - <doc2 href="2.html" label="Overview"/> + <doc label="Overview" href="getting-started.html"/> <doc label="Run Cocoon in 2 Minutes"/> <doc label="What can Cocoon do for you?"/> <doc label="Overview Cocoon concepts"/> Modified: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml?view=diff&rev=126261&p1=cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml&r1=126260&p2=cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml&r2=126261 ============================================================================== --- cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml (original) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/tabs.xml Sun Jan 23 23:05:48 2005 @@ -32,12 +32,12 @@ be displayed when their parent tab is selected. --> - <tab id="project" label="Project" href="http://apache.org/~reinhard/cocoon/1.html"/> - <tab id="community" label="Community" href="http://apache.org/~reinhard/cocoon/2.html"/> - <tab id="getting-started" label="Getting started" dir="" indexfile="2.html"/> - <tab id="docs" label="Documentation" dir="" indexfile="1.html"> - <tab id="docs-2.1" label="2.1 docs" href="http://apache.org/~reinhard/cocoon/2.1/index.html"/> - <tab id="docs-2.0" label="2.0 docs" href="http://apache.org/~reinhard/cocoon/2.0/index.html"/> + <tab id="project" label="Project" href="http://brutus.apache.org/~crossley/build/cocoon-doco-2-2/index.html"/> + <tab id="community" label="Community" href="http://brutus.apache.org/~crossley/build/cocoon-doco-2-2/community.html"/> + <tab id="getting-started" label="Getting started" dir="" indexfile="getting-started.html"/> + <tab id="docs" label="Documentation" dir="" indexfile="index.html"> + <tab id="docs-2.1" label="2.1 docs" href="http://brutus.apache.org/~crossley/build/cocoon-doco-2-2/2.1/index.html"/> + <tab id="docs-2.0" label="2.0 docs" href="http://brutus.apache.org/~crossley/build/cocoon-doco-2-2/2.0/index.html"/> </tab> </tabs> Added: cocoon/whiteboard/doc-repos/2.2/src/documentation/resources/stylesheets/correct-img-links.xsl Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/resources/stylesheets/correct-img-links.xsl?view=auto&rev=126261 ============================================================================== --- (empty file) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/resources/stylesheets/correct-img-links.xsl Sun Jan 23 23:05:48 2005 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> + <xsl:param name="docid"/> + + <xsl:template match="img"> + <img> + <xsl:for-each select="@*"> + <xsl:choose> + <xsl:when test="name(.) = 'src'"> + <xsl:attribute name="{name(.)}"> + <xsl:value-of select="$docid"/>/<xsl:value-of select="."/> + </xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="{name(.)}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </img> + </xsl:template> + + <xsl:template match="@*|node()" priority="-2"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> +</xsl:stylesheet> \ No newline at end of file Modified: cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap?view=diff&rev=126261&p1=cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap&r1=126260&p2=cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap&r2=126261 ============================================================================== --- cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap (original) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/sitemap.xmap Sun Jan 23 23:05:48 2005 @@ -16,35 +16,45 @@ --> <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";> <map:pipelines> - <map:pipeline> + <map:pipeline internal-only="true"> <map:match pattern="html2document/*"> - <map:generate src="{project:content.xdocs}{1}.xml"/> + <map:generate src="{project:content.xdocs}{1}/content_en.xml"/> <map:transform src="{defaults:stylesheets}/html2document.xsl"/> <map:serialize/> </map:match> <map:match pattern="comments/*"> - <map:select type="exists"> - <map:when test="{project:content.xdocs}{1}.comments.xml"> - <map:generate src="{project:content.xdocs}{1}.comments.xml"/> + <map:select type="exists"> + <map:when test="{project:content.xdocs}{1}/comments_en.xml"> + <map:generate src="{project:content.xdocs}{1}/comments_en.xml"/> </map:when> <map:otherwise> - <map:generate src="{project:content}no-comments.xml"/> - </map:otherwise> - </map:select> - <map:serialize/> + <map:generate src="{project:content}no-comments.xml"/> + </map:otherwise> + </map:select> + <map:serialize/> </map:match> + </map:pipeline> + <!-- ******************************************************************************** --> + <map:pipeline> <map:match pattern="*.xml"> - <map:select type="exists"> - <map:when test="{project:content.xdocs}{1}.meta.xml"> - <map:aggregate element="aggregate"> - <map:part src="cocoon:/html2document/{1}" element="content"/> - <map:part src="{project:content.xdocs}{1}.meta.xml"/> - <map:part src="cocoon:/comments/{1}"/> - </map:aggregate> - <map:transform src="{project:resources.stylesheets}doc-aggregate2v12.xsl"/> - <map:serialize type="xml-document"/> - </map:when> - </map:select> + <map:select type="exists"> + <map:when test="{project:content.xdocs}{1}/meta.xml"> + <map:aggregate element="aggregate"> + <map:part src="cocoon:/html2document/{1}" element="content"/> + <map:part src="{project:content.xdocs}{1}/meta.xml"/> + <map:part src="cocoon:/comments/{1}"/> + </map:aggregate> + <map:transform src="{project:resources.stylesheets}doc-aggregate2v12.xsl"/> + <map:transform src="{project:resources.stylesheets}correct-img-links.xsl"> + <map:parameter name="docid" value="{1}"/> + </map:transform> + <map:serialize type="xml-document"/> + </map:when> + </map:select> + </map:match> + <!-- ******************************************************************************** --> + <map:match pattern="*/files/*.*"> + <map:read src="{project:content.xdocs}{1}/files/{2}.{3}" mime-type="image/{3}"/> </map:match> </map:pipeline> </map:pipelines>
