User: pazu
Date: 02/04/22 21:35:29
Modified: core/resources/xdoclet/ejb/vendor jbosscmp-jdbc_xml.j
Log:
This commit should put jbosscmp-jdbc.xml up to the current JBoss 3.0.0 state.
Relationship generation is OK as far as I can tell, and almost everything in
the template can be defined using xDoclet tags.
Revision Changes Path
1.23 +92 -56 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.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- jbosscmp-jdbc_xml.j 16 Apr 2002 23:01:06 -0000 1.22
+++ jbosscmp-jdbc_xml.j 23 Apr 2002 04:35:29 -0000 1.23
@@ -2,10 +2,12 @@
<!DOCTYPE jbosscmp-jdbc PUBLIC "<XDtXml:publicId/>" "<XDtXml:systemId/>">
<jbosscmp-jdbc>
+ <XDtMerge:merge file="jbosscmp-jdbc-defaults.xml">
<defaults>
<datasource><XDtConfig:configParameterValue
paramName="Datasource"/></datasource>
<datasource-mapping><XDtConfig:configParameterValue
paramName="Typemapping"/></datasource-mapping>
</defaults>
+ </XDtMerge:merge>
<enterprise-beans>
@@ -23,68 +25,80 @@
<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: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
tagName="jboss:persistence,jboss:create-table,jboss:create-table"
paramName="create-table,create">
+ <create-table><XDtClass:classTagValue
tagName="jboss:persistence,jboss:create-table,jboss:create-table"
paramName="create-table,create" paramNum="0"/></create-table>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag
tagName="jboss:persistence,jboss:remove-table,jboss:remove-table"
paramName="remove-table,remove">
+ <remove-table><XDtClass:classTagValue
tagName="jboss:persistence,jboss:remove-table,jboss:remove-table"
paramName="remove-table,remove" paramNum="0"/></remove-table>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag
tagName="jboss:persistence,jboss:read-only,jboss:read-only"
paramName="read-only,read-only">
+ <read-only><XDtClass:classTagValue
tagName="jboss:persistence,jboss:read-only,jboss:read-only"
paramName="read-only,read-only" paramNum="0"/></read-only>
</XDtClass:ifHasClassTag>
- <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
tagName="jboss:persistence,jboss:time-out,jboss:time-out"
paramName="read-time-out,time-out">
+ <read-time-out><XDtClass:classTagValue
tagName="jboss:persistence,jboss:time-out,jboss:time-out"
paramName="read-time-out,time-out" paramNum="0"/></read-time-out>
</XDtClass:ifHasClassTag>
- <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
tagName="jboss:persistence,jboss:row-locking,jboss:row-locking"
paramName="row-locking,row-locking">
+ <row-locking><XDtClass:classTagValue
tagName="jboss:persistence,jboss:row-locking,jboss:row-locking"
paramName="row-locking,row-locking" paramNum="0"/></row-locking>
</XDtClass:ifHasClassTag>
- <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
tagName="jboss:persistence,jboss:pk-constraint,jboss:pk-constraint"
paramName="pk-constraint,pk-constraint">
+ <pk-constraint><XDtClass:classTagValue
tagName="jboss:persistence,jboss:pk-constraint,jboss:pk-constraint"
paramName="pk-constraint,pk-constraint" paramNum="0"/></pk-constraint>
</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 tagName="jboss:read-ahead">
+ <read-ahead>
+ <strategy><XDtClass:classTagValue tagName="jboss:read-ahead"
paramName="strategy"/></strategy>
+ <XDtClass:ifHasClassTag tagName="jboss:read-ahead"
paramName="page-size">
+ <page-size><XDtClass:classTagValue tagName="jboss:read-ahead"
paramName="page-size"/></page-size>
</XDtClass:ifHasClassTag>
- <XDtClass:ifHasClassTag tagName="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 tagName="jboss:read-ahead"
paramName="eager-load-group">
+ <eager-load-group><XDtClass:classTagValue
tagName="jboss:read-ahead" paramName="eager-load-group"/></eager-load-group>
</XDtClass:ifHasClassTag>
- <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>
+ </read-ahead>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jboss:persistence"
paramName="list-cache-max">
+ <list-cache-max><XDtClass:classTagValue tagName="jboss:persistence"
paramName="list-cache-max"/></list-cache-max>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag
tagName="ejb:persistence,jboss:table-name,jboss:table-name"
paramName="table-name,table-name">
+ <table-name><XDtClass:classTagValue
tagName="ejb:persistence,jboss:table-name,jboss:table-name"
paramName="table-name,table-name" paramNum="0"/></table-name>
</XDtClass:ifHasClassTag>
</XDtMerge:merge>
<XDtMerge:merge file="jbosscmp-jdbc-{0}.xml">
-
<XDtMethod:forAllMethods>
<XDtMethod:ifDoesntHaveMethodTag tagName="jboss:not-persisted-field">
<XDtMethod:forAllMethodTags tagName="ejb:persistent-field">
<cmp-field>
<field-name><XDtMethod:propertyName/></field-name>
- <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:property">
- <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:ifDoesntHaveMethodTag
tagName="jboss:dvc-property,jboss:property">
+ <XDtMethod:ifHasMethodTag
tagName="ejb:persistence,jboss:column-name,jboss:column-name"
paramName="column-name,column-name">
+ <column-name><XDtMethod:methodTagValue
tagName="ejb:persistence,jboss:column-name,jboss:column-name"
paramName="column-name,column-name" paramNum="0"/></column-name>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifDoesntHaveMethodTag
tagName="ejb:persistence,jboss:column-name" paramName="column-name" paramNum="0">
+ <XDtMethod:ifDoesntHaveMethodTag
tagName="ejb:persistence,jboss:column-name,jboss:column-name"
paramName="column-name,column-name">
<column-name><XDtMethod:propertyName/></column-name>
</XDtMethod:ifDoesntHaveMethodTag>
- <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
tagName="ejb:persistence,jboss:jdbc-type,jboss:jdbc-type" paramName="jdbc-type,type">
+ <jdbc-type><XDtMethod:methodTagValue
tagName="ejb:persistence,jboss:jdbc-type,jboss:jdbc-type" paramName="jdbc-type,type"
paramNum="0"/></jdbc-type>
</XDtMethod:ifHasMethodTag>
- <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
tagName="ejb:persistence,jboss:sql-type,jboss:sql-type" paramName="sql-type,type">
+ <sql-type><XDtMethod:methodTagValue
tagName="ejb:persistence,jboss:sql-type,jboss:sql-type" paramName="sql-type,type"
paramNum="0"/></sql-type>
</XDtMethod:ifHasMethodTag>
</XDtMethod:ifDoesntHaveMethodTag>
-
- <XDtMethod:ifHasMethodTag tagName="jboss:property">
- <XDtMethod:forAllMethodTags tagName="jboss:property">
+ <XDtMethod:ifHasMethodTag tagName="jboss:dvc-property">
+ <XDtMethod:forAllMethodTags tagName="jboss:dvc-property">
<property>
- <property-name><XDtMethod:methodTagValue
tagName="jboss:property" paramName="name"/></property-name>
- <XDtMethod:ifHasMethodTag tagName="jboss:property"
paramName="column-name">
- <column-name><XDtMethod:methodTagValue
tagName="jboss:property" paramName="column-name"/></column-name>
+ <property-name><XDtMethod:methodTagValue
tagName="jboss:dvc-property" paramName="name"/></property-name>
+ <XDtMethod:ifHasMethodTag tagName="jboss:dvc-property"
paramName="column-name">
+ <column-name><XDtMethod:methodTagValue
tagName="jboss:dvc-property" paramName="column-name"/></column-name>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifDoesntHaveMethodTag tagName="jboss:property"
paramName="column-name">
- <column-name><XDtMethod:methodTagValue
tagName="jboss:property" paramName="name"/></column-name>
+ <XDtMethod:ifDoesntHaveMethodTag
tagName="jboss:dvc-property" paramName="column-name">
+ <column-name><XDtMethod:methodTagValue
tagName="jboss:dvc-property" paramName="name"/></column-name>
</XDtMethod:ifDoesntHaveMethodTag>
- <XDtMethod:ifMethodTagValueEquals tagName="jboss:property"
paramName="not-null" value="yes">
+ <XDtMethod:ifMethodTagValueEquals
tagName="jboss:dvc-property" paramName="not-null" value="yes">
<not-null/>
</XDtMethod:ifMethodTagValueEquals>
- <XDtMethod:ifHasMethodTag tagName="jboss:property"
paramName="jdbc-type">
+ <XDtMethod:ifHasMethodTag tagName="jboss:dvc-property"
paramName="jdbc-type">
<jdbc-type><XDtMethod:methodTagValue
tagName="jboss:property" paramName="jdbc-type"/></jdbc-type>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="jboss:property"
paramName="sql-type">
+ <XDtMethod:ifHasMethodTag tagName="jboss:dvc-property"
paramName="sql-type">
<sql-type><XDtMethod:methodTagValue tagName="jboss:property"
paramName="sql-type"/></sql-type>
</XDtMethod:ifHasMethodTag>
</property>
@@ -102,19 +116,7 @@
</XDtClass:forAllClassTags>
<XDtMerge:merge file="jbosscmp-jdbc-load-{0}.xml">
- <!--
- To define load groups for this entity, write a file named
- jbosscmp-jdbc-load-<XDtClass:className/>.xml and put it in
- your mergedir. Write it according to the following DTD slice:
-
- <!ELEMENT load-groups (load-group+)>
- <!ELEMENT load-group (load-group-name, description?, field-name+)>
- <!ELEMENT load-group-name (#PCDATA)>
- <!ELEMENT description (#PCDATA)>
- <!ELEMENT field-name (#PCDATA)>
- <!ELEMENT eager-load-group (#PCDATA)>
- <!ELEMENT lazy-load-groups (load-group-name+)>
- -->
+ <!-- merge point: jbosscmp-jdbc-load-{0}.xml -->
</XDtMerge:merge>
<XDtClass:forAllClassTags tagName="jboss:declared-sql">
@@ -152,6 +154,29 @@
</query>
</XDtClass:ifHasClassTag>
</XDtClass:forAllClassTags>
+ <XDtClass:forAllClassTags tagName="jboss:query">
+ <XDtClass:ifHasClassTag tagName="jboss:query" paramName="signature">
+ <query>
+ <XDtClass:ifHasClassTag tagName="jboss:query"
paramName="description">
+ <description><XDtClass:classTagValue tagName="jboss:query"
param-name="description"/></description>
+ </XDtClass:ifHasClassTag>
+ <query-method>
+ <method-name><XDtClass:classTagValue tagName="jboss:query"
paramName="signature" delimiter=" (" tokenNumber="1"/></method-name>
+ <method-params>
+ <XDtParameter:forAllParameterTypes paramName="signature">
+ <method-param><XDtParameter:currentToken/></method-param>
+ </XDtParameter:forAllParameterTypes>
+ </method-params>
+ </query-method>
+ <XDtClass:ifHasClassTag tagName="jboss:query"
paramName="query">
+ <jboss-ql><XDtClass:classTagValue tagName="jboss:query"
paramName="query"/></jboss-ql>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifClassTagValueEquals tagName="jboss:query"
paramName="dynamic" value="true">
+ <dynamic-ql/>
+ </XDtClass:ifClassTagValueEquals>
+ </query>
+ </XDtClass:ifHasClassTag>
+ </XDtClass:forAllClassTags>
</XDtMerge:merge>
</entity>
@@ -238,6 +263,8 @@
</relationships>
</XDtEjbRel:ifHasRelationships>
+<XDtMerge:merge file="jbosscmp-jdbc-dvc.xml">
+<!-- merge point: jbosscmp-jdbc-dvc.xml -->
<XDtJBoss:ifHasDVC>
<dependent-value-classes>
<XDtClass:forAllClasses>
@@ -246,20 +273,20 @@
<description><XDtClass:firstSentenceDescription/></description>
<class><XDtClass:fullClassName/></class>
<XDtMethod:forAllMethods>
- <XDtMethod:ifHasMethodTag tagName="jboss:property">
+ <XDtMethod:ifHasMethodTag tagName="jboss:dvc-property">
<property>
<property-name><XDtMethod:propertyName/></property-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 tagName="ejb:persistence,jboss:column-name"
paramName="column-name">
+ <column-name><XDtMethod:methodTagValue
tagName="ejb:persistence,jboss:column-name,jboss:column-name"
paramName="column-name,column-name" paramNum="0"/></column-name>
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifDoesntHaveMethodTag
tagName="ejb:persistence,jboss:column-name" paramName="column-name" paramNum="0">
+ <XDtMethod:ifDoesntHaveMethodTag
tagName="ejb:persistence,jboss:column-name" paramName="column-name">
<column-name><XDtMethod:propertyName/></column-name>
</XDtMethod:ifDoesntHaveMethodTag>
- <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 tagName="ejb:persistence,jboss:jdbc-type"
paramName="jdbc-type">
+ <jdbc-type><XDtMethod:methodTagValue
tagName="ejb:persistence,jboss:jdbc-type,jboss:jdbc-type" paramName="jdbc-type,type"
paramNum="0"/></jdbc-type>
</XDtMethod:ifHasMethodTag>
- <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 tagName="ejb:persistence,jboss:sql-type"
paramName="sql-type">
+ <sql-type><XDtMethod:methodTagValue
tagName="ejb:persistence,jboss:sql-type,jboss:sql-type" paramName="sql-type,type"
paramNum="0"/></sql-type>
</XDtMethod:ifHasMethodTag>
</property>
</XDtMethod:ifHasMethodTag>
@@ -269,6 +296,15 @@
</XDtClass:forAllClasses>
</dependent-value-classes>
</XDtJBoss:ifHasDVC>
- <XDtMerge:merge file="jbosscmp-typemappings.xml">
+
+</XDtMerge:merge>
+ <XDtMerge:merge file="jbosscmp-jdbc-typemappings.xml">
</XDtMerge:merge>
</jbosscmp-jdbc>
+
+<XDtComment:comment>
+TODO
+ -- jboss:read-ahead is a good choice?
+ -- <read-ahead/> support on <ejb-relationship-role/>
+ -- <load-groups/> through tags, not only merging
+</XDtComment:comment>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
