You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ha...@apache.org on 2003/05/13 17:38:51 UTC

cvs commit: cocoon-2.1/src/webapp/samples/simpleform sform.xml sitemap.xmap

haul        2003/05/13 08:38:51

  Modified:    src/webapp/samples/simpleform sform.xml sitemap.xmap
  Log:
  Update sample to new stylesheet locations
  
  Revision  Changes    Path
  1.2       +2 -1      cocoon-2.1/src/webapp/samples/simpleform/sform.xml
  
  Index: sform.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/simpleform/sform.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sform.xml	9 Mar 2003 00:11:20 -0000	1.1
  +++ sform.xml	13 May 2003 15:38:51 -0000	1.2
  @@ -43,6 +43,7 @@
          <para>
            Please enter your name: <input type="text" size="20" name="person/firstname"/>
            <input type="text" size="20" name="person/name"/>
  +         <error name="person/name" when="too-large">max. <strong>10</strong> characters allowed</error>
          </para>
   
          <para>
  @@ -56,7 +57,7 @@
          </para>
   
          <error name="*" when="ok"><para>All went <b>well.</b></para></error>
  -       <error name="*" when-ge="error"><para>An <b>error</b> occurred.</para></error>
  +       <error name="*" when-ge="error"><para>An <strong>error</strong> occurred.</para></error>
   
       </form>
   
  
  
  
  1.3       +6 -6      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	25 Mar 2003 16:13:45 -0000	1.2
  +++ sitemap.xmap	13 May 2003 15:38:51 -0000	1.3
  @@ -77,7 +77,7 @@
    <map:resources>
     <map:resource name="dynamic-page">
        <map:generate src="{target}.xsp" type="serverpages"/>
  -     <map:transform src="context://samples/stylesheets/dynamic-page2html.xsl">
  +     <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
           <map:parameter name="servletPath" value="{request:servletPath}"/>
           <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
           <map:parameter name="contextPath" value="{request:contextPath}"/>
  @@ -113,7 +113,7 @@
     <map:pipeline>
   
      <map:match pattern="">
  -     <map:redirect-to uri="simpleform"/>
  +     <map:redirect-to uri="sform"/>
      </map:match>
      
      <!-- ============ form validation using xsp and logicsheet ============== -->
  @@ -147,15 +147,15 @@
         <map:parameter name="validate-set" value="testform"/>
         
         <!-- this is only applied if the validation has been successful -->
  -      <!--map:generate src="success.xml"/>
  +      <map:generate src="success.xml"/>
         <map:transform type="simpleform"/>
  -      <map:transform src="context://samples/stylesheets/page/simple-page2html.xsl">
  +      <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
            <map:parameter name="servletPath" value="{request:servletPath}"/>
            <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
            <map:parameter name="contextPath" value="{request:contextPath}"/>
            <map:parameter name="file" value=".xml"/>
         </map:transform>
  -      <map:serialize/-->
  +      <map:serialize/>
         <!-- because of the above serializer the "success" pipeline ends here. -->
   
       </map:act>
  @@ -167,7 +167,7 @@
       <map:generate type="file" src="{1}.xml"/>    
       <map:transform type="sfinstance"/> <!-- extract the instance data -->
       <map:transform type="simpleform"/><!-- fill in the instance data, request parameters, and error tags -->
  -     <map:transform src="context://samples/stylesheets/page/simple-page2html.xsl">
  +     <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
           <map:parameter name="servletPath" value="{request:servletPath}"/>
           <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
           <map:parameter name="contextPath" value="{request:contextPath}"/>