User: vharcq  
  Date: 02/04/12 13:54:44

  Modified:    core/resources/xdoclet/ejb/vendor jboss-jaws_xml.j
                        jboss_xml.j jbosscmp-jdbc_xml.j mvcsoft.j
  Log:
  Solve all remaining issues with ONE parameter tags (jboss:column-name, etc...)
  
  Revision  Changes    Path
  1.21      +16 -9     xdoclet/core/resources/xdoclet/ejb/vendor/jboss-jaws_xml.j
  
  Index: jboss-jaws_xml.j
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/vendor/jboss-jaws_xml.j,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -w -r1.20 -r1.21
  --- jboss-jaws_xml.j  8 Apr 2002 13:38:29 -0000       1.20
  +++ jboss-jaws_xml.j  12 Apr 2002 20:54:44 -0000      1.21
  @@ -23,7 +23,12 @@
           <XDtMethod:forAllMethodTags tagName="ejb:persistent-field">
            <cmp-field>
               <field-name><XDtMethod:propertyName/></field-name>
  -            <column-name><XDtMethod:methodTagValue tagName="jboss:column-name" 
paramName="name" paramNum="0" default="<XDtMethod:propertyName/>" /></column-name>
  +           <XDtMethod:ifHasMethodTag tagName="jboss:column-name" paramName="name" 
paramNum="0">
  +            <column-name><XDtMethod:methodTagValue tagName="jboss:column-name" 
paramName="name" paramNum="0"/></column-name>
  +           </XDtMethod:ifHasMethodTag>
  +           <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name" 
paramName="name" paramNum="0">
  +            <column-name><XDtMethod:propertyName/></column-name>
  +           </XDtMethod:ifDoesntHaveMethodTag>
              <XDtMethod:ifHasMethodTag tagName="jboss:sql-type" paramName="type" 
paramNum="0">
               <sql-type><XDtMethod:methodTagValue tagName="jboss:sql-type" 
paramName="type" paramNum="0"/></sql-type>
              </XDtMethod:ifHasMethodTag>
  @@ -63,34 +68,36 @@
        </XDtMerge:merge>
   
          <XDtMerge:merge file="jaws-db-settings-{0}.xml">
  -        <XDtClass:ifHasClassTag tagName="jboss:table-name">
  +        <XDtClass:ifHasClassTag tagName="jboss:table-name" paramName="table-name" 
paramNum="0">
            <table-name><XDtClass:classTagValue tagName="jboss:table-name" 
paramName="table-name" paramNum="0"/></table-name>
           </XDtClass:ifHasClassTag>
  -        <XDtClass:ifHasClassTag tagName="jboss:create-table" paramName="create" >
  +        <XDtClass:ifHasClassTag tagName="jboss:create-table" paramName="create" 
paramNum="0">
            <create-table><XDtClass:classTagValue tagName="jboss:create-table" 
paramName="create" paramNum="0"/></create-table>
           </XDtClass:ifHasClassTag>
  -        <XDtClass:ifHasClassTag tagName="jboss:remove-table" paramName="remove">
  +        <XDtClass:ifHasClassTag tagName="jboss:remove-table" paramName="remove" 
paramNum="0">
            <remove-table><XDtClass:classTagValue tagName="jboss:remove-table" 
paramName="remove" paramNum="0"/></remove-table>
           </XDtClass:ifHasClassTag>
  -        <XDtClass:ifHasClassTag tagName="jboss:tuned-updates" paramName="tune">
  +        <XDtClass:ifHasClassTag tagName="jboss:tuned-updates" paramName="tune" 
paramNum="0">
            <tuned-updates><XDtClass:classTagValue tagName="jboss:tuned-updates" 
paramName="tune" paramNum="0"/></tuned-updates>
           </XDtClass:ifHasClassTag>
  -        <XDtClass:ifHasClassTag tagName="jboss:read-only" paramName="read-only">
  +        <XDtClass:ifHasClassTag tagName="jboss:read-only" paramName="read-only" 
paramNum="0">
            <read-only><XDtClass:classTagValue tagName="jboss:read-only" 
paramName="read-only" paramNum="0"/></read-only>
           </XDtClass:ifHasClassTag>
  -        <XDtClass:ifHasClassTag tagName="jboss:time-out" paramName="time-out">
  +        <XDtClass:ifHasClassTag tagName="jboss:time-out" paramName="time-out" 
paramNum="0">
            <time-out><XDtClass:classTagValue tagName="jboss:time-out" 
paramName="time-out" paramNum="0"/></time-out>
           </XDtClass:ifHasClassTag>
           <XDtConfig:ifConfigParamEquals paramName="Version" value="3.0">
  +        <XDtClass:ifHasClassTag tagName="jboss:select-for-update" 
paramName="select-for-update" paramNum="0">
            <row-locking><XDtClass:classTagValue tagName="jboss:select-for-update" 
paramName="select-for-update" paramNum="0"/></row-locking>
  +        </XDtClass:ifHasClassTag>
           </XDtConfig:ifConfigParamEquals>
           <XDtConfig:ifConfigParamNotEquals paramName="Version" value="3.0">
  -        <XDtClass:ifHasClassTag tagName="jboss:select-for-update" 
paramName="select-for-update">
  +        <XDtClass:ifHasClassTag tagName="jboss:select-for-update" 
paramName="select-for-update" paramNum="0">
            <select-for-update><XDtClass:classTagValue 
tagName="jboss:select-for-update" paramName="select-for-update" 
paramNum="0"/></select-for-update>
           </XDtClass:ifHasClassTag>
    </XDtConfig:ifConfigParamNotEquals>
   
  -        <XDtClass:ifHasClassTag tagName="jboss:pk-constraint" 
paramName="pk-constraint">
  +        <XDtClass:ifHasClassTag tagName="jboss:pk-constraint" 
paramName="pk-constraint" paramNum="0">
            <pk-constraint><XDtClass:classTagValue tagName="jboss:pk-constraint" 
paramName="pk-constraint" paramNum="0"/></pk-constraint>
           </XDtClass:ifHasClassTag>
         </XDtMerge:merge>
  
  
  
  1.26      +1 -1      xdoclet/core/resources/xdoclet/ejb/vendor/jboss_xml.j
  
  Index: jboss_xml.j
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/vendor/jboss_xml.j,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -w -r1.25 -r1.26
  --- jboss_xml.j       18 Feb 2002 22:24:51 -0000      1.25
  +++ jboss_xml.j       12 Apr 2002 20:54:44 -0000      1.26
  @@ -28,7 +28,7 @@
           <XDtEjb:ifLocalEjb>
            <local-jndi-name><XDtEjbHome:jndiName type="local"/></local-jndi-name>
           </XDtEjb:ifLocalEjb>
  -        <XDtClass:ifHasClassTag tagName="jboss:read-only">
  +        <XDtClass:ifHasClassTag tagName="jboss:read-only" paramName="read-only" 
paramNum="0">
            <read-only><XDtClass:classTagValue tagName="jboss:read-only" 
paramName="read-only" paramNum="0"/></read-only>
           </XDtClass:ifHasClassTag>
           <XDtClass:ifHasClassTag tagName="jboss:container-configuration">
  
  
  
  1.21      +18 -18    xdoclet/core/resources/xdoclet/ejb/vendor/jbosscmp-jdbc_xml.j
  
  Index: jbosscmp-jdbc_xml.j
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/vendor/jbosscmp-jdbc_xml.j,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -w -r1.20 -r1.21
  --- jbosscmp-jdbc_xml.j       8 Apr 2002 14:09:34 -0000       1.20
  +++ jbosscmp-jdbc_xml.j       12 Apr 2002 20:54:44 -0000      1.21
  @@ -15,29 +15,29 @@
         <entity>
       <XDtMerge:merge file="jbosscmp-jdbc-db-settings-{0}.xml">
            <ejb-name><XDtEjb:ejbName/></ejb-name>
  -      <XDtClass:ifHasClassTag tagName="jboss:datasource">
  +      <XDtClass:ifHasClassTag tagName="jboss:datasource" paramName="name" 
paramNum="0">
            <datasource><XDtClass:classTagValue tagName="jboss:datasource" 
paramName="name" paramNum="0"/></datasource>
            <datasource-mapping><XDtClass:classTagValue tagName="jboss:datasource" 
paramName="mapping" paramNum="1"/></datasource-mapping>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:create-table">
  +      <XDtClass:ifHasClassTag tagName="jboss:create-table" paramName="create" 
paramNum="0">
            <create-table><XDtClass:classTagValue tagName="jboss:create-table" 
paramName="create" paramNum="0"/></create-table>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:remove-table">
  +      <XDtClass:ifHasClassTag tagName="jboss:remove-table" paramName="remove" 
paramNum="0">
            <remove-table><XDtClass:classTagValue tagName="jboss:remove-table" 
paramName="remove" paramNum="0"/></remove-table>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:read-only">
  +      <XDtClass:ifHasClassTag tagName="jboss:read-only" paramName="read-only" 
paramNum="0">
            <read-only><XDtClass:classTagValue tagName="jboss:read-only" 
paramName="read-only" paramNum="0"/></read-only>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:time-out">
  +      <XDtClass:ifHasClassTag tagName="jboss:time-out" paramName="time-out" 
paramNum="0">
            <time-out><XDtClass:classTagValue tagName="jboss:time-out" 
paramName="time-out" paramNum="0"/></time-out>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:row-locking">
  +      <XDtClass:ifHasClassTag tagName="jboss:row-locking" paramName="row-locking" 
paramNum="0">
            <row-locking><XDtClass:classTagValue tagName="jboss:row-locking" 
paramName="row-locking" paramNum="0"/></row-locking>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:pk-constraint">
  +      <XDtClass:ifHasClassTag tagName="jboss:pk-constraint" 
paramName="pk-constraint" paramNum="0">
            <pk-constraint><XDtClass:classTagValue tagName="jboss:pk-constraint" 
paramName="pk-constraint" paramNum="0"/></pk-constraint>
         </XDtClass:ifHasClassTag>
  -      <XDtClass:ifHasClassTag tagName="jboss:table-name">
  +      <XDtClass:ifHasClassTag tagName="jboss:table-name" paramName="table-name" 
paramNum="0">
            <table-name><XDtClass:classTagValue tagName="jboss:table-name" 
paramName="table-name" paramNum="0"/></table-name>
         </XDtClass:ifHasClassTag>
       </XDtMerge:merge>
  @@ -50,16 +50,16 @@
            <cmp-field>
               <field-name><XDtMethod:propertyName/></field-name>
                        <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:property">
  -            <XDtMethod:ifHasMethodTag tagName="jboss:column-name">
  +            <XDtMethod:ifHasMethodTag tagName="jboss:column-name" paramName="name" 
paramNum="0">
               <column-name><XDtMethod:methodTagValue tagName="jboss:column-name" 
paramName="name" paramNum="0"/></column-name>
               </XDtMethod:ifHasMethodTag>
  -                     <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name">
  +                     <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name" 
paramName="name" paramNum="0">
                        <column-name><XDtMethod:propertyName/></column-name>
                        </XDtMethod:ifDoesntHaveMethodTag>
  -            <XDtMethod:ifHasMethodTag tagName="jboss:jdbc-type">
  +            <XDtMethod:ifHasMethodTag tagName="jboss:jdbc-type" paramName="type" 
paramNum="0">
               <jdbc-type><XDtMethod:methodTagValue tagName="jboss:jdbc-type" 
paramName="type" paramNum="0"/></jdbc-type>
               </XDtMethod:ifHasMethodTag>
  -            <XDtMethod:ifHasMethodTag tagName="jboss:sql-type">
  +            <XDtMethod:ifHasMethodTag tagName="jboss:sql-type" paramName="type" 
paramNum="0">
               <sql-type><XDtMethod:methodTagValue tagName="jboss:sql-type" 
paramName="type" paramNum="0"/></sql-type>
               </XDtMethod:ifHasMethodTag>
                        </XDtMethod:ifDoesntHaveMethodTag>
  @@ -245,16 +245,16 @@
         <XDtMethod:ifHasMethodTag tagName="jboss:property">
         <property>
           <property-name><XDtMethod:propertyName/></property-name>
  -        <XDtMethod:ifHasMethodTag tagName="jboss:column-name">
  +        <XDtMethod:ifHasMethodTag tagName="jboss:column-name" paramName="name" 
paramNum="0">
           <column-name><XDtMethod:methodTagValue tagName="jboss:column-name" 
paramName="name" paramNum="0"/></column-name>
           </XDtMethod:ifHasMethodTag>
  -        <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name">
  +        <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name" 
paramName="name" paramNum="0">
           <column-name><XDtMethod:propertyName/></column-name>
           </XDtMethod:ifDoesntHaveMethodTag>
  -        <XDtMethod:ifHasMethodTag tagName="jboss:jdbc-type">
  +        <XDtMethod:ifHasMethodTag tagName="jboss:jdbc-type" paramName="type" 
paramNum="0">
           <jdbc-type><XDtMethod:methodTagValue tagName="jboss:jdbc-type" 
paramName="type" paramNum="0"/></jdbc-type>
           </XDtMethod:ifHasMethodTag>
  -        <XDtMethod:ifHasMethodTag tagName="jboss:sql-type">
  +        <XDtMethod:ifHasMethodTag tagName="jboss:sql-type" paramName="type" 
paramNum="0">
           <sql-type><XDtMethod:methodTagValue tagName="jboss:sql-type" 
paramName="type" paramNum="0"/></sql-type>
           </XDtMethod:ifHasMethodTag>
         </property>
  
  
  
  1.4       +3 -3      xdoclet/core/resources/xdoclet/ejb/vendor/mvcsoft.j
  
  Index: mvcsoft.j
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/vendor/mvcsoft.j,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- mvcsoft.j 18 Dec 2001 15:20:59 -0000      1.3
  +++ mvcsoft.j 12 Apr 2002 20:54:44 -0000      1.4
  @@ -156,13 +156,13 @@
         <XDtMethod:ifHasMethodTag tagName="ejb:persistent-field">
         <field-map>
           <field-name><XDtMethod:propertyName/></field-name>
  -        <XDtMethod:ifHasMethodTag tagName="mvcsoft:col-name">
  +        <XDtMethod:ifHasMethodTag tagName="mvcsoft:col-name" paramName="typname" 
paramNum="0">
           <col-name><XDtMethod:methodTagValue tagName="mvcsoft:col-name" 
paramName="typname" paramNum="0"/></col-name>
           </XDtMethod:ifHasMethodTag>
  -        <XDtMethod:ifHasMethodTag tagName="mvcsoft:jdbc-type">
  +        <XDtMethod:ifHasMethodTag tagName="mvcsoft:jdbc-type" paramName="type" 
paramNum="0">
           <jdbc-type><XDtMethod:methodTagValue tagName="mvcsoft:jdbc-type" 
paramName="type" paramNum="0"/></jdbc-type>
           </XDtMethod:ifHasMethodTag>
  -        <XDtMethod:ifHasMethodTag tagName="mvcsoft:sql-type">
  +        <XDtMethod:ifHasMethodTag tagName="mvcsoft:sql-type" paramName="type" 
paramNum="0">
           <sql-type><XDtMethod:methodTagValue tagName="mvcsoft:sql-type" 
paramName="type" paramNum="0"/></sql-type>
           </XDtMethod:ifHasMethodTag>
         </field-map>
  
  
  

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to