You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2004/03/09 16:07:50 UTC

cvs commit: cocoon-2.1/src/blocks/forms/samples/v2 sitemap.xmap

reinhard    2004/03/09 07:07:50

  Modified:    src/blocks/forms/samples welcome.xml
               src/blocks/forms/samples/v2 sitemap.xmap
  Log:
  Woody-->CocoonForms
  
  Revision  Changes    Path
  1.2       +2 -2      cocoon-2.1/src/blocks/forms/samples/welcome.xml
  
  Index: welcome.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/welcome.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- welcome.xml	9 Mar 2004 10:34:13 -0000	1.1
  +++ welcome.xml	9 Mar 2004 15:07:50 -0000	1.2
  @@ -30,7 +30,7 @@
    </group>
   
    <group name="Basic Samples">
  -  <sample name="Various" href="various.action">This sample shows validation, event handling and various Cocoon Forms features.</sample>
  +  <sample name="Various" href="form1">This sample shows validation, event handling and various Cocoon Forms features.</sample>
     <sample name="Flowscript" href="form1.flow">The same sample as above using Flowscript.</sample>
     <sample name="Registration" href="registration">A simple registration form.</sample>
     <sample name="Car selector" href="carselector">Illustrates programmatically changing selectionlists.</sample>
  
  
  
  1.2       +118 -146  cocoon-2.1/src/blocks/forms/samples/v2/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/v2/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	9 Mar 2004 10:34:02 -0000	1.1
  +++ sitemap.xmap	9 Mar 2004 15:07:50 -0000	1.2
  @@ -14,156 +14,128 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   -->
  -
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -
  - <map:components>
  -
  -  <map:generators default="file">   
  -    <map:generator name="forms" src="org.apache.cocoon.forms.generation.WoodyGenerator" logger="forms"/>
  -    <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator" label="content" logger="sitemap.generator.jx"/>
  -  </map:generators>
  -
  -  <map:transformers default="xalan">    
  -    <map:transformer name="forms" src="org.apache.cocoon.forms.transformation.WoodyTemplateTransformer" logger="forms"/>
  -    <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
  -      <catalogues default="other">
  -        <catalogue id="other" name="OtherMessages" location="../messages"/>
  -        <catalogue id="forms" name="WoodyMessages" location="../messages"/>
  -      </catalogues>
  -      <cache-at-startup>true</cache-at-startup>
  -    </map:transformer>
  -  </map:transformers>
  -
  -  <map:selectors default="browser">
  -    <map:selector name="request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
  -  </map:selectors>
  -
  -  <map:pipes default="caching">
  +  <map:components>
  +    <map:generators default="file">
  +      <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator" label="content" logger="sitemap.generator.jx"/>
  +    </map:generators>
  +    <map:transformers default="xalan">
  +      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
  +        <catalogues default="other">
  +          <catalogue id="other" name="OtherMessages" location="../messages"/>
  +          <catalogue id="forms" name="WoodyMessages" location="../messages"/>
  +        </catalogues>
  +        <cache-at-startup>true</cache-at-startup>
  +      </map:transformer>
  +    </map:transformers>
  +    <map:selectors default="browser">
  +      <map:selector name="request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
  +    </map:selectors>
  +    <map:pipes default="caching">
     </map:pipes>
  -
  - </map:components>
  -
  - <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>
  - 
  - <map:resources>
  -   <!-- this will later become a virtual transformer -->
  -   <map:resource name="simple-page2html">
  -     <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  -       <map:parameter name="contextPath" value="{request:contextPath}"/>
  -       <map:parameter name="servletPath" value="{request:servletPath}"/>
  -       <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  -       <map:parameter name="file" value="{file}"/>
  -       <map:parameter name="remove" value="{../0}"/>
  -     </map:transform> 
  -   </map:resource>
  - </map:resources>
  -
  +  </map:components>
  +  <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>
  +  <map:resources>
  +    <!-- this will later become a virtual transformer -->
  +    <map:resource name="simple-page2html">
  +      <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  +        <map:parameter name="contextPath" value="{request:contextPath}"/>
  +        <map:parameter name="servletPath" value="{request:servletPath}"/>
  +        <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  +        <map:parameter name="file" value="{file}"/>
  +        <map:parameter name="remove" value="{../0}"/>
  +      </map:transform>
  +    </map:resource>
  +  </map:resources>
     <!-- indicates what flowscript to attach to this sitemap -->
     <map:flow language="javascript">
       <map:script src="forms_flow_example.js"/>
     </map:flow>
  -
  - <map:pipelines>
  -   <map:pipeline>
  -
  -     <map:match pattern="">
  -      <map:generate src="welcome.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>
  -
  -    <!-- Flowscript Sample -->
  -
  -     <map:match pattern="example">
  -       <map:call function="example"/>
  -     </map:match>
  -
  -     <map:match pattern="*.continue">
  -       <map:call continuation="{1}"/>
  -     </map:match>
  -
  -     <map:match pattern="*-display-pipeline">
  -       <!-- pipeline to show the form -->
  -       <map:generate type="jx" src="{1}_template.xml"/>
  -       <map:transform type="forms"/>
  -       <map:transform type="i18n">
  -         <map:parameter name="locale" value="en-US"/>
  -       </map:transform>
  -       <map:call resource="simple-page2html">
  -         <map:parameter name="file" value="{1}_template.xml"/>
  -       </map:call>
  -       <map:transform src="../resources/forms-samples-styling.xsl">
  -         <map:parameter name="resources-uri" value="../resources"/>
  -        </map:transform>
  -       <map:serialize/>
  -     </map:match>
  -
  -     <map:match pattern="carselector-success-pipeline">
  -       <map:generate type="jx" src="carselector_success.jx"/>
  -       <map:call resource="simple-page2html">
  -         <map:parameter name="file" value="carselector_success.jx"/>
  -       </map:call>
  -       <map:serialize/>
  -     </map:match>
  -
  -     <map:match pattern="carselector">
  -       <map:select type="request-method">
  -         <map:when test="POST">
  -           <map:call continuation="{request-param:continuation-id}"/>
  -         </map:when>
  -         <map:otherwise>
  -           <map:call function="selectCar">
  -             <map:parameter name="defaultMake" value="Maserati"/>
  -           </map:call>
  -         </map:otherwise>
  -       </map:select>
  -     </map:match>
  -
  -     <map:match pattern="cars">
  -       <map:generate src="car-db.xml"/>
  -       <map:transform src="../xsl/carfilter.xsl">
  -         <map:parameter name="list" value="makes"/>
  -       </map:transform>
  -       <map:serialize type="xml"/>
  -     </map:match>
  -
  -     <map:match pattern="cars/*">
  -       <map:generate src="car-db.xml"/>
  -       <map:transform src="../xsl/carfilter.xsl">
  -         <map:parameter name="list" value="types"/>
  -         <map:parameter name="make" value="{1}"/>
  -       </map:transform>
  -       <map:serialize type="xml"/>
  -     </map:match>
  -
  -     
  -     <map:match pattern="cars/*/*">
  -       <map:generate src="car-db.xml"/>
  -       <map:transform src="../xsl/carfilter.xsl">
  -         <map:parameter name="list" value="models"/>
  -         <map:parameter name="make" value="{1}"/>
  -         <map:parameter name="type" value="{2}"/>
  -       </map:transform>
  -       <map:serialize type="xml"/>
  -     </map:match>
  -
  -   </map:pipeline>
  - </map:pipelines>
  -
  +  <map:pipelines>
  +    <map:pipeline>
  +      <map:match pattern="">
  +        <map:generate src="welcome.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>
  +      <!-- Flowscript Sample -->
  +      <map:match pattern="example">
  +        <map:call function="example"/>
  +      </map:match>
  +      <map:match pattern="*.continue">
  +        <map:call continuation="{1}"/>
  +      </map:match>
  +      <map:match pattern="*-display-pipeline">
  +        <!-- pipeline to show the form -->
  +        <map:generate type="jx" src="{1}_template.xml"/>
  +        <map:transform type="forms"/>
  +        <map:transform type="i18n">
  +          <map:parameter name="locale" value="en-US"/>
  +        </map:transform>
  +        <map:call resource="simple-page2html">
  +          <map:parameter name="file" value="{1}_template.xml"/>
  +        </map:call>
  +        <map:transform src="../resources/forms-samples-styling.xsl">
  +          <map:parameter name="resources-uri" value="../resources"/>
  +        </map:transform>
  +        <map:serialize/>
  +      </map:match>
  +      <map:match pattern="carselector-success-pipeline">
  +        <map:generate type="jx" src="carselector_success.jx"/>
  +        <map:call resource="simple-page2html">
  +          <map:parameter name="file" value="carselector_success.jx"/>
  +        </map:call>
  +        <map:serialize/>
  +      </map:match>
  +      <map:match pattern="carselector">
  +        <map:select type="request-method">
  +          <map:when test="POST">
  +            <map:call continuation="{request-param:continuation-id}"/>
  +          </map:when>
  +          <map:otherwise>
  +            <map:call function="selectCar">
  +              <map:parameter name="defaultMake" value="Maserati"/>
  +            </map:call>
  +          </map:otherwise>
  +        </map:select>
  +      </map:match>
  +      <map:match pattern="cars">
  +        <map:generate src="car-db.xml"/>
  +        <map:transform src="../xsl/carfilter.xsl">
  +          <map:parameter name="list" value="makes"/>
  +        </map:transform>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +      <map:match pattern="cars/*">
  +        <map:generate src="car-db.xml"/>
  +        <map:transform src="../xsl/carfilter.xsl">
  +          <map:parameter name="list" value="types"/>
  +          <map:parameter name="make" value="{1}"/>
  +        </map:transform>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +      <map:match pattern="cars/*/*">
  +        <map:generate src="car-db.xml"/>
  +        <map:transform src="../xsl/carfilter.xsl">
  +          <map:parameter name="list" value="models"/>
  +          <map:parameter name="make" value="{1}"/>
  +          <map:parameter name="type" value="{2}"/>
  +        </map:transform>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +    </map:pipeline>
  +  </map:pipelines>
   </map:sitemap>