You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by iv...@apache.org on 2002/07/28 16:08:26 UTC

cvs commit: xml-cocoon2/src/webapp/samples/xmlform/wizard confirm.xml deployment.xml system.xml userIdentity.xml

ivelin      2002/07/28 07:08:26

  Modified:    src/webapp/samples/xmlform/wizard confirm.xml deployment.xml
                        system.xml userIdentity.xml
  Added:       src/webapp/samples/xmlform/webservice error.xml ok.xml
                        usagefeedback.wsdl
  Log:
  added WSDL and REST style Web Service support for the XMLForm demo
  
  Revision  Changes    Path
  1.1                  xml-cocoon2/src/webapp/samples/xmlform/webservice/error.xml
  
  Index: error.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- 
      XMLForm instance document for the Cocoon Usage Feedback Web Service.
      Author: Ivelin Ivanov, ivelin@apache.org, July 2002
  -->
  
  <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
    <error>
  	  <xf:violations form="form-feedback"/>
    </error>
  </document>
  
  
  
  1.1                  xml-cocoon2/src/webapp/samples/xmlform/webservice/ok.xml
  
  Index: ok.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- 
      XMLForm instance document for the Cocoon Usage Feedback Web Service.
      Author: Ivelin Ivanov, ivelin@apache.org, July 2002
  -->
  
  <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
    <ok/>
  </document>
  
  
  
  1.1                  xml-cocoon2/src/webapp/samples/xmlform/webservice/usagefeedback.wsdl
  
  Index: usagefeedback.wsdl
  ===================================================================
  <?xml version="1.0" encoding="utf-8"?>
  <!--
    WSDL Descriptor for the Cocoon Usage Feedback demo application exposed as a 
    Web Service (REST style).
  -->
  
  <definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:s0="http://www.cocoonhive.org/cocoonbook/2002/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://www.cocoonhive.org/cocoonbook/2002/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/
  http://schemas.xmlsoap.org/wsdl/">
    <!-- 
    The root WSDL element references a set of related standards 
    which you may not be familiar with.
    Do not worry, this most probably means that you do not need them yet.
  -->
    <!-- First we will describe the input parameters -->
    <message name="UsageFeedbackHttpGetIn">
      <!-- 
        Usually request parameters are of type xsd:string.
        However, a more restricting type can be used if the WSDL file is accompanied by
        an XML Schema document which enumerates the constraints.
        For example regular expression patterns, enumerations and number precision 
        can be enforced with custom types.
        -->
      <part name="firstName" type="xsd:string"/>
      <part name="lastName" type="xsd:string"/>
      <part name="email" type="xsd:string"/>
      <part name="age" type="xsd:nonNegativeInteger"/>
      <!-- 
      The "hobby" element is interesting in that it has one parameter name with multiple values. 
      It is well described with the XForms selectMany element, but I am not aware of a way to express this with WSDL means. Therefore, alternative avenues, like this remark, need to be used to annotate the parameter type.  
      -->
      <part name="hobby" type="xsd:string"/>
      <part name="favorite[1]" type="xsd:string"/>
      <part name="favorite[2]" type="xsd:string"/>
      <part name="favorite[3]" type="xsd:string"/>
      <part name="hidden" type="xsd:boolean"/>
      <part name="number" type="xsd:string"/>
      <part name="liveUrl" type="xsd:string"/>
      <part name="publish" type="xsd:boolean"/>
      <part name="system/os" type="xsd:string"/>
      <part name="system/processor" type="xsd:string"/>
      <part name="system/@ram" type="xsd:nonNegativeInteger"/>
      <part name="system/servletEngine" type="xsd:string"/>
      <part name="system/javaVersion" type="xsd:string"/>
    </message>
    <!-- Next, we define the format of the output message -->
    <message name="UsageFeedbackHttpGetOut">
      <part name="Body" element="html:html"/>
    </message>
    <portType name="UsageFeedbackHttpGet">
      <operation name="UsageFeedback">
        <documentation>
          Returns document with OK or Error message in XML format.  
          If the operation succeeds the output document will be:
          <![CDATA[
          <document>
            <ok/>
          </document>
          ]]>
          Otherwise the response will look similar to:
          <![CDATA[
          <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
            <error>
              <xf:violation ref="/lastName">Last name should be at least 4 characters.</xf:violation> 
            </error>
          </document>
          ]]></documentation>
        <input message="s0:HelloWorldHttpGetIn"/>
        <output message="s0:HelloWorldHttpGetOut"/>
      </operation>
    </portType>
    <!-- 
      This WSDL file describes only one REST resource - WSUsageFeedback
      accesible via HttpGet.
      The complete URI of the resource is 
       http://localhost:8080/cocoon/samples/xmlform/wizard/UsageFeedbackService?firstName=...
    -->
    <binding name="UsageFeedbackHttpGet" type="s0:UsageFeedbackHttpGet">
      <http:binding verb="GET"/>
      <operation name="WSUsageFeedback">
        <http:operation location="/UsageFeedbackService"/>
        <input>
          <http:urlEncoded/>
        </input>
        <output>
          <mime:mimeXml part="Body"/>
        </output>
      </operation>
    </binding>
    <service name="UsageFeedback">
      <port name="UsageFeedbackHttpGet" binding="s0:UsageFeedbackHttpGet">
        <http:address location="http://localhost:8080/cocoon/samples/xmlform"/>
      </port>
    </service>
  </definitions>
  
  
  
  1.4       +39 -77    xml-cocoon2/src/webapp/samples/xmlform/wizard/confirm.xml
  
  Index: confirm.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/confirm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- confirm.xml	4 Jul 2002 20:57:48 -0000	1.3
  +++ confirm.xml	28 Jul 2002 14:08:26 -0000	1.4
  @@ -1,5 +1,4 @@
  -<?xml version="1.0" ?>
  -
  +<?xml version="1.0"?>
   <!-- 
   
   	XMLForm instance document for the Cocoon Feedback Wizard.
  @@ -8,118 +7,81 @@
     Author: Ivelin Ivanov, ivelin@apache.org, April 2002
   
   -->
  -
   <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  -
  -
     <xf:form id="form-feedback" view="confirm" action="wizard">
  -
  -  
  -    <xf:caption>Confirm Input</xf:caption>    
  -
  -  
  +    <xf:caption>Confirm Input</xf:caption>
       <!-- from page1 -->
  -
  -    <xf:output ref="/firstName">
  -        <xf:caption>First Name</xf:caption>    
  +    <xf:output ref="firstName">
  +      <xf:caption>First Name</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/lastName">
  -        <xf:caption>Last Name</xf:caption>    
  +    <xf:output ref="lastName">
  +      <xf:caption>Last Name</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/email">
  -        <xf:caption>Email</xf:caption>    
  +    <xf:output ref="email">
  +      <xf:caption>Email</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/age">
  -        <xf:caption>Age</xf:caption>
  -        <xf:violations class="error"/>
  +    <xf:output ref="age">
  +      <xf:caption>Age</xf:caption>
  +      <xf:violations class="error"/>
       </xf:output>
  -
       <xf:group ref="/">
         <xf:caption>Professional roles</xf:caption>
  -      <xf:repeat nodeset="/role">
  +      <xf:repeat nodeset="role">
           <xf:output ref="."/>
         </xf:repeat>
       </xf:group>
  -
       <xf:group ref="/">
         <xf:caption>Personal hobbies</xf:caption>
  -      <xf:repeat nodeset="/hobby">
  +      <xf:repeat nodeset="hobby">
           <xf:output ref="."/>
         </xf:repeat>
       </xf:group>
  -    
  -    <xf:output ref="/hidden">
  +    <xf:output ref="hidden">
         <xf:caption>Hidden attribute</xf:caption>
       </xf:output>
  -    
  -   <!-- from page2 -->
  -    
  -    <xf:output ref="/number">
  -        <xf:caption>Number of installations</xf:caption>    
  +    <!-- from page2 -->
  +    <xf:output ref="number">
  +      <xf:caption>Number of installations</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/liveUrl">
  -        <xf:caption>Live URL</xf:caption>    
  +    <xf:output ref="liveUrl">
  +      <xf:caption>Live URL</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/publish">
  -        <xf:caption>Publish URL</xf:caption>    
  +    <xf:output ref="publish">
  +      <xf:caption>Publish URL</xf:caption>
       </xf:output>
  -  
  -    
       <!-- from page3 -->
  -
  -
  -    <xf:output ref="/system/os">
  -        <xf:caption>OS</xf:caption>    
  +    <xf:output ref="system/os">
  +      <xf:caption>OS</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/system/processor">
  -        <xf:caption>Processor</xf:caption>    
  +    <xf:output ref="system/processor">
  +      <xf:caption>Processor</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/system/@ram">
  -        <xf:caption>RAM</xf:caption>    
  +    <xf:output ref="system/@ram">
  +      <xf:caption>RAM</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/system/servletEngine">
  -        <xf:caption>Servlet Engine</xf:caption>    
  +    <xf:output ref="system/servletEngine">
  +      <xf:caption>Servlet Engine</xf:caption>
       </xf:output>
  -
  -    <xf:output ref="/system/javaVersion">
  -        <xf:caption>Java Version</xf:caption>    
  +    <xf:output ref="system/javaVersion">
  +      <xf:caption>Java Version</xf:caption>
       </xf:output>
  -            
  -    
  -    
       <xf:group ref="/" id="favorites_group">
  -        <xf:caption>Favorite web sites</xf:caption>    
  -        <xf:repeat nodeset="/favorite[position() &lt;= 3]" id="favorites">
  -            <xf:output ref="." class="info">
  -                <xf:caption>URL: </xf:caption>
  -            </xf:output>                
  -        </xf:repeat>
  +      <xf:caption>Favorite web sites</xf:caption>
  +      <xf:repeat nodeset="favorite[position() &lt;= 3]" id="favorites">
  +        <xf:output ref="." class="info">
  +          <xf:caption>URL: </xf:caption>
  +        </xf:output>
  +      </xf:repeat>
       </xf:group>
  -
  -
       <!-- submit -->
  -      
       <xf:submit id="prev" class="button">
         <xf:caption>Prev</xf:caption>
       </xf:submit>
  -    
       <xf:submit id="next" class="button">
         <xf:caption>Finish</xf:caption>
       </xf:submit>
  -
     </xf:form>
  -
  -
  -  <xf:output ref="/count" id="show_count" form="form-feedback" class="info">
  -        <xf:caption>Visits Count</xf:caption>
  +  <xf:output ref="count" id="show_count" form="form-feedback" class="info">
  +    <xf:caption>Visits Count</xf:caption>
     </xf:output>
  -  
   </document>
  
  
  
  1.4       +19 -45    xml-cocoon2/src/webapp/samples/xmlform/wizard/deployment.xml
  
  Index: deployment.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/deployment.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- deployment.xml	4 Jul 2002 20:57:48 -0000	1.3
  +++ deployment.xml	28 Jul 2002 14:08:26 -0000	1.4
  @@ -1,7 +1,4 @@
  -<?xml version="1.0" ?>
  -
  -
  -
  +<?xml version="1.0"?>
   <!-- 
   
   	XMLForm instance document for the Cocoon Feedback Wizard.
  @@ -10,37 +7,26 @@
     Author: Ivelin Ivanov, ivelin@apache.org, April 2002
   
   -->
  -
   <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  -
     <xf:form id="form-feedback" view="deployment" action="wizard" method="GET">
  -
  -    <xf:caption>Cocoon Deployment Information</xf:caption>    
  -
  +    <xf:caption>Cocoon Deployment Information</xf:caption>
       <error>
         <xf:violations class="error"/>
       </error>
  -  
  -    <xf:textbox ref="/number">
  -        <xf:caption>Number of deployments</xf:caption>    
  -        <xf:violations class="error"/>
  +    <xf:textbox ref="number">
  +      <xf:caption>Number of deployments</xf:caption>
  +      <xf:violations class="error"/>
       </xf:textbox>
  -
  -    <xf:textbox ref="/liveUrl">
  -        <xf:caption>Live URL</xf:caption>    
  -        <xf:violations class="error"/>
  +    <xf:textbox ref="liveUrl">
  +      <xf:caption>Live URL</xf:caption>
  +      <xf:violations class="error"/>
       </xf:textbox>
  -
  -    <xf:selectBoolean ref="/publish">
  -        <xf:caption>Publish</xf:caption>    
  +    <xf:selectBoolean ref="publish">
  +      <xf:caption>Publish</xf:caption>
       </xf:selectBoolean>
  -
  -    
       <xf:group nodeset="" id="favorites_group">
  -
  -        <xf:caption>Favorite web sites</xf:caption>    
  -        
  -        <!-- 
  +      <xf:caption>Favorite web sites</xf:caption>
  +      <!-- 
             repeat is a very powerful iterator tag,
             because it iterates over a nodeset resulting from
             a the nodeset selector attribute.
  @@ -49,32 +35,20 @@
             In this case we iterate over the top three favorite
             web sites.
           -->
  -
  -        <xf:repeat nodeset="/favorite[position() &lt;= 3]" id="favorites">
  -
  -            <xf:textbox ref="." class="info">
  -                <xf:caption>URL: </xf:caption>
  -            </xf:textbox>                
  -
  -        </xf:repeat>
  -
  +      <xf:repeat nodeset="favorite[position() &lt;= 3]" id="favorites">
  +        <xf:textbox ref="." class="info">
  +          <xf:caption>URL: </xf:caption>
  +        </xf:textbox>
  +      </xf:repeat>
       </xf:group>
  -    
       <xf:submit id="prev" class="button">
         <xf:caption>Prev</xf:caption>
       </xf:submit>
  -
       <xf:submit id="next" class="button">
         <xf:caption>Next</xf:caption>
       </xf:submit>
  -
     </xf:form>
  -
  -
  -  <xf:output ref="/count" id="show_count" form="form-feedback" class="info">
  -        <xf:caption>Visits Count</xf:caption>
  +  <xf:output ref="count" id="show_count" form="form-feedback" class="info">
  +    <xf:caption>Visits Count</xf:caption>
     </xf:output>
  -  
   </document>
  -
  -
  
  
  
  1.5       +105 -126  xml-cocoon2/src/webapp/samples/xmlform/wizard/system.xml
  
  Index: system.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/system.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- system.xml	4 Jul 2002 20:57:48 -0000	1.4
  +++ system.xml	28 Jul 2002 14:08:26 -0000	1.5
  @@ -1,7 +1,4 @@
  -<?xml version="1.0" ?>
  -
  -
  -
  +<?xml version="1.0"?>
   <!-- 
   
   	XMLForm instance document for the Cocoon Feedback Wizard.
  @@ -10,140 +7,122 @@
     Author: Ivelin Ivanov, ivelin@apache.org, April 2002
   
   -->
  -
   <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  -
  -
     <xf:form id="form-feedback" view="system" action="wizard" method="GET">
  -
  -    <xf:caption>System Information</xf:caption>    
  -  
  +    <xf:caption>System Information</xf:caption>
       <error>
         <xf:violations class="error"/>
       </error>
  -  
  -    <xf:group ref="/system">
  -    
  -        <xf:selectOne ref="os" selectUIType='radio'>
  -            <xf:caption>OS</xf:caption>
  -            <xf:item id="unix">
  -                <xf:caption>Unix/Linux</xf:caption>
  -                <xf:value>Unix</xf:value>
  -            </xf:item>
  -            <xf:item id="mac">
  -                <xf:caption>Mac OS/X</xf:caption>
  -                <xf:value>Mac OS/X</xf:value>
  -            </xf:item>
  -            <xf:item id="win">
  -                <xf:caption>Windows 95/98/NT/2000</xf:caption>
  -                <xf:value>Windows</xf:value>
  -            </xf:item>
  -            <xf:item id="other">
  -                <xf:caption>Other</xf:caption>
  -                <xf:value>Other</xf:value>
  -            </xf:item>
  -        </xf:selectOne>
  -
  -        <xf:selectOne ref="processor">
  -            <xf:caption>Processor</xf:caption>    
  -            <xf:item>
  -                <xf:caption>AMD/Athlon</xf:caption>
  -                <xf:value>Athlon</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>AMD/Duron</xf:caption>
  -                <xf:value>Duron</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Pentium Celeron</xf:caption>
  -                <xf:value>Celeron</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Pentium III</xf:caption>
  -                <xf:value>p3</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Pentium IV</xf:caption>
  -                <xf:value>p4</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Other</xf:caption>
  -                <xf:value>other</xf:value>
  -            </xf:item>
  -        </xf:selectOne>
  -
  -        <xf:textbox ref="@ram">
  -            <xf:caption>RAM</xf:caption>    
  -            <xf:violations class="error"/>
  -        </xf:textbox>
  -
  -        <xf:selectOne ref="servletEngine">
  -            <xf:caption>Servlet Engine</xf:caption>    
  -            <xf:item>
  -                <xf:caption>Tomcat</xf:caption>
  -                <xf:value>Tomcat</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Jetty</xf:caption>
  -                <xf:value>Jetty</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Resin</xf:caption>
  -                <xf:value>Resin</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Weblogic</xf:caption>
  -                <xf:value>weblogic</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>WebSphere</xf:caption>
  -                <xf:value>WebSphere</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Other</xf:caption>
  -                <xf:value>other</xf:value>
  -            </xf:item>
  -        </xf:selectOne>
  -
  -        <xf:selectOne ref="javaVersion">
  -            <xf:caption>Java Version</xf:caption>    
  -            <xf:item>
  -                <xf:caption>1.1</xf:caption>
  -                <xf:value>1.1</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>1.2</xf:caption>
  -                <xf:value>1.2</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>1.3</xf:caption>
  -                <xf:value>1.3</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>1.4</xf:caption>
  -                <xf:value>1.4</xf:value>
  -            </xf:item>
  -            <xf:item>
  -                <xf:caption>Other</xf:caption>
  -                <xf:value>Other</xf:value>
  -            </xf:item>
  -        </xf:selectOne>
  -
  +    <xf:group ref="system">
  +      <xf:selectOne ref="os" selectUIType="radio">
  +        <xf:caption>OS</xf:caption>
  +        <xf:item id="unix">
  +          <xf:caption>Unix/Linux</xf:caption>
  +          <xf:value>Unix</xf:value>
  +        </xf:item>
  +        <xf:item id="mac">
  +          <xf:caption>Mac OS/X</xf:caption>
  +          <xf:value>Mac OS/X</xf:value>
  +        </xf:item>
  +        <xf:item id="win">
  +          <xf:caption>Windows 95/98/NT/2000</xf:caption>
  +          <xf:value>Windows</xf:value>
  +        </xf:item>
  +        <xf:item id="other">
  +          <xf:caption>Other</xf:caption>
  +          <xf:value>Other</xf:value>
  +        </xf:item>
  +      </xf:selectOne>
  +      <xf:selectOne ref="processor">
  +        <xf:caption>Processor</xf:caption>
  +        <xf:item>
  +          <xf:caption>AMD/Athlon</xf:caption>
  +          <xf:value>Athlon</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>AMD/Duron</xf:caption>
  +          <xf:value>Duron</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Pentium Celeron</xf:caption>
  +          <xf:value>Celeron</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Pentium III</xf:caption>
  +          <xf:value>p3</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Pentium IV</xf:caption>
  +          <xf:value>p4</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Other</xf:caption>
  +          <xf:value>other</xf:value>
  +        </xf:item>
  +      </xf:selectOne>
  +      <xf:textbox ref="@ram">
  +        <xf:caption>RAM</xf:caption>
  +        <xf:violations class="error"/>
  +      </xf:textbox>
  +      <xf:selectOne ref="servletEngine">
  +        <xf:caption>Servlet Engine</xf:caption>
  +        <xf:item>
  +          <xf:caption>Tomcat</xf:caption>
  +          <xf:value>Tomcat</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Jetty</xf:caption>
  +          <xf:value>Jetty</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Resin</xf:caption>
  +          <xf:value>Resin</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Weblogic</xf:caption>
  +          <xf:value>weblogic</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>WebSphere</xf:caption>
  +          <xf:value>WebSphere</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Other</xf:caption>
  +          <xf:value>other</xf:value>
  +        </xf:item>
  +      </xf:selectOne>
  +      <xf:selectOne ref="javaVersion">
  +        <xf:caption>Java Version</xf:caption>
  +        <xf:item>
  +          <xf:caption>1.1</xf:caption>
  +          <xf:value>1.1</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>1.2</xf:caption>
  +          <xf:value>1.2</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>1.3</xf:caption>
  +          <xf:value>1.3</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>1.4</xf:caption>
  +          <xf:value>1.4</xf:value>
  +        </xf:item>
  +        <xf:item>
  +          <xf:caption>Other</xf:caption>
  +          <xf:value>Other</xf:value>
  +        </xf:item>
  +      </xf:selectOne>
       </xf:group>
  -        
       <xf:submit id="prev" class="button">
         <xf:caption>Prev</xf:caption>
       </xf:submit>
  -
       <xf:submit id="next" class="button">
         <xf:caption>Next</xf:caption>
       </xf:submit>
  -
     </xf:form>
  -
  -
  -  <xf:output ref="/count" id="show_count" form="form-feedback" class="info">
  -        <xf:caption>Visits Count</xf:caption>
  +  <xf:output ref="count" id="show_count" form="form-feedback" class="info">
  +    <xf:caption>Visits Count</xf:caption>
     </xf:output>
  -  
   </document>
  
  
  
  1.5       +96 -118   xml-cocoon2/src/webapp/samples/xmlform/wizard/userIdentity.xml
  
  Index: userIdentity.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/userIdentity.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- userIdentity.xml	4 Jul 2002 20:57:48 -0000	1.4
  +++ userIdentity.xml	28 Jul 2002 14:08:26 -0000	1.5
  @@ -1,143 +1,121 @@
  -<?xml version="1.0" ?>
  -
  -
  +<?xml version="1.0"?>
   <!-- 
   
   	XMLForm instance document for the Cocoon Feedback Wizard.
   
  - 	Original Author: Torsten Curdt, tcurdt@dff.st, March 2002
  -    Author: Ivelin Ivanov, ivelin@apache.org, April 2002
  +    Author: Ivelin Ivanov, ivelin@apache.org, July 2002
  + 	Author: Torsten Curdt, tcurdt@dff.st, March 2002
   
   -->
  -
   <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  -
  -
     <xf:form id="form-feedback" view="userIdentity" action="wizard" method="GET">
  -
  -    <xf:caption>Personal Information</xf:caption>    
  -
  +    <xf:caption>Personal Information</xf:caption>
       <error>
         <xf:violations class="error"/>
       </error>
  -  
  -    <xf:textbox ref="/firstName">
  -        <xf:caption>First Name</xf:caption>    
  -        <xf:violations class="error"/>
  +    <xf:textbox ref="firstName">
  +      <xf:caption>First Name</xf:caption>
  +      <xf:violations class="error"/>
       </xf:textbox>
  -
  -    <xf:textbox ref="/lastName">
  -        <xf:caption>Last Name</xf:caption>    
  -        <xf:violations class="error"/>
  +    <xf:textbox ref="lastName">
  +      <xf:caption>Last Name</xf:caption>
  +      <xf:violations class="error"/>
       </xf:textbox>
  -
  -    <xf:textbox ref="/email">
  -        <xf:caption>Email</xf:caption>    
  -        <xf:violations class="error"/>
  +    <xf:textbox ref="email">
  +      <xf:caption>Email</xf:caption>
  +      <xf:violations class="error"/>
       </xf:textbox>
  -
  -    <xf:textbox ref="/age">
  -        <xf:caption>Age</xf:caption>
  -        <xf:violations class="error"/>
  +    <xf:textbox ref="age">
  +      <xf:caption>Age</xf:caption>
  +      <xf:violations class="error"/>
       </xf:textbox>
  -
  -    <xf:selectMany ref="/role" selectUIType='listbox'>
  -        <xf:caption>Professional roles</xf:caption>
  -        <xf:item>
  -            <xf:caption>Geek</xf:caption>
  -            <xf:value>Geek</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Hacker</xf:caption>
  -            <xf:value>Hacker</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Student</xf:caption>
  -            <xf:value>Student</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>University Professor</xf:caption>
  -            <xf:value>University Professor</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Software Developer</xf:caption>
  -            <xf:value>Developer</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Technical Leader</xf:caption>
  -            <xf:value>Tech Lead</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Development Manager</xf:caption>
  -            <xf:value>Development Manager</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Executive</xf:caption>
  -            <xf:value>Executive</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Heir of the Apache tribe</xf:caption>
  -            <xf:value>Heir of the Apache tribe</xf:value>
  -        </xf:item>        
  +    <xf:selectMany ref="role" selectUIType="listbox">
  +      <xf:caption>Professional roles</xf:caption>
  +      <xf:item>
  +        <xf:caption>Geek</xf:caption>
  +        <xf:value>Geek</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Hacker</xf:caption>
  +        <xf:value>Hacker</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Student</xf:caption>
  +        <xf:value>Student</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>University Professor</xf:caption>
  +        <xf:value>University Professor</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Software Developer</xf:caption>
  +        <xf:value>Developer</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Technical Leader</xf:caption>
  +        <xf:value>Tech Lead</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Development Manager</xf:caption>
  +        <xf:value>Development Manager</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Executive</xf:caption>
  +        <xf:value>Executive</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Heir of the Apache tribe</xf:caption>
  +        <xf:value>Heir of the Apache tribe</xf:value>
  +      </xf:item>
       </xf:selectMany>
  -
  -    <xf:selectMany ref="/hobby" selectUIType='checkbox'>
  -        <xf:caption>Hobbies</xf:caption>
  -        <xf:item>
  -            <xf:caption>Swimming</xf:caption>
  -            <xf:value>swim</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Body Building</xf:caption>
  -            <xf:value>gym</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Skiing</xf:caption>
  -            <xf:value>ski</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Running</xf:caption>
  -            <xf:value>run</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Football</xf:caption>
  -            <xf:value>football</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Reading</xf:caption>
  -            <xf:value>read</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Writing</xf:caption>
  -            <xf:value>write</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Soccer</xf:caption>
  -            <xf:value>soccer</xf:value>
  -        </xf:item>        
  -        <xf:item>
  -            <xf:caption>Blogging</xf:caption>
  -            <xf:value>blog</xf:value>
  -        </xf:item>        
  +    <xf:selectMany ref="hobby" selectUIType="checkbox">
  +      <xf:caption>Hobbies</xf:caption>
  +      <xf:item>
  +        <xf:caption>Swimming</xf:caption>
  +        <xf:value>swim</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Body Building</xf:caption>
  +        <xf:value>gym</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Skiing</xf:caption>
  +        <xf:value>ski</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Running</xf:caption>
  +        <xf:value>run</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Football</xf:caption>
  +        <xf:value>football</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Reading</xf:caption>
  +        <xf:value>read</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Writing</xf:caption>
  +        <xf:value>write</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Soccer</xf:caption>
  +        <xf:value>soccer</xf:value>
  +      </xf:item>
  +      <xf:item>
  +        <xf:caption>Blogging</xf:caption>
  +        <xf:value>blog</xf:value>
  +      </xf:item>
       </xf:selectMany>
  -
       <!-- hidden model attribute -->
  -    <xf:hidden ref="/hidden">
  +    <xf:hidden ref="hidden">
         <xf:value>true</xf:value>
       </xf:hidden>
  -    
  -    <xf:submit id="next" class="button"> 
  +    <xf:submit id="next" class="button">
         <xf:caption>Next</xf:caption>
       </xf:submit>
  -
     </xf:form>
  -
  -
  -  <xf:output ref="/count" id="show_count" form="form-feedback" class="info">
  -        <xf:caption>Visits Count</xf:caption>
  +  <xf:output ref="count" id="show_count" form="form-feedback" class="info">
  +    <xf:caption>Visits Count</xf:caption>
     </xf:output>
  -  
   </document>
  -
  -
  -
  
  
  

----------------------------------------------------------------------
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