joerg       2003/10/22 09:56:22

  Modified:    src/blocks/databases/samples/mod-db edit-groups.xsp
                        file-upload-blob.xsp sitemap.xmap user-list.xsp
               src/blocks/databases/samples/org-db add-department.xsp
                        add-employee.xsp employee.xsp
                        process-department.xsp process-employee.xsp
                        sitemap.xmap
               src/blocks/databases/samples/transform sitemap.xmap
               src/blocks/mail/samples sitemap.xmap
               src/blocks/scratchpad/samples/garbage sitemap.xmap
               src/blocks/scratchpad/samples/garbage/calc sitemap.xmap
               src/blocks/scratchpad/samples/garbage/calc/screens
                        displayResult.gt getNumberA.gt getNumberB.gt
                        getOperator.gt
               src/blocks/scratchpad/samples/intercepted-flow sitemap.xmap
               src/blocks/scratchpad/samples/intercepted-flow/screens
                        info.xsp
               src/blocks/slide/samples sitemap.xmap
               src/blocks/web3/samples sitemap.xmap
               src/documentation/xdocs/drafts sitemap-allowed.xmap
               src/documentation/xdocs/userdocs/concepts profiler.xml
               src/documentation/xdocs/userdocs/generators
                        directory-generator.xml
               src/webapp/samples/flow/calc sitemap.xmap
               src/webapp/samples/flow/calc/screens displayResult.xsp
                        getNumberA.xsp getNumberB.xsp getOperator.xsp
               src/webapp/samples/flow/jxcalc sitemap.xmap
               src/webapp/samples/flow/jxcalc/screens displayResult.xml
                        getNumberA.xml getNumberB.xml getOperator.xml
               src/webapp/samples/flow/prefs/screens login.xsp
                        registrationSuccessful.xsp userInfo.xsp welcome.xsp
               src/webapp/samples/flow/test sitemap.xmap
               src/webapp/samples/flow/test/screens showString.xsp
               src/webapp/samples/protected sitemap.xmap
               src/webapp/samples/protected/docs protected.xsp
               src/webapp/samples/simpleform sitemap.xmap
               src/webapp/samples/simpleform/four sitemap.xmap
               src/webapp/samples/simpleform/one ERROR.xsp OK.xsp
                        sitemap.xmap
               src/webapp/samples/simpleform/three sitemap.xmap
               src/webapp/samples/simpleform/two sitemap.xmap
  Removed:     src/webapp/samples/flow/jxcalc calc.js
  Log:
  fixing view-source by adding explicite matches to the sitemaps, added views 
where missing
  
  Revision  Changes    Path
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/mod-db/edit-groups.xsp
  
  Index: edit-groups.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/mod-db/edit-groups.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- edit-groups.xsp   9 Mar 2003 00:03:21 -0000       1.1
  +++ edit-groups.xsp   22 Oct 2003 16:56:20 -0000      1.2
  @@ -14,7 +14,7 @@
     
     <page>
       <resources>
  -       <resource type="file" href="database.xml">Descriptor</resource>
  +       <resource type="file" 
href="database.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" href="schema.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.3       +1 -1      
cocoon-2.1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp
  
  Index: file-upload-blob.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- file-upload-blob.xsp      17 Apr 2003 20:45:55 -0000      1.2
  +++ file-upload-blob.xsp      22 Oct 2003 16:56:20 -0000      1.3
  @@ -12,7 +12,7 @@
     
     <page>
       <resources>
  -       <resource type="file" href="database.xml">Descriptor</resource>
  +       <resource type="file" 
href="database.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" href="schema.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.2       +17 -1     
cocoon-2.1/src/blocks/databases/samples/mod-db/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/mod-db/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      9 Mar 2003 00:03:21 -0000       1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:20 -0000      1.2
  @@ -67,7 +67,16 @@
   
     <map:views>
       <map:view name="content" from-label="content">
  -      <map:serialize type="xml" mime-type="text/plain"/>
  +      <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>
   
  @@ -76,6 +85,13 @@
     <map:pipelines>
       <map:pipeline>
   
  +      <map:match pattern="database.xml">
  +        <map:generate src="{0}"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +      <map:match pattern="schema.sql">
  +        <map:read src="{0}" mime-type="text/plain"/>
  +      </map:match>
      <!-- ========================== Modular DB 
================================= -->
   
          <map:match pattern="">
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/mod-db/user-list.xsp
  
  Index: user-list.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/mod-db/user-list.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- user-list.xsp     9 Mar 2003 00:03:21 -0000       1.1
  +++ user-list.xsp     22 Oct 2003 16:56:20 -0000      1.2
  @@ -13,7 +13,7 @@
     <page>
   
       <resources>
  -       <resource type="file" href="database.xml">Descriptor</resource>
  +       <resource type="file" 
href="database.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" href="schema.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/org-db/add-department.xsp
  
  Index: add-department.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/add-department.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- add-department.xsp        9 Mar 2003 00:03:22 -0000       1.1
  +++ add-department.xsp        22 Oct 2003 16:56:20 -0000      1.2
  @@ -8,7 +8,7 @@
     <page>
   
       <resources>
  -       <resource type="file" href="employee.xml">Descriptor</resource>
  +       <resource type="file" 
href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" 
href="../transform/sql-page.xml.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/org-db/add-employee.xsp
  
  Index: add-employee.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/add-employee.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- add-employee.xsp  9 Mar 2003 00:03:22 -0000       1.1
  +++ add-employee.xsp  22 Oct 2003 16:56:20 -0000      1.2
  @@ -8,7 +8,7 @@
     <page>
   
       <resources>
  -       <resource type="file" href="employee.xml">Descriptor</resource>
  +       <resource type="file" 
href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" 
href="../transform/sql-page.xml.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/org-db/employee.xsp
  
  Index: employee.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/employee.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- employee.xsp      9 Mar 2003 00:03:22 -0000       1.1
  +++ employee.xsp      22 Oct 2003 16:56:20 -0000      1.2
  @@ -14,7 +14,7 @@
       </xsp:logic>
   
       <resources>
  -       <resource type="file" href="employee.xml">Descriptor</resource>
  +       <resource type="file" 
href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" 
href="../transform/sql-page.xml.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/org-db/process-department.xsp
  
  Index: process-department.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/process-department.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- process-department.xsp    9 Mar 2003 00:03:22 -0000       1.1
  +++ process-department.xsp    22 Oct 2003 16:56:20 -0000      1.2
  @@ -18,7 +18,7 @@
       </xsp:logic>
   
       <resources>
  -       <resource type="file" href="employee.xml">Descriptor</resource>
  +       <resource type="file" 
href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" 
href="../transform/sql-page.xml.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/databases/samples/org-db/process-employee.xsp
  
  Index: process-employee.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/process-employee.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- process-employee.xsp      9 Mar 2003 00:03:22 -0000       1.1
  +++ process-employee.xsp      22 Oct 2003 16:56:20 -0000      1.2
  @@ -20,7 +20,7 @@
       </xsp:logic>
   
       <resources>
  -       <resource type="file" href="employee.xml">Descriptor</resource>
  +       <resource type="file" 
href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="file" 
href="../transform/sql-page.xml.sql">Schema</resource>
          <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
          <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
  
  
  
  1.3       +5 -0      
cocoon-2.1/src/blocks/databases/samples/org-db/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap      22 Oct 2003 13:28:07 -0000      1.2
  +++ sitemap.xmap      22 Oct 2003 16:56:20 -0000      1.3
  @@ -61,6 +61,11 @@
   
     <map:pipeline>
   
  +   <map:match pattern="employee.xml">
  +     <map:generate src="{0}"/>
  +     <map:serialize type="xml"/>
  +   </map:match>
  +
      <map:match pattern="employee">
        <map:act set="employee">
          <map:parameter name="descriptor" value="employee.xml"/>
  
  
  
  1.3       +20 -0     
cocoon-2.1/src/blocks/databases/samples/transform/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/samples/transform/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap      25 Mar 2003 17:10:37 -0000      1.2
  +++ sitemap.xmap      22 Oct 2003 16:56:20 -0000      1.3
  @@ -13,12 +13,32 @@
   
    </map:components>
   
  +<!-- ============================ 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="sql-page.xml.sql">
  +    <map:read src="sql-page.xml.sql" mime-type="text/plain"/>
  +   </map:match>
   
      <map:match pattern="*">
       <map:generate src="{1}.xml"/>
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap      29 Jul 2003 03:15:46 -0000      1.2
  +++ sitemap.xmap      22 Oct 2003 16:56:20 -0000      1.3
  @@ -21,7 +21,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
     
  
  
  
  1.2       +17 -0     
cocoon-2.1/src/blocks/scratchpad/samples/garbage/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      4 Sep 2003 12:42:42 -0000       1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:20 -0000      1.2
  @@ -4,6 +4,23 @@
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
   
  +<!-- =========================== Views =================================== 
-->
  +
  +  <map:views>
  +    <map:view from-label="content" name="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 from-position="last" name="links">
  +      <map:serialize type="links"/>
  +    </map:view>
  +  </map:views>
  +
     <map:pipelines>
       <map:pipeline>
   
  
  
  
  1.2       +5 -0      
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      4 Sep 2003 12:42:42 -0000       1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:21 -0000      1.2
  @@ -15,6 +15,11 @@
   
     <map:pipelines>
       <map:pipeline>
  +
  +      <map:match pattern="calc.js">
  +        <map:read src="{0}" mime-type="text/plain"/>
  +      </map:match>
  +
         <!--+
             | produces the screens called by the flowscript
             +-->     
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/displayResult.gt
  
  Index: displayResult.gt
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/displayResult.gt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- displayResult.gt  4 Sep 2003 12:42:33 -0000       1.1
  +++ displayResult.gt  22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
     <resources>
  -    <resource type="file" 
href="/samples/garbage/calc/calc.js">Flowscript</resource>
  +    <resource type="file" href="calc.js">Flowscript</resource>
     </resources>
     <title>Calculator</title>
     <content>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberA.gt
  
  Index: getNumberA.gt
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberA.gt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getNumberA.gt     4 Sep 2003 12:42:33 -0000       1.1
  +++ getNumberA.gt     22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
     <resources>
  -    <resource type="file" 
href="/samples/garbage/calc/calc.js">Flowscript</resource>
  +    <resource type="file" href="calc.js">Flowscript</resource>
     </resources>
     <title>Calculator</title>
     <content>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberB.gt
  
  Index: getNumberB.gt
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberB.gt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getNumberB.gt     4 Sep 2003 12:42:33 -0000       1.1
  +++ getNumberB.gt     22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
     <resources>
  -    <resource type="file" 
href="/samples/garbage/calc/calc.js">Flowscript</resource>
  +    <resource type="file" href="calc.js">Flowscript</resource>
     </resources>
     <title>Calculator</title>
     <content>
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getOperator.gt
  
  Index: getOperator.gt
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getOperator.gt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getOperator.gt    4 Sep 2003 12:42:33 -0000       1.1
  +++ getOperator.gt    22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
     <resources>
  -    <resource type="file" 
href="/samples/garbage/calc/calc.js">Flowscript</resource>
  +    <resource type="file" href="calc.js">Flowscript</resource>
     </resources>
     <title>Calculator</title>
     <content>
  
  
  
  1.2       +22 -0     
cocoon-2.1/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/intercepted-flow/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      6 Sep 2003 13:45:49 -0000       1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:21 -0000      1.2
  @@ -2,6 +2,23 @@
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
   
  +<!-- =========================== Views =================================== 
-->
  +
  +  <map:views>
  +    <map:view from-label="content" name="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 from-position="last" name="links">
  +      <map:serialize type="links"/>
  +    </map:view>
  +  </map:views>
  +
     <!-- indicates what flowscript to attach to this sitemap -->
     <map:flow language="intercepted-javascript">
       <map:script src="basescript.js"/>
  @@ -9,6 +26,11 @@
   
     <map:pipelines>
       <map:pipeline>
  +
  +      <map:match pattern="*.js">
  +        <map:read src="{0}" mime-type="text/plain"/>
  +      </map:match>
  +
         <!--+
             | produces the screens called by the flowscript
             +-->     
  
  
  
  1.2       +4 -2      
cocoon-2.1/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp
  
  Index: info.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/intercepted-flow/screens/info.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- info.xsp  6 Sep 2003 13:45:49 -0000       1.1
  +++ info.xsp  22 Oct 2003 16:56:21 -0000      1.2
  @@ -11,7 +11,9 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="basescript.js">Flowscript Base</resource>
  +      <resource type="file" href="aspects1.js">FS Aspects 1</resource>
  +      <resource type="file" href="aspects2.js">FS Aspects 2</resource>
       </resources>
       <title>Intercepted Flow</title>
       <content>
  
  
  
  1.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sitemap.xmap      23 Sep 2003 03:15:49 -0000      1.7
  +++ sitemap.xmap      22 Oct 2003 16:56:21 -0000      1.8
  @@ -47,7 +47,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -   <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +   <map:transform src="context://stylesheets/system/xml2html.xslt"/>
      <map:serialize type="html"/>
     </map:view>
   
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap      29 Jul 2003 03:15:47 -0000      1.4
  +++ sitemap.xmap      22 Oct 2003 16:56:21 -0000      1.5
  @@ -24,7 +24,7 @@
        </map:view>
   
        <map:view from-label="content" name="pretty-content">
  -       <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +       <map:transform src="context://stylesheets/system/xml2html.xslt"/>
          <map:serialize type="html"/>
        </map:view>
        
  
  
  
  1.2       +3 -3      
cocoon-2.1/src/documentation/xdocs/drafts/sitemap-allowed.xmap
  
  Index: sitemap-allowed.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/documentation/xdocs/drafts/sitemap-allowed.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap-allowed.xmap      9 Mar 2003 00:07:49 -0000       1.1
  +++ sitemap-allowed.xmap      22 Oct 2003 16:56:21 -0000      1.2
  @@ -50,7 +50,7 @@
         <parameter name="deprecated" value="error"/>
         -->
         </map:generate>
  -      <map:transform src="../../stylesheets/simple-xml2html.xsl"/>
  +      <map:transform src="../../stylesheets/simple-xml2html.xslt"/>
         <map:serialize/>
         <!-- any unsupported tag will result in error
         <unknown-tag/>
  @@ -59,7 +59,7 @@
   
       <!-- Pipeline with no map:generate|read|mount|redirect-to|call is illegal
       <map:pipeline>
  -      <map:transform src="../../stylesheets/simple-xml2html.xsl"/>
  +      <map:transform src="../../stylesheets/simple-xml2html.xslt"/>
         <map:serialize/>
       </map:pipeline>
       -->
  @@ -67,7 +67,7 @@
       <!-- Pipeline with map:generate|transform must have serialize
       <map:pipeline>
         <map:generate src="sitemap.xmap"/>
  -      <map:transform src="../../stylesheets/simple-xml2html.xsl"/>
  +      <map:transform src="../../stylesheets/simple-xml2html.xslt"/>
       </map:pipeline>
       -->
   
  
  
  
  1.4       +1 -1      
cocoon-2.1/src/documentation/xdocs/userdocs/concepts/profiler.xml
  
  Index: profiler.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/concepts/profiler.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- profiler.xml      12 Oct 2003 13:43:11 -0000      1.3
  +++ profiler.xml      22 Oct 2003 16:56:21 -0000      1.4
  @@ -99,7 +99,7 @@
   
           <source><![CDATA[<map:views>
     <map:view name="pretty-content" from-label="data">
  -    <map:transform src="simple-xml2html.xsl"/>
  +    <map:transform src="simple-xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
   </map:views>]]></source>
  
  
  
  1.6       +2 -2      
cocoon-2.1/src/documentation/xdocs/userdocs/generators/directory-generator.xml
  
  Index: directory-generator.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/generators/directory-generator.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- directory-generator.xml   12 Oct 2003 13:04:48 -0000      1.5
  +++ directory-generator.xml   22 Oct 2003 16:56:21 -0000      1.6
  @@ -116,8 +116,8 @@
       name="stylesheets" lastModified="1056668768203" date="27.06.03 01:06" 
size="0"
       requested="true" sort="name" reverse="false">
     <dir:directory name="sites" lastModified="1056668768203" date="27.06.03 
01:06" size="0"/>
  -  <dir:file name="dynamic-page2html.xsl" lastModified="1056668768203" 
date="27.06.03 01:06" size="0"/>
  -  <dir:file name="simple-xml2html.xsl" lastModified="1056668768203" 
date="27.06.03 01:06" size="1234"/>
  +  <dir:file name="dynamic-page2html.xsl" lastModified="1056668768203" 
date="27.06.03 01:06" size="4321"/>
  +  <dir:file name="simple-xml2html.xslt" lastModified="1056668768203" 
date="27.06.03 01:06" size="1234"/>
   </dir:directory>
         ]]></source>
       </s1>
  
  
  
  1.7       +4 -0      cocoon-2.1/src/webapp/samples/flow/calc/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/calc/sitemap.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sitemap.xmap      11 Oct 2003 16:14:52 -0000      1.6
  +++ sitemap.xmap      22 Oct 2003 16:56:21 -0000      1.7
  @@ -48,6 +48,10 @@
           <map:call function="calculator"/>
         </map:match>
   
  +      <map:match pattern="calc.js">
  +        <map:read src="{0}" mime-type="text/plain"/>
  +      </map:match>
  +
       </map:pipeline>
     </map:pipelines>
   </map:sitemap>
  
  
  
  1.4       +2 -2      
cocoon-2.1/src/webapp/samples/flow/calc/screens/displayResult.xsp
  
  Index: displayResult.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/calc/screens/displayResult.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- displayResult.xsp 20 May 2003 00:54:12 -0000      1.3
  +++ displayResult.xsp 22 Oct 2003 16:56:21 -0000      1.4
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.4       +2 -2      
cocoon-2.1/src/webapp/samples/flow/calc/screens/getNumberA.xsp
  
  Index: getNumberA.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/calc/screens/getNumberA.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- getNumberA.xsp    20 May 2003 00:54:12 -0000      1.3
  +++ getNumberA.xsp    22 Oct 2003 16:56:21 -0000      1.4
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.4       +2 -2      
cocoon-2.1/src/webapp/samples/flow/calc/screens/getNumberB.xsp
  
  Index: getNumberB.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/calc/screens/getNumberB.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- getNumberB.xsp    20 May 2003 00:54:12 -0000      1.3
  +++ getNumberB.xsp    22 Oct 2003 16:56:21 -0000      1.4
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.4       +2 -2      
cocoon-2.1/src/webapp/samples/flow/calc/screens/getOperator.xsp
  
  Index: getOperator.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/calc/screens/getOperator.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- getOperator.xsp   20 May 2003 00:54:12 -0000      1.3
  +++ getOperator.xsp   22 Oct 2003 16:56:21 -0000      1.4
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/webapp/samples/flow/jxcalc/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/jxcalc/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap      15 Oct 2003 14:12:45 -0000      1.2
  +++ sitemap.xmap      22 Oct 2003 16:56:21 -0000      1.3
  @@ -4,7 +4,7 @@
   
     <!-- indicates what flowscript to attach to this sitemap -->
     <map:flow language="javascript">
  -    <map:script src="calc.js"/>
  +    <map:script src="../calc/calc.js"/>
     </map:flow>
   
     <map:pipelines>
  
  
  
  1.2       +2 -2      
cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/displayResult.xml
  
  Index: displayResult.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/displayResult.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- displayResult.xml 13 Oct 2003 13:32:17 -0000      1.1
  +++ displayResult.xml 22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="../calc/calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.2       +2 -2      
cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
  
  Index: getNumberA.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getNumberA.xml    13 Oct 2003 13:32:17 -0000      1.1
  +++ getNumberA.xml    22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="../calc/calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.2       +2 -2      
cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml
  
  Index: getNumberB.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getNumberB.xml    13 Oct 2003 13:32:17 -0000      1.1
  +++ getNumberB.xml    22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="../calc/calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.2       +2 -2      
cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/getOperator.xml
  
  Index: getOperator.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/jxcalc/screens/getOperator.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getOperator.xml   13 Oct 2003 13:32:17 -0000      1.1
  +++ getOperator.xml   22 Oct 2003 16:56:21 -0000      1.2
  @@ -8,7 +8,7 @@
   
   <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/calc/calc.js">Flowscript</resource>
  +      <resource type="file" href="../calc/calc.js">Flowscript</resource>
       </resources>
       <title>Calculator</title>
       <content>
  
  
  
  1.5       +2 -2      
cocoon-2.1/src/webapp/samples/flow/prefs/screens/login.xsp
  
  Index: login.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/prefs/screens/login.xsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- login.xsp 14 Jul 2003 09:30:46 -0000      1.4
  +++ login.xsp 22 Oct 2003 16:56:22 -0000      1.5
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
  +      <resource type="file" href="prefs.js">Flowscript</resource>
       </resources>
       <title>Login</title>
       <content>
  
  
  
  1.4       +2 -2      
cocoon-2.1/src/webapp/samples/flow/prefs/screens/registrationSuccessful.xsp
  
  Index: registrationSuccessful.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/prefs/screens/registrationSuccessful.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- registrationSuccessful.xsp        14 Jul 2003 09:30:46 -0000      1.3
  +++ registrationSuccessful.xsp        22 Oct 2003 16:56:22 -0000      1.4
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
  +      <resource type="file" href="prefs.js">Flowscript</resource>
       </resources>
       <title>Registration successful!</title>
       <content>
  
  
  
  1.5       +2 -2      
cocoon-2.1/src/webapp/samples/flow/prefs/screens/userInfo.xsp
  
  Index: userInfo.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/prefs/screens/userInfo.xsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- userInfo.xsp      14 Jul 2003 09:30:46 -0000      1.4
  +++ userInfo.xsp      22 Oct 2003 16:56:22 -0000      1.5
  @@ -16,7 +16,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
  +      <resource type="file" href="prefs.js">Flowscript</resource>
       </resources>
       <title><jpath:value-of select="title"/></title>
       <content>
  
  
  
  1.4       +2 -2      
cocoon-2.1/src/webapp/samples/flow/prefs/screens/welcome.xsp
  
  Index: welcome.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/prefs/screens/welcome.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- welcome.xsp       14 Jul 2003 09:30:46 -0000      1.3
  +++ welcome.xsp       22 Oct 2003 16:56:22 -0000      1.4
  @@ -11,7 +11,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
  +      <resource type="file" href="prefs.js">Flowscript</resource>
       </resources>
       <title>Welcome!</title>
       <content>
  
  
  
  1.5       +4 -0      cocoon-2.1/src/webapp/samples/flow/test/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/test/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap      31 Aug 2003 16:32:34 -0000      1.4
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.5
  @@ -8,6 +8,10 @@
   
     <map:pipelines>
       <map:pipeline>
  +      <map:match pattern="sendpage.js">
  +        <map:read src="{0}" mime-type="text/plain"/>
  +      </map:match>
  +    
         <map:match pattern="">
           <map:redirect-to uri="showString"/>
         </map:match>
  
  
  
  1.3       +2 -2      
cocoon-2.1/src/webapp/samples/flow/test/screens/showString.xsp
  
  Index: showString.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/flow/test/screens/showString.xsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- showString.xsp    20 May 2003 00:54:12 -0000      1.2
  +++ showString.xsp    22 Oct 2003 16:56:22 -0000      1.3
  @@ -13,7 +13,7 @@
             xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="/samples/flow/test/sendpage.js">Flowscript</resource>
  +      <resource type="file" href="sendpage.js">Flowscript</resource>
       </resources>
       <title>Show String</title>
       <content>
  
  
  
  1.5       +15 -1     cocoon-2.1/src/webapp/samples/protected/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/protected/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap      22 May 2003 13:37:46 -0000      1.4
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.5
  @@ -22,11 +22,25 @@
       <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="descriptors/*.xml">
  +        <map:generate src="{0}"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
   
         <map:match pattern="">
           <map:redirect-to uri="page"/>
  
  
  
  1.3       +3 -3      
cocoon-2.1/src/webapp/samples/protected/docs/protected.xsp
  
  Index: protected.xsp
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/protected/docs/protected.xsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- protected.xsp     22 May 2003 13:37:46 -0000      1.2
  +++ protected.xsp     22 Oct 2003 16:56:22 -0000      1.3
  @@ -7,8 +7,8 @@
             xmlns:session="http://apache.org/xsp/session/2.0";>
     <page>
       <resources>
  -      <resource type="file" 
href="descriptors/auth.xml">Authenticator</resource>
  -      <resource type="file" 
href="descriptors/params.xml">Validator</resource>
  +      <resource type="file" 
href="descriptors/auth.xml?cocoon-view=pretty-content">Authenticator</resource>
  +      <resource type="file" 
href="descriptors/params.xml?cocoon-view=pretty-content">Validator</resource>
         <resource type="doc" 
href="userdocs/actions/database-actions.html">Actions</resource>
       </resources>
       <title>Protected area</title>
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sitemap.xmap      15 Aug 2003 15:57:32 -0000      1.5
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.6
  @@ -10,7 +10,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
     
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/webapp/samples/simpleform/four/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/four/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      15 Aug 2003 15:57:33 -0000      1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.2
  @@ -151,7 +151,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
     
  
  
  
  1.2       +1 -1      cocoon-2.1/src/webapp/samples/simpleform/one/ERROR.xsp
  
  Index: ERROR.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/simpleform/one/ERROR.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ERROR.xsp 15 Aug 2003 15:57:33 -0000      1.1
  +++ ERROR.xsp 22 Oct 2003 16:56:22 -0000      1.2
  @@ -8,7 +8,7 @@
      <page>
   
       <resources>
  -       <resource type="file" href="descriptor.xml">Descriptor</resource>
  +       <resource type="file" 
href="descriptor.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="doc" href="userdocs/xsp/logicsheet-forms.html">Action 
&amp; Logicsheet</resource>
       </resources>
   
  
  
  
  1.2       +1 -1      cocoon-2.1/src/webapp/samples/simpleform/one/OK.xsp
  
  Index: OK.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/simpleform/one/OK.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OK.xsp    15 Aug 2003 15:57:33 -0000      1.1
  +++ OK.xsp    22 Oct 2003 16:56:22 -0000      1.2
  @@ -8,7 +8,7 @@
   
      <page>
       <resources>
  -       <resource type="file" href="descriptor.xml">Descriptor</resource>
  +       <resource type="file" 
href="descriptor.xml?cocoon-view=pretty-content">Descriptor</resource>
          <resource type="doc" href="userdocs/xsp/logicsheet-forms.html">Action 
&amp; Logicsheet</resource>
       </resources>
   
  
  
  
  1.2       +5 -2      cocoon-2.1/src/webapp/samples/simpleform/one/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/one/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      15 Aug 2003 15:57:33 -0000      1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.2
  @@ -54,7 +54,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
     
  @@ -105,7 +105,10 @@
        </map:call>
      </map:match>
   
  -
  +   <map:match pattern="descriptor.xml">
  +     <map:generate src="{0}"/>
  +     <map:serialize type="xml"/>
  +   </map:match>
   
      <!-- some redirections -->
      <map:match pattern="*">
  
  
  
  1.2       +1 -1      
cocoon-2.1/src/webapp/samples/simpleform/three/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/three/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      15 Aug 2003 15:57:32 -0000      1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.2
  @@ -100,7 +100,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
     
  
  
  
  1.2       +1 -1      cocoon-2.1/src/webapp/samples/simpleform/two/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/two/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap      15 Aug 2003 15:57:32 -0000      1.1
  +++ sitemap.xmap      22 Oct 2003 16:56:22 -0000      1.2
  @@ -85,7 +85,7 @@
     </map:view>
   
     <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
     
  
  
  

Reply via email to