You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2002/07/04 07:20:44 UTC

cvs commit: xml-cocoon2/src/webapp/samples/xmlform sitemap.xmap

crossley    2002/07/03 22:20:44

  Modified:    src/webapp/samples/misc sitemap.xmap
               src/webapp/samples/mod-db sitemap.xmap
               src/webapp/samples/poi sitemap.xmap
               src/webapp/samples/protected sitemap.xmap
               src/webapp/samples/search sitemap.xmap
               src/webapp/samples/sub sitemap.xmap
               src/webapp/samples/xmlform sitemap.xmap
  Log:
  Fix many errors from broken context:// URIs (need context://samples/....)
  
  Revision  Changes    Path
  1.2       +11 -5     xml-cocoon2/src/webapp/samples/misc/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/misc/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	16 Jun 2002 07:10:27 -0000	1.1
  +++ sitemap.xmap	4 Jul 2002 05:20:43 -0000	1.2
  @@ -19,7 +19,7 @@
   
      <map:match pattern="welcome">
       <map:generate src="samples.xml"/>
  -    <map:transform src="context://stylesheets/simple-samples2html.xsl"/>
  +    <map:transform src="context://samples/stylesheets/simple-samples2html.xsl"/>
       <map:serialize/>
      </map:match>
   
  @@ -31,6 +31,12 @@
       <map:serialize type="html"/>
      </map:match>
   
  +   <map:match pattern="entity-test.html">
  +    <map:generate src="catalog-test.xml"/>
  +    <map:transform src="catalog/style.xsl"/>
  +    <map:serialize type="html"/>
  +   </map:match>
  +
      <map:match pattern="sdocbook-demo.html">
       <map:read src="catalog/sdocbook-demo.html"/>
       <map:serialize type="html"/>
  @@ -45,19 +51,19 @@
      <!-- ========================= Resources ================================ -->
   
      <map:match pattern="sites/styles/**.css">
  -    <map:read src="context://resources/styles/{1}.css" mime-type="text/css"/>
  +    <map:read src="context://samples/resources/styles/{1}.css" mime-type="text/css"/>
      </map:match>
   
      <map:match pattern="images/**.gif">
  -    <map:read src="context://resources/images/{1}.gif" mime-type="image/gif"/>
  +    <map:read src="context://samples/resources/images/{1}.gif" mime-type="image/gif"/>
      </map:match>
   
      <map:match pattern="images/**.jpg">
  -    <map:read src="context://resources/images/{1}.jpg" mime-type="image/jpg"/>
  +    <map:read src="context://samples/resources/images/{1}.jpg" mime-type="image/jpg"/>
      </map:match>
   
      <map:match pattern="images/**.png">
  -    <map:read src="context://resources/images/{1}.png" mime-type="image/png"/>
  +    <map:read src="context://samples/resources/images/{1}.png" mime-type="image/png"/>
      </map:match>
       
      <!-- delegate to parent sitemap 
  
  
  
  1.3       +1 -1      xml-cocoon2/src/webapp/samples/mod-db/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/mod-db/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	25 Jun 2002 09:32:48 -0000	1.2
  +++ sitemap.xmap	4 Jul 2002 05:20:43 -0000	1.3
  @@ -186,7 +186,7 @@
             <!-- ______________________________ content  ______________________________ -->
   
         <map:generate type="serverpages" src="{1}.xsp"/>
  -      <map:transform src="context://stylesheets/dynamic-page2html.xsl">
  +      <map:transform src="context://samples/stylesheets/dynamic-page2html.xsl">
            <map:parameter name="view-source" value="mod-db/{1}.xsp"/>
         </map:transform>
         <map:transform src="stupid.xsl"/>
  
  
  
  1.3       +7 -7      xml-cocoon2/src/webapp/samples/poi/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/poi/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	18 Apr 2002 16:36:14 -0000	1.2
  +++ sitemap.xmap	4 Jul 2002 05:20:43 -0000	1.3
  @@ -27,12 +27,12 @@
   
      <map:match pattern="welcome">
       <map:generate src="content/samples.xml"/>
  -    <map:transform src="context://stylesheets/simple-samples2html.xsl"/>
  +    <map:transform src="context://samples/stylesheets/simple-samples2html.xsl"/>
       <map:serialize/>
      </map:match>
   
      <map:match pattern="hello.xls">
  -    <map:generate src="context://docs/samples/hello-page.xml"/>
  +    <map:generate src="context://samples/docs/samples/hello-page.xml"/>
       <map:transform src="stylesheets/simple-page2xls.xsl"/>
       <map:serialize type="xls"/>
      </map:match>
  @@ -77,7 +77,7 @@
      </map:match>
      
      <map:match pattern="sql-xls/*.xls">
  -    <map:generate src="context://docs/samples/sql/{1}.xml"/>
  +    <map:generate src="context://samples/docs/samples/sql/{1}.xml"/>
       <map:transform type="sql">
       <map:parameter name="use-connecton" value="personnel"/>
       </map:transform>
  @@ -105,19 +105,19 @@
      <!-- ========================= Resources ================================ -->
   
      <map:match pattern="sites/styles/**.css">
  -    <map:read src="context://resources/styles/{1}.css" mime-type="text/css"/>
  +    <map:read src="context://samples/resources/styles/{1}.css" mime-type="text/css"/>
      </map:match>
   
      <map:match pattern="images/**.gif">
  -    <map:read src="context://resources/images/{1}.gif" mime-type="image/gif"/>
  +    <map:read src="context://samples/resources/images/{1}.gif" mime-type="image/gif"/>
      </map:match>
   
      <map:match pattern="images/**.jpg">
  -    <map:read src="context://resources/images/{1}.jpg" mime-type="image/jpg"/>
  +    <map:read src="context://samples/resources/images/{1}.jpg" mime-type="image/jpg"/>
      </map:match>
   
      <map:match pattern="images/**.png">
  -    <map:read src="context://resources/images/{1}.png" mime-type="image/png"/>
  +    <map:read src="context://samples/resources/images/{1}.png" mime-type="image/png"/>
      </map:match>
       
      <!-- delegate to parent sitemap 
  
  
  
  1.3       +1 -1      xml-cocoon2/src/webapp/samples/protected/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/protected/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	25 Jun 2002 09:32:48 -0000	1.2
  +++ sitemap.xmap	4 Jul 2002 05:20:44 -0000	1.3
  @@ -96,7 +96,7 @@
   
         <!-- Let parent sitemap treat it 
         <map:handle-errors>
  -        <map:transform src="context://stylesheets/system/error2html.xsl"/>
  +        <map:transform src="context://samples/stylesheets/system/error2html.xsl"/>
           <map:serialize status-code="500"/>
         </map:handle-errors>
         -->
  
  
  
  1.2       +1 -1      xml-cocoon2/src/webapp/samples/search/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/search/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	1 Jul 2002 10:04:17 -0000	1.1
  +++ sitemap.xmap	4 Jul 2002 05:20:44 -0000	1.2
  @@ -209,7 +209,7 @@
           "[...] All <map:parameter> declarations will be made
           available in the XSLT stylesheet as xsl:variables. [...]" 
         -->
  -      <map:transform src="context://stylesheets/dynamic-page2html.xsl">
  +      <map:transform src="context://samples/stylesheets/dynamic-page2html.xsl">
           <map:parameter name="view-source" value="search/{1}-index.xsp"/>
         </map:transform>
         <map:serialize/>
  
  
  
  1.2       +1 -1      xml-cocoon2/src/webapp/samples/sub/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/sub/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	1 Jul 2002 10:04:17 -0000	1.1
  +++ sitemap.xmap	4 Jul 2002 05:20:44 -0000	1.2
  @@ -137,7 +137,7 @@
      <!-- this is used to show the content of any XML file. -->
      <map:match pattern="view-source">
       <!-- this XSP page takes one request parameter: filename -->
  -    <map:generate type="serverpages" src="context://docs/samples/slides/view-source.xsp"/>
  +    <map:generate type="serverpages" src="context://samples/docs/samples/slides/view-source.xsp"/>
       <map:serialize/>
      </map:match>
   
  
  
  
  1.5       +1 -1      xml-cocoon2/src/webapp/samples/xmlform/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	30 Jun 2002 17:00:44 -0000	1.4
  +++ sitemap.xmap	4 Jul 2002 05:20:44 -0000	1.5
  @@ -66,7 +66,7 @@
             <map:generate src="wizard/{page}.xml"/>
             <map:transform type="xmlform"  label="debug"/>
             <map:transform src="stylesheets/wizard2html.xsl" />
  -          <map:transform src="context://stylesheets/xmlform/xmlform2html.xsl"/>
  +          <map:transform src="context://samples/stylesheets/xmlform/xmlform2html.xsl"/>
             <map:serialize type="html"/>
           </map:act>
         </map:match>  
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org