cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.1/src/webapp/samples/xinclude sitemap.xmap
Date Tue, 29 Jul 2003 03:15:48 GMT
vgritsenko    2003/07/28 20:15:48

  Modified:    src/blocks/authentication-fw/conf authentication-gen.xmap
               src/blocks/authentication-fw/samples sitemap.xmap
               src/blocks/batik/conf svg.generation.xmap
               src/blocks/batik/samples sitemap.xmap
               src/blocks/bsf/conf bsf.xmap
               src/blocks/databases/samples sitemap.xmap
               src/blocks/fop/samples sitemap.xmap
               src/blocks/html/conf tidy.xmap
               src/blocks/html/samples sitemap.xmap
               src/blocks/jsp/conf jsp.generator.xmap
               src/blocks/linotype/samples sitemap.source.xmap sitemap.xmap
               src/blocks/mail/samples sitemap.xmap
               src/blocks/petstore/samples sitemap.xmap
               src/blocks/php/conf php.xmap
               src/blocks/poi/samples sitemap.xmap
               src/blocks/portal-fw/conf portal-gen.xmap
               src/blocks/profiler/conf profiler.xmap
               src/blocks/profiler/samples sitemap.xmap
               src/blocks/proxy/conf proxy.xmap wsproxy.xmap
               src/blocks/slide/conf slide-generator.xmap
               src/blocks/slide/samples sitemap.xmap
               src/blocks/velocity/conf velocity.xmap
               src/blocks/web3/samples sitemap.xmap
               src/blocks/woody/samples sitemap.xmap
               src/blocks/xmldb/conf xmldb.deprecated.xmap
               src/webapp sitemap.xmap
               src/webapp/samples sitemap.xmap
               src/webapp/samples/hello-world sitemap.xmap
               src/webapp/samples/i18n sitemap.xmap
               src/webapp/samples/simpleform sitemap.xmap
               src/webapp/samples/sites sitemap.xmap
               src/webapp/samples/sources sitemap.xmap
               src/webapp/samples/stream sitemap.xmap
               src/webapp/samples/xinclude sitemap.xmap
  Log:
  Add views definitions to the samples sitemaps.
  Removed label "data", it was almost identical to label "content".
  "data" was used by "content" view, "content" was used by "pretty-content"
  (or was it the other way?). Now both views use same label which makes more sense.
  
  Revision  Changes    Path
  1.3       +1 -1      cocoon-2.1/src/blocks/authentication-fw/conf/authentication-gen.xmap
  
  Index: authentication-gen.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/conf/authentication-gen.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- authentication-gen.xmap	3 May 2003 16:12:23 -0000	1.2
  +++ authentication-gen.xmap	29 Jul 2003 03:15:45 -0000	1.3
  @@ -5,5 +5,5 @@
   
       <map:generator name="auth-conf"
                      src="org.apache.cocoon.webapps.authentication.generation.ConfigurationGenerator"
  -                   label="content,data"/>
  +                   label="content"/>
   </xmap>
  
  
  
  1.5       +61 -72    cocoon-2.1/src/blocks/authentication-fw/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/samples/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	26 May 2003 07:54:09 -0000	1.4
  +++ sitemap.xmap	29 Jul 2003 03:15:45 -0000	1.5
  @@ -1,35 +1,27 @@
   <?xml version="1.0"?>
   
  -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -<!-- =========================== Components ================================ -->
  -
  - <map:components>
  -
  -  <map:generators default="file"/>
  -  <map:transformers default="xslt"/>
  -  <map:readers default="resource"/>
  -  <map:serializers default="html"/>
  -  <map:matchers default="wildcard"/>
  -  <map:selectors default="browser"/>
  - </map:components>
  +<!--+
  +    | Authentiction block samples sitemap.
  +    |
  +    | CVS $Id$
  +    +-->
   
  +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
   <!-- =========================== Pipelines ================================= -->
  +  <map:pipelines>
  +    <map:component-configurations>
  +      <authentication-manager>
  +        <handlers>
  +          <handler name="demohandler">
  +            <redirect-to uri="cocoon:/login"/>
  +            <authentication uri="cocoon:raw:/authenticate"/>
  +          </handler>
  +        </handlers>
  +      </authentication-manager>
  +    </map:component-configurations>
   
  - <map:pipelines>
  -  <map:component-configurations>
  -  <authentication-manager>
  -    <handlers>
  -      <handler name="demohandler">
  -		<redirect-to uri="cocoon:/login"/>
  -		<authentication uri="cocoon:raw:/authenticate"/>
  -      </handler>
  -     </handlers>
  -   </authentication-manager>
  -  </map:component-configurations>
  -
  -  <map:pipeline>
  -
  +    <map:pipeline>
         <map:match pattern="">
           <map:redirect-to uri="login"/>
         </map:match>
  @@ -39,13 +31,13 @@
         <!-- ================= -->
         <map:match pattern="login">
           <!-- if we are already logged in, redirect to the protected document -->
  -		<map:act type="auth-loggedIn">
  -			<map:parameter name="handler" value="demohandler"/> 
  -			<map:redirect-to uri="protected"/>
  -		</map:act> 
  -            <map:generate src="docs/login.xml"/>
  -       	<map:transform src="stylesheets/simple-page2html.xsl"/>
  -		<map:transform type="encodeURL"/>
  +        <map:act type="auth-loggedIn">
  +          <map:parameter name="handler" value="demohandler"/> 
  +          <map:redirect-to uri="protected"/>
  +        </map:act> 
  +        <map:generate src="docs/login.xml"/>
  +        <map:transform src="stylesheets/simple-page2html.xsl"/>
  +        <map:transform type="encodeURL"/>
           <map:serialize/>
         </map:match>
   
  @@ -53,59 +45,56 @@
         <!-- Form target which performs auth service   -->
         <!-- ========================================= -->
         <map:match pattern="do-login">
  -            <!-- try to login -->
  -  	     	<map:act type="auth-login">
  -	      	<map:parameter name="handler" value="demohandler"/>
  -			<map:parameter name="parameter_name" value="{request-param:username}"/>
  -  			<map:redirect-to uri="protected"/>
  -	      </map:act>
  -            <!-- something was wrong, try it again -->
  -            <map:redirect-to uri="login"/>
  +        <!-- try to login -->
  +        <map:act type="auth-login">
  +          <map:parameter name="handler" value="demohandler"/>
  +          <map:parameter name="parameter_name" value="{request-param:username}"/>
  +          <map:redirect-to uri="protected"/>
  +        </map:act>
  +        <!-- something was wrong, try it again -->
  +        <map:redirect-to uri="login"/>
         </map:match>
   
         <!-- ================ -->
         <!-- Protected area   -->
         <!-- ================ -->
         <map:match pattern="protected">
  -		<map:act type="auth-protect">
  -			<map:parameter name="handler" value="demohandler"/> 
  +        <map:act type="auth-protect">
  +          <map:parameter name="handler" value="demohandler"/> 
   
  -                <map:generate src="docs/protected.xml"/>
  -                <map:transform type="session"/>
  -         	    <map:transform src="stylesheets/simple-page2html.xsl"/>
  -	    	    <map:transform type="encodeURL"/>
  -                <map:serialize/>
  -            </map:act>
  -            <!-- something was wrong, redirect to login page -->
  -            <map:redirect-to uri="login"/>
  +          <map:generate src="docs/protected.xml"/>
  +          <map:transform type="session"/>
  +          <map:transform src="stylesheets/simple-page2html.xsl"/>
  +          <map:transform type="encodeURL"/>
  +          <map:serialize/>
  +        </map:act>
  +        <!-- something was wrong, redirect to login page -->
  +        <map:redirect-to uri="login"/>
         </map:match>
   
         <!-- ========================================= -->
         <!-- Logout link which invalidates the session -->
         <!-- ========================================= -->
         <map:match pattern="do-logout">
  -		<map:act type="auth-protect">
  -			<map:parameter name="handler" value="demohandler"/> 
  +        <map:act type="auth-protect">
  +          <map:parameter name="handler" value="demohandler"/> 
   
  -   		       <map:act type="auth-logout"/>
  -            </map:act>
  -            <map:redirect-to uri="login"/>
  -      </map:match>
  -
  -  </map:pipeline>
  -
  -  <map:pipeline internal-only="true">
  -    <!-- This is the authentication respource -->
  -	<map:match pattern="authenticate">
  -  	    <map:generate src="docs/userlist.xml"/>
  -	    <map:transform src="stylesheets/authenticate.xsl">
  -   	        <map:parameter name="use-request-parameters" value="true"/>
  -          </map:transform>
  -	    <map:serialize type="xml"/>
  -	</map:match>
  -  </map:pipeline>
  +          <map:act type="auth-logout"/>
  +        </map:act>
  +        <map:redirect-to uri="login"/>
  +      </map:match>
  +    </map:pipeline>
   
  - </map:pipelines>
  +    <map:pipeline internal-only="true">
  +      <!-- This is the authentication respource -->
  +      <map:match pattern="authenticate">
  +        <map:generate src="docs/userlist.xml"/>
  +        <map:transform src="stylesheets/authenticate.xsl">
  +          <map:parameter name="use-request-parameters" value="true"/>
  +        </map:transform>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +    </map:pipeline>
   
  +  </map:pipelines>
   </map:sitemap>
  -
  
  
  
  1.2       +2 -1      cocoon-2.1/src/blocks/batik/conf/svg.generation.xmap
  
  Index: svg.generation.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/conf/svg.generation.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- svg.generation.xmap	9 Mar 2003 00:02:35 -0000	1.1
  +++ svg.generation.xmap	29 Jul 2003 03:15:45 -0000	1.2
  @@ -1,5 +1,6 @@
   <?xml version="1.0"?>
  +
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='extractor']">
   
  -   <map:generator label="data" logger="sitemap.generator.extractor" name="extractor" src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
  +   <map:generator label="content" logger="sitemap.generator.extractor" name="extractor" src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
   </xmap>
  
  
  
  1.5       +2 -2      cocoon-2.1/src/blocks/batik/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/samples/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	10 Jun 2003 23:58:42 -0000	1.4
  +++ sitemap.xmap	29 Jul 2003 03:15:45 -0000	1.5
  @@ -30,7 +30,7 @@
         <map:serialize type="xml"/>
       </map:view>
   
  -    <map:view name="pretty-content" from-label="data">
  +    <map:view from-label="content" name="pretty-content">
         <map:transform src="context://stylesheets/system/xml2html.xslt"/>
         <map:serialize type="html"/>
       </map:view>
  
  
  
  1.2       +4 -1      cocoon-2.1/src/blocks/bsf/conf/bsf.xmap
  
  Index: bsf.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/bsf/conf/bsf.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- bsf.xmap	9 Mar 2003 00:02:43 -0000	1.1
  +++ bsf.xmap	29 Jul 2003 03:15:45 -0000	1.2
  @@ -2,5 +2,8 @@
   
   <xmap xpath="/sitemap/components/generators"
         unless="generator[@name='script']">
  -    <map:generator name="script" src="org.apache.cocoon.generation.ScriptGenerator" label="content,data"/>
  +
  +    <map:generator name="script"
  +                   src="org.apache.cocoon.generation.ScriptGenerator"
  +                   label="content"/>
   </xmap>
  
  
  
  1.4       +2 -1      cocoon-2.1/src/blocks/databases/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	25 Mar 2003 16:13:44 -0000	1.3
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.4
  @@ -1,4 +1,5 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
   <!-- ========================= Components ================================ -->
  @@ -29,7 +30,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xsl"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.8       +54 -55    cocoon-2.1/src/blocks/fop/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/fop/samples/sitemap.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sitemap.xmap	22 Jun 2003 06:47:40 -0000	1.7
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.8
  @@ -14,7 +14,7 @@
         <map:serialize type="xml"/>
       </map:view>
   
  -    <map:view name="pretty-content" from-label="data">
  +    <map:view from-label="content" name="pretty-content">
         <map:transform src="context://stylesheets/system/xml2html.xslt"/>
         <map:serialize type="html"/>
       </map:view>
  @@ -26,58 +26,57 @@
   
   <!-- =========================== Pipelines ================================= -->
   
  -    <map:pipelines>
  -        <map:pipeline type="caching">
  +  <map:pipelines>
  +    <map:pipeline type="caching">
  +      <map:match pattern="">
  +        <map:redirect-to uri="welcome"/>
  +      </map:match>
  +
  +      <!-- list of samples -->
  +      <map:match pattern="welcome">
  +        <map:generate src="misc/samples.xml"/>
  +        <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
  +          <map:parameter name="contextPath" value="{request:contextPath}"/>
  +        </map:transform>
  +        <map:serialize/>
  +      </map:match>
  +
  +      <!-- hello world -->
  +      <map:match pattern="hello.pdf">
  +        <map:generate src="context://samples/hello-world/content/hello.xml"/>
  +        <map:transform src="context://samples/hello-world/style/xsl/page2fo.xsl"/>
  +        <map:serialize type="fo2pdf"/>
  +      </map:match>
  +
  +      <!-- xsl-fo document access -->
  +      <map:match pattern="**/*.fo.xml">
  +        <map:generate src="{1}/{2}.fo.xml"/>
  +        <!-- This stylesheet makes image URLs absolute, so that FOP can
  +        display images. {realpath:/} returns the absolute path of the
  +        context root. -->
  +        <map:transform src="misc/fix-imagelinks.xsl" label="content">
  +          <map:parameter name="ctxroot" value="{realpath:/}"/>
  +          <map:parameter name="dir" value="samples/fop/{1}/"/>
  +        </map:transform>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +
  +      <!-- PDF conversion -->
  +      <map:match pattern="**/*.pdf">
  +        <map:generate src="cocoon:/{1}/{2}.fo.xml"/>
  +        <map:serialize type="fo2pdf"/>
  +      </map:match>
  +
  +      <!-- reuse the XSP caching example for our caching test -->
  +      <map:match pattern="cache-test-*.pdf">
  +        <!-- note that caching didn't work when accessing the XSP using the cocoon:/ protocol -->
  +        <map:generate src="../xsp/xsp/cacheable.xsp" type="serverpages"/>
  +        <map:transform src="cache-test/xsp-sample-to-fo.xsl">
  +           <map:parameter name="pages" value="{1}"/>
  +        </map:transform>
  +        <map:serialize type="fo2pdf"/>
  +      </map:match>
   
  -            <map:match pattern="">
  -                <map:redirect-to uri="welcome"/>
  -            </map:match>
  -
  -            <!-- list of samples -->
  -            <map:match pattern="welcome">
  -                <map:generate src="misc/samples.xml"/>
  -                <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
  -                    <map:parameter name="contextPath" value="{request:contextPath}"/>
  -                </map:transform>
  -                <map:serialize/>
  -            </map:match>
  -
  -            <!-- hello world -->
  -            <map:match pattern="hello.pdf">
  -                <map:generate src="context://samples/hello-world/content/hello.xml"/>
  -                <map:transform src="context://samples/hello-world/style/xsl/page2fo.xsl"/>
  -                <map:serialize type="fo2pdf"/>
  -            </map:match>
  -
  -            <!-- xsl-fo document access -->
  -            <map:match pattern="**/*.fo.xml">
  -                <map:generate src="{1}/{2}.fo.xml"/>
  -                <!-- This stylesheet makes image URLs absolute, so that FOP can
  -                display images. {realpath:/} returns the absolute path of the
  -                context root. -->
  -                <map:transform src="misc/fix-imagelinks.xsl">
  -                  <map:parameter name="ctxroot" value="{realpath:/}"/>
  -                  <map:parameter name="dir" value="samples/fop/{1}/"/>
  -                </map:transform>
  -                <map:serialize type="xml"/>
  -            </map:match>
  -
  -            <!-- PDF conversion -->
  -            <map:match pattern="**/*.pdf">
  -                <map:generate src="cocoon:/{1}/{2}.fo.xml"/>
  -                <map:serialize type="fo2pdf"/>
  -            </map:match>
  -
  -            <!-- reuse the XSP caching example for our caching test -->
  -            <map:match pattern="cache-test-*.pdf">
  -                <!-- note that caching didn't work when accessing the XSP using the cocoon:/ protocol -->
  -                <map:generate src="../xsp/xsp/cacheable.xsp" type="serverpages"/>
  -                <map:transform src="cache-test/xsp-sample-to-fo.xsl">
  -                    <map:parameter name="pages" value="{1}"/>
  -                </map:transform>
  -                <map:serialize type="fo2pdf"/>
  -            </map:match>
  -
  -        </map:pipeline>
  -    </map:pipelines>
  +    </map:pipeline>
  +  </map:pipelines>
   </map:sitemap>
  
  
  
  1.2       +2 -1      cocoon-2.1/src/blocks/html/conf/tidy.xmap
  
  Index: tidy.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/html/conf/tidy.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tidy.xmap	9 Mar 2003 00:04:01 -0000	1.1
  +++ tidy.xmap	29 Jul 2003 03:15:46 -0000	1.2
  @@ -2,7 +2,8 @@
   
   <xmap xpath="/sitemap/components/generators"
         unless="generator[@name='html']">
  +
       <map:generator name="html"
                      src="org.apache.cocoon.generation.HTMLGenerator"
  -                   label="content,data"/>
  +                   label="content"/>
   </xmap>
  
  
  
  1.3       +2 -2      cocoon-2.1/src/blocks/html/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/html/samples/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	11 Jun 2003 00:25:19 -0000	1.2
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.3
  @@ -14,7 +14,7 @@
         <map:serialize type="xml"/>
       </map:view>
   
  -    <map:view name="pretty-content" from-label="data">
  +    <map:view from-label="content" name="pretty-content">
         <map:transform src="context://stylesheets/system/xml2html.xslt"/>
         <map:serialize type="html"/>
       </map:view>
  
  
  
  1.2       +2 -1      cocoon-2.1/src/blocks/jsp/conf/jsp.generator.xmap
  
  Index: jsp.generator.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/conf/jsp.generator.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jsp.generator.xmap	9 Mar 2003 00:04:10 -0000	1.1
  +++ jsp.generator.xmap	29 Jul 2003 03:15:46 -0000	1.2
  @@ -1,7 +1,8 @@
   <?xml version="1.0"?>
   
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='jsp']">
  +
       <map:generator name="jsp"
                      src="org.apache.cocoon.generation.JspGenerator"
  -                   label="content,data"/>
  +                   label="content"/>
   </xmap>
  
  
  
  1.2       +5 -5      cocoon-2.1/src/blocks/linotype/samples/sitemap.source.xmap
  
  Index: sitemap.source.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/sitemap.source.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.source.xmap	27 Jul 2003 13:13:10 -0000	1.1
  +++ sitemap.source.xmap	29 Jul 2003 03:15:46 -0000	1.2
  @@ -9,27 +9,27 @@
     <map:generators default="file">
       <map:generator name="file" 
          src="org.apache.cocoon.generation.FileGenerator"
  -       label="content,data" logger="sitemap.generator.file"  
  +       label="content" logger="sitemap.generator.file"  
          pool-min="1" pool-grow="1" pool-max="8"  
       />
       <map:generator name="directory" 
          src="org.apache.cocoon.generation.DirectoryGenerator"
  -       label="content,data" logger="sitemap.generator.file"  
  +       label="content" logger="sitemap.generator.file"  
          pool-min="1" pool-grow="1" pool-max="8"  
       />    
       <map:generator name="traversable" 
          src="org.apache.cocoon.generation.TraversableGenerator"
  -       label="content,data" logger="sitemap.generator.file"  
  +       label="content" logger="sitemap.generator.file"  
          pool-min="1" pool-grow="1" pool-max="8"  
       />    
       <map:generator name="request" 
          src="org.apache.cocoon.generation.RequestGenerator"
  -       label="data" logger="sitemap.generator.request" 
  +       label="content" logger="sitemap.generator.request" 
          pool-min="1" pool-grow="1" pool-max="4"  
       />
       <map:generator name="jx"
          src="org.apache.cocoon.generation.JXTemplateGenerator"
  -       label="content,data" logger="sitemap.generator.jx" 
  +       label="content" logger="sitemap.generator.jx" 
          pool-min="1" pool-grow="1" pool-max="8"  
       />
       <map:generator name="notifying" src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
  
  
  
  1.3       +4 -4      cocoon-2.1/src/blocks/linotype/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	6 Jul 2003 20:37:47 -0000	1.2
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.3
  @@ -9,22 +9,22 @@
     <map:generators default="file">
       <map:generator name="file" 
          src="org.apache.cocoon.generation.FileGenerator"
  -       label="content,data" logger="sitemap.generator.file"  
  +       label="content" logger="sitemap.generator.file"  
          pool-min="1" pool-grow="1" pool-max="8"  
       />
       <map:generator name="directory" 
          src="org.apache.cocoon.generation.DirectoryGenerator"
  -       label="content,data" logger="sitemap.generator.file"  
  +       label="content" logger="sitemap.generator.file"  
          pool-min="1" pool-grow="1" pool-max="8"  
       />    
       <map:generator name="request" 
          src="org.apache.cocoon.generation.RequestGenerator"
  -       label="data" logger="sitemap.generator.request" 
  +       label="content" logger="sitemap.generator.request" 
          pool-min="1" pool-grow="1" pool-max="4"  
       />
       <map:generator name="jx"
          src="org.apache.cocoon.generation.JXTemplateGenerator"
  -       label="content,data" logger="sitemap.generator.jx" 
  +       label="content" logger="sitemap.generator.jx" 
          pool-min="1" pool-grow="1" pool-max="8"  
       />
       <map:generator name="notifying" src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
  
  
  
  1.2       +1 -1      cocoon-2.1/src/blocks/mail/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/samples/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	17 Apr 2003 20:38:40 -0000	1.1
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.2
  @@ -20,7 +20,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xsl"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.4       +2 -2      cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	21 Jul 2003 03:48:13 -0000	1.3
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.4
  @@ -8,8 +8,8 @@
         <map:transformer name="jx" src="org.apache.cocoon.transformation.JXTemplateTransformer" logger="jx.sitemap.transformer"/>
       </map:transformers>
       <map:generators default="file">
  -        <map:generator label="content,data" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
  -        <map:generator label="content,data" logger="sitemap.generator.jx" name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
  +        <map:generator label="content" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
  +        <map:generator label="content" logger="sitemap.generator.jx" name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
         <map:generator name="jxforms" src="org.apache.cocoon.generation.JXFormsGenerator" logger="sitemap.generator.jxforms"/>
       </map:generators>
       <map:flow-interpreters default="javascript"/>
  
  
  
  1.2       +4 -1      cocoon-2.1/src/blocks/php/conf/php.xmap
  
  Index: php.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/php/conf/php.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- php.xmap	9 Mar 2003 00:04:51 -0000	1.1
  +++ php.xmap	29 Jul 2003 03:15:46 -0000	1.2
  @@ -2,5 +2,8 @@
   
   <xmap xpath="/sitemap/components/generators"
         unless="generator[@name='php']">
  -    <map:generator name="php" src="org.apache.cocoon.generation.PhpGenerator" label="content,data"/>
  +
  +    <map:generator name="php"
  +                   src="org.apache.cocoon.generation.PhpGenerator"
  +                   label="content"/>
   </xmap>
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/poi/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/samples/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	8 Jul 2003 02:19:22 -0000	1.4
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.5
  @@ -3,7 +3,7 @@
   
    <map:components>
     <map:generators default="file">
  -    <map:generator label="content,data" logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2" pool-max="32" pool-min="4" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2" pool-max="32" pool-min="4" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
     </map:generators>
     <map:transformers default="xslt"/>
     <map:readers default="resource"/>
  
  
  
  1.3       +2 -2      cocoon-2.1/src/blocks/portal-fw/conf/portal-gen.xmap
  
  Index: portal-gen.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/conf/portal-gen.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portal-gen.xmap	6 May 2003 14:12:54 -0000	1.2
  +++ portal-gen.xmap	29 Jul 2003 03:15:46 -0000	1.3
  @@ -5,8 +5,8 @@
   
       <map:generator name="portal"
                      src="org.apache.cocoon.webapps.portal.generation.PortalGenerator"
  -                   label="content,data"/>
  +                   label="content"/>
       <map:generator name="portal-conf"
                      src="org.apache.cocoon.webapps.portal.generation.ConfigurationGenerator"
  -                   label="content,data"/>
  +                   label="content"/>
   </xmap>
  
  
  
  1.2       +6 -1      cocoon-2.1/src/blocks/profiler/conf/profiler.xmap
  
  Index: profiler.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/conf/profiler.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- profiler.xmap	9 Mar 2003 00:05:49 -0000	1.1
  +++ profiler.xmap	29 Jul 2003 03:15:46 -0000	1.2
  @@ -1,4 +1,9 @@
   <?xml version="1.0"?>
  +
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='profiler']">
  -    <map:generator label="content,data" logger="sitemap.generator.profiler" name="profiler" src="org.apache.cocoon.generation.ProfilerGenerator"/>
  +
  +    <map:generator label="content"
  +                   logger="sitemap.generator.profiler"
  +                   name="profiler"
  +                   src="org.apache.cocoon.generation.ProfilerGenerator"/>
   </xmap>
  
  
  
  1.8       +1 -1      cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sitemap.xmap	8 May 2003 16:23:29 -0000	1.7
  +++ sitemap.xmap	29 Jul 2003 03:15:46 -0000	1.8
  @@ -20,7 +20,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.2       +6 -5      cocoon-2.1/src/blocks/proxy/conf/proxy.xmap
  
  Index: proxy.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/proxy/conf/proxy.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- proxy.xmap	9 Mar 2003 00:05:56 -0000	1.1
  +++ proxy.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -1,8 +1,9 @@
   <?xml version="1.0"?>
  +
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='proxy']">
  -  <map:generator
  -    label="content,data"
  -    logger="sitemap.generator.proxy"
  -    name="proxy"
  -    src="org.apache.cocoon.generation.HttpProxyGenerator"/>
  +
  +    <map:generator name="proxy"
  +                   logger="sitemap.generator.proxy"
  +                   src="org.apache.cocoon.generation.HttpProxyGenerator"
  +                   label="content"/>
   </xmap>
  
  
  
  1.2       +6 -5      cocoon-2.1/src/blocks/proxy/conf/wsproxy.xmap
  
  Index: wsproxy.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/proxy/conf/wsproxy.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- wsproxy.xmap	5 Jul 2003 14:46:13 -0000	1.1
  +++ wsproxy.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -1,8 +1,9 @@
   <?xml version="1.0"?>
  +
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='wsproxy']">
  -  <map:generator
  -  	label="content,data"
  -  	logger="sitemap.generator.wsproxy"
  -  	name="wsproxy"
  -  	src="org.apache.cocoon.generation.WebServiceProxyGenerator"/>
  +
  +    <map:generator label="content"
  +                   logger="sitemap.generator.wsproxy"
  +                   name="wsproxy"
  +                   src="org.apache.cocoon.generation.WebServiceProxyGenerator"/>
   </xmap>
  
  
  
  1.2       +9 -2      cocoon-2.1/src/blocks/slide/conf/slide-generator.xmap
  
  Index: slide-generator.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-generator.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- slide-generator.xmap	9 Mar 2003 00:06:14 -0000	1.1
  +++ slide-generator.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -1,7 +1,14 @@
   <?xml version="1.0"?>
  +
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='sourcedescription']">
   
  -    <map:generator label="content,data" logger="sitemap.generator.sourcedescription" name="sourcedescription" src="org.apache.cocoon.generation.SourceDescriptionGenerator"/>
  +    <map:generator label="content"
  +                   logger="sitemap.generator.sourcedescription"
  +                   name="sourcedescription"
  +                   src="org.apache.cocoon.generation.SourceDescriptionGenerator"/>
   
  -    <map:generator label="content,data" logger="sitemap.generator.principallist" name="principallist" src="org.apache.cocoon.generation.PrincipalListGenerator"/>
  +    <map:generator label="content"
  +                   logger="sitemap.generator.principallist"
  +                   name="principallist"
  +                   src="org.apache.cocoon.generation.PrincipalListGenerator"/>
   </xmap>
  
  
  
  1.6       +1 -1      cocoon-2.1/src/blocks/slide/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/sitemap.xmap,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sitemap.xmap	7 May 2003 16:50:40 -0000	1.5
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.6
  @@ -48,7 +48,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
      <map:transform src="context://stylesheets/system/xml2html.xsl"/>
      <map:serialize type="html"/>
     </map:view>
  
  
  
  1.2       +6 -1      cocoon-2.1/src/blocks/velocity/conf/velocity.xmap
  
  Index: velocity.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/velocity/conf/velocity.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- velocity.xmap	9 Mar 2003 00:06:31 -0000	1.1
  +++ velocity.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -1,4 +1,9 @@
   <?xml version="1.0"?>
  +
   <xmap xpath="/sitemap/components/generators" unless="generator[@name='velocity']">
  -    <map:generator label="content,data" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
  +
  +    <map:generator label="content"
  +                   logger="sitemap.generator.velocity"
  +                   name="velocity"
  +                   src="org.apache.cocoon.generation.VelocityGenerator"/>
   </xmap>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/web3/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/samples/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	10 Jul 2003 22:15:20 -0000	1.3
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.4
  @@ -23,7 +23,7 @@
         <map:serialize type="xml"/>
        </map:view>
   
  -     <map:view name="pretty-content" from-label="data">
  +     <map:view from-label="content" name="pretty-content">
          <map:transform src="context://stylesheets/system/xml2html.xsl"/>
          <map:serialize type="html"/>
        </map:view>
  
  
  
  1.14      +3 -2      cocoon-2.1/src/blocks/woody/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/sitemap.xmap,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sitemap.xmap	28 Jul 2003 16:00:24 -0000	1.13
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.14
  @@ -1,11 +1,12 @@
   <?xml version="1.0"?>
  +
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
    <map:components>
   
     <map:generators default="file">   
       <map:generator name="woody" src="org.apache.cocoon.woody.generation.WoodyGenerator" logger="woody"/>
  -    <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator" label="content,data" logger="sitemap.generator.jx"/>
  +    <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator" label="content" logger="sitemap.generator.jx"/>
     </map:generators>
   
     <map:transformers default="xalan">    
  @@ -39,7 +40,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
      <map:serialize type="html"/>
     </map:view>
  
  
  
  1.2       +2 -2      cocoon-2.1/src/blocks/xmldb/conf/xmldb.deprecated.xmap
  
  Index: xmldb.deprecated.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xmldb/conf/xmldb.deprecated.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- xmldb.deprecated.xmap	9 Mar 2003 00:06:44 -0000	1.1
  +++ xmldb.deprecated.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -7,11 +7,11 @@
       <!-- BEWARE: these are unmaintained XML:DB generators, going to be   -->
       <!-- removed soon.                                                   -->
       <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
  -    <map:generator name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator" label="content,data">
  +    <map:generator name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator" label="content">
         <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
         <base>xmldb:xindice:///db/</base>
       </map:generator>
  -    <map:generator name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator" label="content,data">
  +    <map:generator name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator" label="content">
         <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
         <base>xmldb:xindice:///db/</base>
       </map:generator>
  
  
  
  1.27      +11 -11    cocoon-2.1/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/sitemap.xmap,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- sitemap.xmap	5 Jul 2003 14:46:14 -0000	1.26
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.27
  @@ -51,15 +51,15 @@
         | All components follow this scheme.
         +-->
     <map:generators default="file">
  -    <map:generator label="content,data" logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2" pool-max="32" pool-min="4" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.directory" name="directory" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.DirectoryGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.xpathdirectory" name="xpathdirectory" src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.imagedirectory" name="imagedirectory" src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.mp3directory" name="mp3directory" src="org.apache.cocoon.generation.MP3DirectoryGenerator"/>
  -    <map:generator label="data" logger="sitemap.generator.request" name="request" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.RequestGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.stream" name="stream" pool-grow="2" pool-max="16" pool-min="1" src="org.apache.cocoon.generation.StreamGenerator"/>
  -    <map:generator label="data" logger="sitemap.generator.status" name="status" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.StatusGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2" pool-max="32" pool-min="4" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.directory" name="directory" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.DirectoryGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.xpathdirectory" name="xpathdirectory" src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.imagedirectory" name="imagedirectory" src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.mp3directory" name="mp3directory" src="org.apache.cocoon.generation.MP3DirectoryGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.request" name="request" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.RequestGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.stream" name="stream" pool-grow="2" pool-max="16" pool-min="1" src="org.apache.cocoon.generation.StreamGenerator"/>
  +    <map:generator label="content" logger="sitemap.generator.status" name="status" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.StatusGenerator"/>
       <!-- The notifying generator can only be used in a <handle-errors> section : it produces an XML
            representation of the exception that caused the error handler to be executed -->
       <map:generator name="notifying" src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
  @@ -339,7 +339,7 @@
         <map:serialize type="xml"/>
       </map:view>
   
  -    <map:view from-label="data" name="pretty-content">
  +    <map:view from-label="content" name="pretty-content">
         <map:transform src="stylesheets/system/xml2html.xsl"/>
         <map:serialize type="html"/>
       </map:view>
  
  
  
  1.14      +2 -2      cocoon-2.1/src/webapp/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/sitemap.xmap,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sitemap.xmap	8 May 2003 11:24:02 -0000	1.13
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.14
  @@ -30,7 +30,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.12      +21 -1     cocoon-2.1/src/webapp/samples/hello-world/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/sitemap.xmap,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- sitemap.xmap	16 Jun 2003 10:44:53 -0000	1.11
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.12
  @@ -3,6 +3,26 @@
   <!-- CVS $Id$ -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +
  +<!-- =========================== Views =================================== -->
  +
  + <map:views>
  +  <map:view name="content" from-label="content">
  +   <map:serialize type="xml"/>
  +  </map:view>
  +
  +  <map:view from-label="content" name="pretty-content">
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  +    <map:serialize type="html"/>
  +  </map:view>
  +
  +  <map:view name="links" from-position="last">
  +   <map:serialize type="links"/>
  +  </map:view>
  + </map:views>
  +
  +<!-- =========================== Pipelines ================================= -->
  +
    <map:pipelines>
     <map:pipeline>
   
  
  
  
  1.5       +25 -5     cocoon-2.1/src/webapp/samples/i18n/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	20 May 2003 00:52:41 -0000	1.4
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.5
  @@ -1,5 +1,9 @@
   <?xml version="1.0"?>
  +
  +<!-- CVS $Id$ -->
  +
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +
     <!-- =========================== Components ================================ -->
     <map:components>
       <map:transformers default="xslt">
  @@ -55,11 +59,27 @@
       </map:resource>
     </map:resources>
   
  +  <!-- =========================== Views =================================== -->
  +  <map:views>
  +    <map:view name="content" from-label="content">
  +      <map:serialize type="xml"/>
  +    </map:view>
  +
  +    <map:view name="pretty-content" from-label="content">
  +      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  +      <map:serialize type="html"/>
  +    </map:view>
  +
  +    <map:view name="links" from-position="last">
  +      <map:serialize type="links"/>
  +    </map:view>
  +  </map:views>
  +
     <!-- =========================== Pipelines ================================= -->
     <map:pipelines>
  -    <!-- Locale aware content generation pipeline -->
       <map:pipeline>
         <map:act type="locale">
  +        <!-- Locale aware content generation pipeline -->
   
           <!-- Default pipeline -->
           <map:match pattern="">
  @@ -105,22 +125,22 @@
             <map:serialize/>
           </map:match>
         </map:act>
  -    </map:pipeline>
   
  -    <!-- General purpose pipeline  -->
  -    <map:pipeline>
  -      <!-- Display this sitemap source-->
  +      <!-- Display this sitemap source -->
         <map:match pattern="sitemap.xmap">
           <map:generate src="sitemap.xmap"/>
           <map:transform src="context://stylesheets/system/xml2html.xslt"/>
           <map:serialize/>
         </map:match>
  +
         <map:match pattern="*.css">
           <map:read src="{1}.css" mime-type="text/css"/>
         </map:match>
  +
         <map:match pattern="images/*.gif">
           <map:read src="images/{1}.gif" mime-type="image/gif"/>
         </map:match>
  +
       </map:pipeline>
     </map:pipelines>
   </map:sitemap>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/webapp/samples/simpleform/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/simpleform/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	13 May 2003 15:38:51 -0000	1.3
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.4
  @@ -95,7 +95,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xsl"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.2       +23 -4     cocoon-2.1/src/webapp/samples/sites/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/sites/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	26 Mar 2003 21:21:44 -0000	1.1
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -1,8 +1,29 @@
   <?xml version="1.0"?>
  +
  +<!-- CVS $Id$ -->
  +
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
  -  <map:pipelines>
  +<!-- =========================== Views =================================== -->
  +
  +  <map:views>
  +    <map:view name="content" from-label="content">
  +      <map:serialize type="xml"/>
  +    </map:view>
  +
  +    <map:view from-label="content" name="pretty-content">
  +      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  +      <map:serialize type="html"/>
  +    </map:view>
  +
  +    <map:view name="links" from-position="last">
  +      <map:serialize type="links"/>
  +    </map:view>
  +  </map:views>
   
  +<!-- =========================== Pipelines ================================= -->
  +
  +  <map:pipelines>
        <map:pipeline>
   
          <map:match pattern="">
  @@ -12,7 +33,7 @@
            </map:transform>
            <map:serialize/>
          </map:match>
  -             
  +
          <map:match pattern="*.apache.org/">
             <map:generate src="{1}.apache.org/content.xml"/>
             <map:transform src="{1}.apache.org/stylesheet.xsl"/>
  @@ -28,7 +49,5 @@
           </map:match>
   
        </map:pipeline>                
  -  
     </map:pipelines>
  -
   </map:sitemap>
  
  
  
  1.2       +1 -1      cocoon-2.1/src/webapp/samples/sources/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/sources/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	7 May 2003 04:57:15 -0000	1.1
  +++ sitemap.xmap	29 Jul 2003 03:15:47 -0000	1.2
  @@ -6,7 +6,7 @@
     <map:view name="content" from-label="content">
      <map:serialize type="xml"/>
     </map:view>
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.4       +2 -2      cocoon-2.1/src/webapp/samples/stream/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/stream/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	7 May 2003 04:57:15 -0000	1.3
  +++ sitemap.xmap	29 Jul 2003 03:15:48 -0000	1.4
  @@ -12,7 +12,7 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="pretty-content" from-label="data">
  +  <map:view from-label="content" name="pretty-content">
       <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
  
  
  
  1.3       +2 -2      cocoon-2.1/src/webapp/samples/xinclude/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xinclude/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	7 Jun 2003 21:20:14 -0000	1.2
  +++ sitemap.xmap	29 Jul 2003 03:15:48 -0000	1.3
  @@ -11,7 +11,7 @@
         <map:serialize type="xml"/>
       </map:view>
   
  -    <map:view name="pretty-content" from-label="data">
  +    <map:view from-label="content" name="pretty-content">
         <map:transform src="context://stylesheets/system/xml2html.xslt"/>
         <map:serialize type="html"/>
       </map:view>
  
  
  

Mime
View raw message