User: vharcq  
  Date: 02/04/16 16:01:06

  Modified:    core/resources/xdoclet/ejb/vendor jboss-jaws_xml.j
                        jbosscmp-jdbc_xml.j
  Log:
  ejb:persistence table-name="abc" on CLASS Level
  ejb:persistence column-name="abc" jdbc-type="VARCHAR" sql-type="VARCHAR(50)" on 
METHOD Level
  JBoss CMP and Jaws implement them keeping backward compatibility (see AccountBean)
  Thanks to Marcus :)
  
  Revision  Changes    Path
  1.22      +25 -25    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.21
  retrieving revision 1.22
  diff -u -w -r1.21 -r1.22
  --- jboss-jaws_xml.j  12 Apr 2002 20:54:44 -0000      1.21
  +++ jboss-jaws_xml.j  16 Apr 2002 23:01:06 -0000      1.22
  @@ -23,23 +23,23 @@
           <XDtMethod:forAllMethodTags tagName="ejb:persistent-field">
            <cmp-field>
               <field-name><XDtMethod:propertyName/></field-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 tagName="ejb:persistence,jboss:column-name" 
paramName="column-name" paramNum="0">
  +            <column-name><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:column-name" paramName="column-name" 
paramNum="0"/></column-name>
              </XDtMethod:ifHasMethodTag>
  -           <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name" 
paramName="name" paramNum="0">
  +           <XDtMethod:ifDoesntHaveMethodTag 
tagName="ejb:persistence,jboss:column-name" paramName="column-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>
  -           <XDtClass:ifHasClassTag tagName="jboss:cmp-field" paramName="sql-type">
  -            <sql-type><XDtClass:classTagValue tagName="jboss:cmp-field" 
paramName="sql-type"/></sql-type>
  +           <XDtClass:ifHasClassTag tagName="ejb:persistence,jboss:cmp-field" 
paramName="sql-type">
  +            <sql-type><XDtClass:classTagValue 
tagName="ejb:persistence,jboss:cmp-field" paramName="sql-type"/></sql-type>
              </XDtClass:ifHasClassTag>
              <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>
  -           <XDtClass:ifHasClassTag tagName="jboss:cmp-field" paramName="jdbc-type">
  -            <jdbc-type><XDtClass:classTagValue tagName="jboss:cmp-field" 
paramName="jdbc-type"/></jdbc-type>
  +           <XDtClass:ifHasClassTag tagName="ejb:persistence,jboss:cmp-field" 
paramName="jdbc-type">
  +            <jdbc-type><XDtClass:classTagValue 
tagName="ejb:persistence,jboss:cmp-field" paramName="jdbc-type"/></jdbc-type>
              </XDtClass:ifHasClassTag>
   
            </cmp-field>
  @@ -68,37 +68,37 @@
        </XDtMerge:merge>
   
          <XDtMerge:merge file="jaws-db-settings-{0}.xml">
  -        <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 tagName="ejb:persistence,jboss:table-name" 
paramName="table-name" paramNum="0">
  +         <table-name><XDtClass:classTagValue 
tagName="ejb:persistence,jboss:table-name" paramName="table-name" 
paramNum="0"/></table-name>
           </XDtClass:ifHasClassTag>
  -        <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 tagName="jboss:persistence,jboss:create-table" 
paramName="create" paramNum="0">
  +         <create-table><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:create-table" paramName="create" 
paramNum="0"/></create-table>
           </XDtClass:ifHasClassTag>
  -        <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 tagName="jboss:persistence,jboss:remove-table" 
paramName="remove" paramNum="0">
  +         <remove-table><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:remove-table" paramName="remove" 
paramNum="0"/></remove-table>
           </XDtClass:ifHasClassTag>
  -        <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 tagName="jboss:persistence,jboss:tuned-updates" 
paramName="tune" paramNum="0">
  +         <tuned-updates><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:tuned-updates" paramName="tune" 
paramNum="0"/></tuned-updates>
           </XDtClass:ifHasClassTag>
  -        <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 tagName="jboss:persistence,jboss:read-only" 
paramName="read-only" paramNum="0">
  +         <read-only><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:read-only" paramName="read-only" 
paramNum="0"/></read-only>
           </XDtClass:ifHasClassTag>
  -        <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 tagName="jboss:persistence,jboss:time-out" 
paramName="time-out" paramNum="0">
  +         <time-out><XDtClass:classTagValue 
tagName="jboss:persistence,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 tagName="jboss:persistence,jboss:select-for-update" 
paramName="select-for-update" paramNum="0">
  +         <row-locking><XDtClass:classTagValue 
tagName="jboss:persistence,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" paramNum="0">
  -         <select-for-update><XDtClass:classTagValue 
tagName="jboss:select-for-update" paramName="select-for-update" 
paramNum="0"/></select-for-update>
  +        <XDtClass:ifHasClassTag tagName="jboss:persistence,jboss:select-for-update" 
paramName="select-for-update" paramNum="0">
  +         <select-for-update><XDtClass:classTagValue 
tagName="jboss:persistence,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" paramNum="0">
  -         <pk-constraint><XDtClass:classTagValue tagName="jboss:pk-constraint" 
paramName="pk-constraint" paramNum="0"/></pk-constraint>
  +        <XDtClass:ifHasClassTag tagName="jboss:persistence,jboss:pk-constraint" 
paramName="pk-constraint" paramNum="0">
  +         <pk-constraint><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:pk-constraint" paramName="pk-constraint" 
paramNum="0"/></pk-constraint>
           </XDtClass:ifHasClassTag>
         </XDtMerge:merge>
   
  
  
  
  1.22      +32 -28    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.21
  retrieving revision 1.22
  diff -u -w -r1.21 -r1.22
  --- jbosscmp-jdbc_xml.j       12 Apr 2002 20:54:44 -0000      1.21
  +++ jbosscmp-jdbc_xml.j       16 Apr 2002 23:01:06 -0000      1.22
  @@ -19,26 +19,30 @@
            <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" paramName="create" 
paramNum="0">
  -         <create-table><XDtClass:classTagValue tagName="jboss:create-table" 
paramName="create" paramNum="0"/></create-table>
  +       <XDtClass:ifHasClassTag tagName="jboss:persistence" paramName="datasource">
  +              <datasource><XDtClass:classTagValue tagName="jboss:persistence" 
paramName="datasource"/></datasource>
  +              <datasource-mapping><XDtClass:classTagValue 
tagName="jboss:persistence" paramName="datasource-mapping"/></datasource-mapping>
         </XDtClass:ifHasClassTag>
  -      <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 tagName="jboss:persistence,jboss:create-table" 
paramName="create" paramNum="0">
  +         <create-table><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:create-table" paramName="create" 
paramNum="0"/></create-table>
         </XDtClass:ifHasClassTag>
  -      <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 tagName="jboss:persistence,jboss:remove-table" 
paramName="remove" paramNum="0">
  +         <remove-table><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:remove-table" paramName="remove" 
paramNum="0"/></remove-table>
         </XDtClass:ifHasClassTag>
  -      <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 tagName="jboss:persistence,jboss:read-only" 
paramName="read-only" paramNum="0">
  +         <read-only><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:read-only" paramName="read-only" 
paramNum="0"/></read-only>
         </XDtClass:ifHasClassTag>
  -      <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 tagName="jboss:persistence,jboss:time-out" 
paramName="time-out" paramNum="0">
  +         <time-out><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:time-out" paramName="time-out" 
paramNum="0"/></time-out>
  +      </XDtClass:ifHasClassTag>
  +      <XDtClass:ifHasClassTag tagName="jboss:persistence,jboss:row-locking" 
paramName="row-locking" paramNum="0">
  +         <row-locking><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:row-locking" paramName="row-locking" 
paramNum="0"/></row-locking>
         </XDtClass:ifHasClassTag>
         <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>
  +         <pk-constraint><XDtClass:classTagValue 
tagName="jboss:persistence,jboss:pk-constraint" paramName="pk-constraint" 
paramNum="0"/></pk-constraint>
         </XDtClass:ifHasClassTag>
  -      <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 tagName="ejb:persistence,jboss:table-name" 
paramName="table-name" paramNum="0">
  +         <table-name><XDtClass:classTagValue 
tagName="ejb:persistence,jboss:table-name" paramName="table-name" 
paramNum="0"/></table-name>
         </XDtClass:ifHasClassTag>
       </XDtMerge:merge>
   
  @@ -50,17 +54,17 @@
            <cmp-field>
               <field-name><XDtMethod:propertyName/></field-name>
                        <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:property">
  -            <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 tagName="ejb:persistence,jboss:column-name" 
paramName="column-name" paramNum="0">
  +            <column-name><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:column-name" paramName="column-name" 
paramNum="0"/></column-name>
               </XDtMethod:ifHasMethodTag>
  -                     <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name" 
paramName="name" paramNum="0">
  +                     <XDtMethod:ifDoesntHaveMethodTag 
tagName="ejb:persistence,jboss:column-name" paramName="column-name" paramNum="0">
                        <column-name><XDtMethod:propertyName/></column-name>
                        </XDtMethod:ifDoesntHaveMethodTag>
  -            <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 tagName="ejb:persistence,jboss:jdbc-type" 
paramName="jdbc-type" paramNum="0">
  +            <jdbc-type><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:jdbc-type" paramName="jdbc-type" 
paramNum="0"/></jdbc-type>
               </XDtMethod:ifHasMethodTag>
  -            <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 tagName="ejb:persistence,jboss:sql-type" 
paramName="sql-type" paramNum="0">
  +            <sql-type><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:sql-type" paramName="sql-type" paramNum="0"/></sql-type>
               </XDtMethod:ifHasMethodTag>
                        </XDtMethod:ifDoesntHaveMethodTag>
   
  @@ -245,17 +249,17 @@
         <XDtMethod:ifHasMethodTag tagName="jboss:property">
         <property>
           <property-name><XDtMethod:propertyName/></property-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 tagName="ejb:persistence,jboss:column-name" 
paramName="column-name" paramNum="0">
  +        <column-name><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:column-name" paramName="column-name" 
paramNum="0"/></column-name>
           </XDtMethod:ifHasMethodTag>
  -        <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:column-name" 
paramName="name" paramNum="0">
  +        <XDtMethod:ifDoesntHaveMethodTag 
tagName="ejb:persistence,jboss:column-name" paramName="column-name" paramNum="0">
           <column-name><XDtMethod:propertyName/></column-name>
           </XDtMethod:ifDoesntHaveMethodTag>
  -        <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 tagName="ejb:persistence,jboss:jdbc-type" 
paramName="jdbc-type" paramNum="0">
  +        <jdbc-type><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:jdbc-type" paramName="jdbc-type" 
paramNum="0"/></jdbc-type>
           </XDtMethod:ifHasMethodTag>
  -        <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 tagName="ejb:persistence,jboss:sql-type" 
paramName="sql-type" paramNum="0">
  +        <sql-type><XDtMethod:methodTagValue 
tagName="ejb:persistence,jboss:sql-type" paramName="sql-type" paramNum="0"/></sql-type>
           </XDtMethod:ifHasMethodTag>
         </property>
         </XDtMethod:ifHasMethodTag>
  
  
  

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

Reply via email to