tim         2004/02/05 12:37:41

  Modified:    src/blocks/woody/conf woody-datatype.xconf
                        woody-datatype.xroles
  Added:       src/blocks/woody/conf woody-selection-lists.xconf
                        woody-selection-lists.xroles woody-validators.xconf
                        woody-validators.xroles
  Log:
  Splitting woody's selection list and validator config and roles
  into separate files with separate xpatch matchers.
  
  Revision  Changes    Path
  1.11      +0 -18     cocoon-2.1/src/blocks/woody/conf/woody-datatype.xconf
  
  Index: woody-datatype.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-datatype.xconf,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- woody-datatype.xconf      4 Feb 2004 17:25:57 -0000       1.10
  +++ woody-datatype.xconf      5 Feb 2004 20:37:41 -0000       1.11
  @@ -65,22 +65,4 @@
       </validation-rules>
     </woody-datatype>
     
  -  <woody-selection-lists default="default">
  -    <selection-list name="default" 
class="org.apache.cocoon.woody.datatype.DefaultSelectionListBuilder"/>
  -    <selection-list name="flow-jxpath" 
class="org.apache.cocoon.woody.datatype.FlowJXPathSelectionListBuilder"/>
  -    <selection-list name="enum" 
class="org.apache.cocoon.woody.datatype.EnumSelectionListBuilder"/>
  -  </woody-selection-lists>
  -  
  -  <woody-validators>
  -    <!-- new-style validators -->
  -    <validator name="javascript" 
class="org.apache.cocoon.woody.validation.impl.JavaScriptValidatorBuilder"/>
  -    <validator name="length" 
class="org.apache.cocoon.woody.validation.impl.LengthValidatorBuilder"/>
  -    <validator name="email" 
class="org.apache.cocoon.woody.validation.impl.EmailValidatorBuilder"/>
  -    <validator name="value-count" 
class="org.apache.cocoon.woody.validation.impl.ValueCountValidatorBuilder"/>
  -    <validator name="range" 
class="org.apache.cocoon.woody.validation.impl.RangeValidatorBuilder"/>
  -    <validator name="assert" 
class="org.apache.cocoon.woody.validation.impl.AssertValidatorBuilder"/>
  -    <validator name="mod10" 
class="org.apache.cocoon.woody.validation.impl.Mod10ValidatorBuilder"/>
  -    <validator name="regexp" 
class="org.apache.cocoon.woody.validation.impl.RegExpValidatorBuilder"/>
  -  </woody-validators>
  -
   </xconf>
  
  
  
  1.5       +0 -8      cocoon-2.1/src/blocks/woody/conf/woody-datatype.xroles
  
  Index: woody-datatype.xroles
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-datatype.xroles,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- woody-datatype.xroles     4 Feb 2004 17:25:57 -0000       1.4
  +++ woody-datatype.xroles     5 Feb 2004 20:37:41 -0000       1.5
  @@ -5,12 +5,4 @@
     <role name="org.apache.cocoon.woody.datatype.DatatypeManager"
           shorthand="woody-datatype"
           
default-class="org.apache.cocoon.woody.datatype.DefaultDatatypeManager"/>
  -    
  -  <role name="org.apache.cocoon.woody.datatype.SelectionListBuilderSelector"
  -        shorthand="woody-selection-lists"
  -        
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
  -        
  -  <role 
name="org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector"
  -        shorthand="woody-validators"
  -        
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
   </xroles>
  
  
  
  1.1                  
cocoon-2.1/src/blocks/woody/conf/woody-selection-lists.xconf
  
  Index: woody-selection-lists.xconf
  ===================================================================
  <?xml version="1.0"?>
  
  <xconf xpath="/cocoon" unless="woody-selection-lists">
  
    <woody-selection-lists default="default">
      <selection-list name="default" 
class="org.apache.cocoon.woody.datatype.DefaultSelectionListBuilder"/>
      <selection-list name="flow-jxpath" 
class="org.apache.cocoon.woody.datatype.FlowJXPathSelectionListBuilder"/>
      <selection-list name="enum" 
class="org.apache.cocoon.woody.datatype.EnumSelectionListBuilder"/>
    </woody-selection-lists>
    
  </xconf>
  
  
  
  1.1                  
cocoon-2.1/src/blocks/woody/conf/woody-selection-lists.xroles
  
  Index: woody-selection-lists.xroles
  ===================================================================
  <?xml version="1.0"?>
  
  <xroles xpath="/role-list" unless="[EMAIL 
PROTECTED]'org.apache.cocoon.woody.datatype.SelectionListBuilderSelector']">
  
    <role name="org.apache.cocoon.woody.datatype.SelectionListBuilderSelector"
          shorthand="woody-selection-lists"
          
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
  </xroles>
  
  
  
  1.1                  cocoon-2.1/src/blocks/woody/conf/woody-validators.xconf
  
  Index: woody-validators.xconf
  ===================================================================
  <?xml version="1.0"?>
  
  <xconf xpath="/cocoon" unless="woody-validators">
  
    <woody-validators>
      <!-- new-style validators -->
      <validator name="javascript" 
class="org.apache.cocoon.woody.validation.impl.JavaScriptValidatorBuilder"/>
      <validator name="length" 
class="org.apache.cocoon.woody.validation.impl.LengthValidatorBuilder"/>
      <validator name="email" 
class="org.apache.cocoon.woody.validation.impl.EmailValidatorBuilder"/>
      <validator name="value-count" 
class="org.apache.cocoon.woody.validation.impl.ValueCountValidatorBuilder"/>
      <validator name="range" 
class="org.apache.cocoon.woody.validation.impl.RangeValidatorBuilder"/>
      <validator name="assert" 
class="org.apache.cocoon.woody.validation.impl.AssertValidatorBuilder"/>
      <validator name="mod10" 
class="org.apache.cocoon.woody.validation.impl.Mod10ValidatorBuilder"/>
      <validator name="regexp" 
class="org.apache.cocoon.woody.validation.impl.RegExpValidatorBuilder"/>
    </woody-validators>
  
  </xconf>
  
  
  
  1.1                  cocoon-2.1/src/blocks/woody/conf/woody-validators.xroles
  
  Index: woody-validators.xroles
  ===================================================================
  <?xml version="1.0"?>
  
  <xroles xpath="/role-list" unless="[EMAIL 
PROTECTED]'org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector']">
  
    <role 
name="org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector"
          shorthand="woody-validators"
          
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
  </xroles>
  
  
  

Reply via email to