You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/06/01 19:10:36 UTC

cvs commit: jakarta-turbine/xdocs/services intake-service.xml

jmcnally    01/06/01 10:10:35

  Modified:    docs/services intake-service.html
               xdocs/services intake-service.xml
  Log:
  update docs to use name/value pairs to specify rules
  
  Revision  Changes    Path
  1.20      +16 -16    jakarta-turbine/docs/services/intake-service.html
  
  Index: intake-service.html
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/docs/services/intake-service.html,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- intake-service.html	2001/05/20 01:28:36	1.19
  +++ intake-service.html	2001/06/01 17:10:31	1.20
  @@ -345,18 +345,18 @@
   <group name="AttributeValue" key="attv" 
               mapToObject="om.AttributeValue">
       <field name="Value" key="val" type="String">
  -        <rule maxLength="255">Value length cannot be > 255</rule>
  +        <rule name="maxLength" value="255">Value length cannot be > 255</rule>
           <required-message>This module requires data for this 
                             attribute.
           </required-message>
       </field>
       <field name="Url" key="url" type="String" mapToProperty="Value">
  -        <rule maxLength="255">Url length cannot be > 255</rule>
  -        <rule mask="^$|http.+">Please enter an url starting with "http"</rule>
  +        <rule name="maxLength" value="255">Url length cannot be > 255</rule>
  +        <rule name="mask" value="^$|http.+">Please enter an url starting with "http"</rule>
           <required-message>This module requires a valid url.</required-message>
       </field>
       <field name="OptionId" key="optionid" type="NumberKey">
  -        <rule mask="^$|[0-9]+">Please select a valid choice</rule>
  +        <rule name="mask" value="^$|[0-9]+">Please select a valid choice</rule>
           <required-message>This module requires that you select an option 
                             for this attribute.
           </required-message>
  @@ -365,11 +365,11 @@
   
   <group name="Login" key="login">
       <field name="Username" key="u" type="String">
  -        <rule minLength="1">Please enter an email address</rule>
  -        <rule mask=".+@.+\..+">Please enter a valid email address</rule>
  +        <rule name="minLength" value="1">Please enter an email address</rule>
  +        <rule name="mask" value=".+@.+\..+">Please enter a valid email address</rule>
       </field> 
       <field name="Password" key="p" type="String">
  -        <rule minLength="1">Please enter a password</rule>
  +        <rule name="minLength" value="1">Please enter a password</rule>
       </field>
   </group>
   
  @@ -472,11 +472,11 @@
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
   &lt;field name=&quot;Username&quot; key=&quot;u&quot; type=&quot;String&quot;&gt;
  -    &lt;rule minLength=&quot;1&quot;&gt;Please enter an email address&lt;/rule&gt;
  -    &lt;rule mask=&quot;.+@.+\..+&quot;&gt;Please enter a valid email address&lt;/rule&gt;
  +    &lt;rule name=&quot;minLength&quot; value=&quot;1&quot;&gt;Please enter an email address&lt;/rule&gt;
  +    &lt;rule name=&quot;mask&quot; value=&quot;.+@.+\..+&quot;&gt;Please enter a valid email address&lt;/rule&gt;
   &lt;/field&gt; 
   &lt;field name=&quot;Password&quot; key=&quot;p&quot; type=&quot;String&quot;&gt;
  -    &lt;rule minLength=&quot;1&quot;&gt;Please enter a password&lt;/rule&gt;
  +    &lt;rule name=&quot;minLength&quot; value=&quot;1&quot;&gt;Please enter a password&lt;/rule&gt;
   &lt;/field&gt;
   </pre></td>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
  @@ -837,14 +837,14 @@
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
   &lt;field name=&quot;Value&quot; key=&quot;val&quot; type=&quot;String&quot;&gt;
  -    &lt;rule maxLength=&quot;255&quot;&gt;Value length cannot be &amp;gt; 255&lt;/rule&gt;
  +    &lt;rule name=&quot;maxLength&quot; value=&quot;255&quot;&gt;Value length cannot be &amp;gt; 255&lt;/rule&gt;
       &lt;required-message&gt;This module requires data for this 
                         attribute.
       &lt;/required-message&gt;
   &lt;/field&gt;
   &lt;field name=&quot;Url&quot; key=&quot;url&quot; type=&quot;String&quot; mapToProperty=&quot;Value&quot;&gt;
  -    &lt;rule maxLength=&quot;255&quot;&gt;Url length cannot be &amp;gt; 255&lt;/rule&gt;
  -    &lt;rule mask=&quot;^$|http.+&quot;&gt;Please enter an url starting with &quot;http&quot;&lt;/rule&gt;
  +    &lt;rule name=&quot;maxLength&quot; value=&quot;255&quot;&gt;Url length cannot be &amp;gt; 255&lt;/rule&gt;
  +    &lt;rule name=&quot;mask&quot; value=&quot;^$|http.+&quot;&gt;Please enter an url starting with &quot;http&quot;&lt;/rule&gt;
       &lt;required-message&gt;This module requires a valid url.&lt;/required-message&gt;
   &lt;/field&gt;
   </pre></td>
  @@ -1016,14 +1016,14 @@
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
       &lt;field name=&quot;Value&quot; key=&quot;val&quot; type=&quot;String&quot;&gt;
  -        &lt;rule maxLength=&quot;255&quot;&gt;Value length cannot be &amp;gt; 255&lt;/rule&gt;
  +        &lt;rule name=&quot;maxLength&quot; value=&quot;255&quot;&gt;Value length cannot be &amp;gt; 255&lt;/rule&gt;
           &lt;required-message&gt;This module requires data for this 
                             attribute.
           &lt;/required-message&gt;
       &lt;/field&gt;
       &lt;field name=&quot;Url&quot; key=&quot;url&quot; type=&quot;String&quot; mapToProperty=&quot;Value&quot;&gt;
  -        &lt;rule maxLength=&quot;255&quot;&gt;Url length cannot be &amp;gt; 255&lt;/rule&gt;
  -        &lt;rule mask=&quot;^$|http.+&quot;&gt;Please enter an url starting with &quot;http&quot;&lt;/rule&gt;
  +        &lt;rule name=&quot;maxLength&quot; value=&quot;255&quot;&gt;Url length cannot be &amp;gt; 255&lt;/rule&gt;
  +        &lt;rule name=&quot;mask&quot; value=&quot;^$|http.+&quot;&gt;Please enter an url starting with &quot;http&quot;&lt;/rule&gt;
           &lt;required-message&gt;This module requires a valid url.&lt;/required-message&gt;
       &lt;/field&gt;
   </pre></td>
  
  
  
  1.7       +16 -16    jakarta-turbine/xdocs/services/intake-service.xml
  
  Index: intake-service.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/xdocs/services/intake-service.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- intake-service.xml	2001/05/13 19:39:50	1.6
  +++ intake-service.xml	2001/06/01 17:10:34	1.7
  @@ -126,18 +126,18 @@
   <group name="AttributeValue" key="attv" 
               mapToObject="om.AttributeValue">
       <field name="Value" key="val" type="String">
  -        <rule maxLength="255">Value length cannot be &gt; 255</rule>
  +        <rule name="maxLength" value="255">Value length cannot be &gt; 255</rule>
           <required-message>This module requires data for this 
                             attribute.
           </required-message>
       </field>
       <field name="Url" key="url" type="String" mapToProperty="Value">
  -        <rule maxLength="255">Url length cannot be &gt; 255</rule>
  -        <rule mask="^$|http.+">Please enter an url starting with "http"</rule>
  +        <rule name="maxLength" value="255">Url length cannot be &gt; 255</rule>
  +        <rule name="mask" value="^$|http.+">Please enter an url starting with "http"</rule>
           <required-message>This module requires a valid url.</required-message>
       </field>
       <field name="OptionId" key="optionid" type="NumberKey">
  -        <rule mask="^$|[0-9]+">Please select a valid choice</rule>
  +        <rule name="mask" value="^$|[0-9]+">Please select a valid choice</rule>
           <required-message>This module requires that you select an option 
                             for this attribute.
           </required-message>
  @@ -146,11 +146,11 @@
   
   <group name="Login" key="login">
       <field name="Username" key="u" type="String">
  -        <rule minLength="1">Please enter an email address</rule>
  -        <rule mask=".+@.+\..+">Please enter a valid email address</rule>
  +        <rule name="minLength" value="1">Please enter an email address</rule>
  +        <rule name="mask" value=".+@.+\..+">Please enter a valid email address</rule>
       </field> 
       <field name="Password" key="p" type="String">
  -        <rule minLength="1">Please enter a password</rule>
  +        <rule name="minLength" value="1">Please enter a password</rule>
       </field>
   </group>
   
  @@ -212,11 +212,11 @@
   
   <source><![CDATA[
   <field name="Username" key="u" type="String">
  -    <rule minLength="1">Please enter an email address</rule>
  -    <rule mask=".+@.+\..+">Please enter a valid email address</rule>
  +    <rule name="minLength" value="1">Please enter an email address</rule>
  +    <rule name="mask" value=".+@.+\..+">Please enter a valid email address</rule>
   </field> 
   <field name="Password" key="p" type="String">
  -    <rule minLength="1">Please enter a password</rule>
  +    <rule name="minLength" value="1">Please enter a password</rule>
   </field>
   ]]></source>
   
  @@ -493,14 +493,14 @@
   
   <source><![CDATA[
   <field name="Value" key="val" type="String">
  -    <rule maxLength="255">Value length cannot be &gt; 255</rule>
  +    <rule name="maxLength" value="255">Value length cannot be &gt; 255</rule>
       <required-message>This module requires data for this 
                         attribute.
       </required-message>
   </field>
   <field name="Url" key="url" type="String" mapToProperty="Value">
  -    <rule maxLength="255">Url length cannot be &gt; 255</rule>
  -    <rule mask="^$|http.+">Please enter an url starting with "http"</rule>
  +    <rule name="maxLength" value="255">Url length cannot be &gt; 255</rule>
  +    <rule name="mask" value="^$|http.+">Please enter an url starting with "http"</rule>
       <required-message>This module requires a valid url.</required-message>
   </field>
   ]]></source>
  @@ -612,14 +612,14 @@
   
   <source><![CDATA[
       <field name="Value" key="val" type="String">
  -        <rule maxLength="255">Value length cannot be &gt; 255</rule>
  +        <rule name="maxLength" value="255">Value length cannot be &gt; 255</rule>
           <required-message>This module requires data for this 
                             attribute.
           </required-message>
       </field>
       <field name="Url" key="url" type="String" mapToProperty="Value">
  -        <rule maxLength="255">Url length cannot be &gt; 255</rule>
  -        <rule mask="^$|http.+">Please enter an url starting with "http"</rule>
  +        <rule name="maxLength" value="255">Url length cannot be &gt; 255</rule>
  +        <rule name="mask" value="^$|http.+">Please enter an url starting with "http"</rule>
           <required-message>This module requires a valid url.</required-message>
       </field>
   ]]></source>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org