Update of /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30630/modules/jdo/src/xdoclet/modules/jdo/resources
Modified Files:
jdo_xml.package_class_field_join.xdt
jdo_xml.package_class_field_value_column.xdt
jdo_xml.package_class_inheritance.xdt jdo_xml.xdt
jdo_xml.package_class_field_key.xdt
jdo_xml.package_class_field.xdt
jdo_xml.package_class_field_element.xdt
jdo_xml.package_class_datastore-identity.xdt
jdo_xml.package_sequence.xdt
jdo_xml.package_class_fetch-group.xdt
Added Files:
jdo_xml.package_class_field_value.xdt
jdo_xml.package_class_field_join_column.xdt
Log Message:
- Adopted some recent changes of JDO2 DTD.
- Extensively refactored and extended the xtags.xml. It should now be in line
with the xdt files and the DTD (means contain all the supported tags and have
the same order as the DTD).
--- NEW FILE: jdo_xml.package_class_field_value.xdt ---
<value
<XDtField:ifHasFieldTag tagName="jdo.value" paramName="column">
column="<XDtField:fieldTagValue tagName="jdo.value"
paramName="column"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.value" paramName="serialized">
serialized="<XDtField:fieldTagValue tagName="jdo.value"
paramName="serialized" values="true,false"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.value"
paramName="delete-action">
delete-action="<XDtField:fieldTagValue tagName="jdo.value"
paramName="delete-action" values="restrict,cascade,null,default,none"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.value" paramName="indexed">
indexed="<XDtField:fieldTagValue tagName="jdo.value"
paramName="indexed" values="true,false,unique"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.value" paramName="unique">
unique="<XDtField:fieldTagValue tagName="jdo.value"
paramName="unique" values="true,false"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.value" paramName="mapped-by">
mapped-by="<XDtField:fieldTagValue tagName="jdo.value"
paramName="mapped-by"/>"
</XDtField:ifHasFieldTag>
> <XDtComment:comment> end tag *value* </XDtComment:comment>
<XDtField:forAllFieldTags tagName="jdo.value-column"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt">
</XDtMerge:merge>
</XDtField:forAllFieldTags>
</value>
--- NEW FILE: jdo_xml.package_class_field_join_column.xdt ---
<XDtField:forAllFieldTags tagName="jdo.join-column"
superclasses="false">
<column
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="name">
name="<XDtField:fieldTagValue tagName="jdo.join-column"
paramName="name"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="target">
target="<XDtField:fieldTagValue tagName="jdo.join-column"
paramName="target"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="target-field">
target-field="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="target-field"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="jdbc-type">
jdbc-type="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="jdbc-type"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="sql-type">
sql-type="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="sql-type"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="length">
length="<XDtField:fieldTagValue tagName="jdo.join-column"
paramName="length"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="scale">
scale="<XDtField:fieldTagValue tagName="jdo.join-column"
paramName="scale"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="precision">
precision="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="precision"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="allows-null">
allows-null="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="allows-null"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="default-value">
default-value="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="default-value"/>"
</XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="insert-value">
insert-value="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="insert-value"/>"
</XDtField:ifHasFieldTag>
> <XDtComment:comment> end tag *column* </XDtComment:comment>
<XDtField:forAllFieldTags
tagName="jdo.join-column-vendor-extension" superclasses="false">
<extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="vendor-name"/>"
key="<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="key"/>"
value="<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="value"/>">
<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="content" default=""/>
</extension>
</XDtField:forAllFieldTags>
</column>
</XDtField:forAllFieldTags>
Index: jdo_xml.package_class_field_join.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** jdo_xml.package_class_field_join.xdt 14 Jul 2005 18:40:51 -0000
1.3
--- jdo_xml.package_class_field_join.xdt 27 Aug 2005 16:13:59 -0000
1.4
***************
*** 10,65 ****
outer="<XDtField:fieldTagValue tagName="jdo.join"
paramName="outer" values="true,false" default="false"/>"
</XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join"
paramName="foreign-key">
! foreign-key="<XDtField:fieldTagValue tagName="jdo.join"
paramName="foreign-key"/>"
</XDtField:ifHasFieldTag>
>
! <XDtField:forAllFieldTags tagName="jdo.join-column"
superclasses="false">
! <column
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="name">
! name="<XDtField:fieldTagValue tagName="jdo.join-column"
paramName="name"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="target">
! target="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="target"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="target-field">
! target-field="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="target-field"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="jdbc-type">
! jdbc-type="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="jdbc-type"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="sql-type">
! sql-type="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="sql-type"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="length">
! length="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="length"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="scale">
! scale="<XDtField:fieldTagValue tagName="jdo.join-column"
paramName="scale"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="precision">
! precision="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="precision"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="allows-null">
! allows-null="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="allows-null"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="default-value">
! default-value="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="default-value"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join-column"
paramName="insert-value">
! insert-value="<XDtField:fieldTagValue
tagName="jdo.join-column" paramName="insert-value"/>"
! </XDtField:ifHasFieldTag>
! > <XDtComment:comment> end tag *column* </XDtComment:comment>
!
! <XDtField:forAllFieldTags
tagName="jdo.join-column-vendor-extension" superclasses="false">
! <extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="vendor-name"/>"
! key="<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="key"/>"
! value="<XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="value"/>">
! <XDtField:fieldTagValue
tagName="jdo.join-column-vendor-extension" paramName="content" default=""/>
! </extension>
! </XDtField:forAllFieldTags>
!
! </column>
! </XDtField:forAllFieldTags>
<XDtField:forAllFieldTags tagName="jdo.join-vendor-extension"
superclasses="false">
--- 10,28 ----
outer="<XDtField:fieldTagValue tagName="jdo.join"
paramName="outer" values="true,false" default="false"/>"
</XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join"
paramName="delete-action">
! delete-action="<XDtField:fieldTagValue tagName="jdo.join"
paramName="delete-action" values="restrict,cascade,null,default,none"
default="default"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join" paramName="indexed">
! indexed="<XDtField:fieldTagValue tagName="jdo.join"
paramName="indexed" values="true,false,unique"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.join" paramName="unique">
! unique="<XDtField:fieldTagValue tagName="jdo.join"
paramName="unique" values="true,false"/>"
</XDtField:ifHasFieldTag>
>
! <XDtField:ifHasFieldTag tagName="jdo.join">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join_column.xdt">
! </XDtMerge:merge>
! </XDtField:ifHasFieldTag>
<XDtField:forAllFieldTags tagName="jdo.join-vendor-extension"
superclasses="false">
Index: jdo_xml.package_class_field_value_column.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_class_field_value_column.xdt 14 Jul 2005 18:40:51
-0000 1.1
--- jdo_xml.package_class_field_value_column.xdt 27 Aug 2005 16:13:59
-0000 1.2
***************
*** 1,4 ****
- <value>
<column
<XDtField:ifHasFieldTag tagName="jdo.value-column"
paramName="name">
--- 1,3 ----
***************
*** 36,51 ****
</XDtField:ifHasFieldTag>
> <XDtComment:comment> end tag *column* </XDtComment:comment>
!
<XDtField:forAllFieldTags
tagName="jdo.value-column-vendor-extension" superclasses="false">
<extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="vendor-name"/>"
! key="<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="key"/>"
value="<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="value"/>">
<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="content" default=""/>
</extension>
</XDtField:forAllFieldTags>
!
<XDtJdo:forAllVendorExtensions level="value-column">
<XDtJdo:vendorExtension/>
</XDtJdo:forAllVendorExtensions>
</column>
- </value>
\ No newline at end of file
--- 35,49 ----
</XDtField:ifHasFieldTag>
> <XDtComment:comment> end tag *column* </XDtComment:comment>
!
<XDtField:forAllFieldTags
tagName="jdo.value-column-vendor-extension" superclasses="false">
<extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="vendor-name"/>"
! key="<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="value"/>"
value="<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="value"/>">
<XDtField:fieldTagValue
tagName="jdo.value-column-vendor-extension" paramName="content" default=""/>
</extension>
</XDtField:forAllFieldTags>
!
<XDtJdo:forAllVendorExtensions level="value-column">
<XDtJdo:vendorExtension/>
</XDtJdo:forAllVendorExtensions>
</column>
Index: jdo_xml.package_class_inheritance.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_inheritance.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** jdo_xml.package_class_inheritance.xdt 15 Jan 2005 00:09:28 -0000
1.2
--- jdo_xml.package_class_inheritance.xdt 27 Aug 2005 16:13:59 -0000
1.3
***************
*** 14,18 ****
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.inheritance-discriminator"
paramName="strategy" superclasses="false">
! strategy="<XDtClass:classTagValue
tagName="jdo.inheritance-discriminator" paramName="strategy"
values="value-map,class-name,none"/>"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.inheritance-discriminator"
paramName="indexed" superclasses="false">
--- 14,18 ----
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.inheritance-discriminator"
paramName="strategy" superclasses="false">
! strategy="<XDtClass:classTagValue
tagName="jdo.inheritance-discriminator" paramName="strategy"/>"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.inheritance-discriminator"
paramName="indexed" superclasses="false">
***************
*** 49,52 ****
--- 49,58 ----
allows-null="<XDtClass:classTagValue
tagName="jdo.inheritance-discriminator-column" paramName="allows-null"/>"
</XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag
tagName="jdo.inheritance-discriminator-column" paramName="default-value"
superclasses="false">
+ default-value="<XDtClass:classTagValue
tagName="jdo.inheritance-discriminator-column" paramName="default-value"/>"
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag
tagName="jdo.inheritance-discriminator-column" paramName="insert-value"
superclasses="false">
+ insert-value="<XDtClass:classTagValue
tagName="jdo.inheritance-discriminator-column" paramName="insert-value"/>"
+ </XDtClass:ifHasClassTag>
> <XDtComment:comment> end tag *column* </XDtComment:comment>
</column>
Index: jdo_xml.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.xdt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** jdo_xml.xdt 18 Jul 2005 22:09:37 -0000 1.18
--- jdo_xml.xdt 27 Aug 2005 16:13:59 -0000 1.19
***************
*** 21,24 ****
--- 21,35 ----
objectid-class="<XDtClass:classTagValue
tagName="jdo.persistence-capable" paramName="objectid-class"/>"
</XDtClass:ifHasClassTag>
+ <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
+ <XDtClass:ifHasClassTag tagName="jdo.persistence-capable"
paramName="catalog" superclasses="false">
+ objectid-class="<XDtClass:classTagValue
tagName="jdo.persistence-capable" paramName="catalog"/>"
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jdo.persistence-capable"
paramName="schema" superclasses="false">
+ objectid-class="<XDtClass:classTagValue
tagName="jdo.persistence-capable" paramName="schema"/>"
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamEquals>
+ <XDtClass:ifHasClassTag tagName="jdo.persistence-capable"
paramName="table" superclasses="false">
+ objectid-class="<XDtClass:classTagValue
tagName="jdo.persistence-capable" paramName="table"/>"
+ </XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.persistence-capable"
paramName="requires-extent" superclasses="false">
requires-extent="<XDtClass:classTagValue
tagName="jdo.persistence-capable" paramName="requires-extent"/>"
***************
*** 27,33 ****
persistence-capable-superclass="<XDtClass:classTagValue
tagName="jdo.persistence-capable" paramName="persistence-capable-superclass"/>"
</XDtClass:ifHasClassTag>
- <XDtClass:ifHasClassTag tagName="jdo.persistence-capable"
paramName="table" superclasses="false">
- table="<XDtClass:classTagValue tagName="jdo.persistence-capable"
paramName="table"/>"
- </XDtClass:ifHasClassTag>
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtClass:ifHasClassTag tagName="jdo.persistence-capable"
paramName="detachable" superclasses="false">
--- 38,41 ----
Index: jdo_xml.package_class_field_key.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key.xdt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_class_field_key.xdt 25 Aug 2005 02:02:10 -0000 1.1
--- jdo_xml.package_class_field_key.xdt 27 Aug 2005 16:13:59 -0000 1.2
***************
*** 4,7 ****
--- 4,10 ----
column="<XDtField:fieldTagValue tagName="jdo.key"
paramName="column"/>"
</XDtField:ifHasFieldTag>
+ <XDtField:ifHasFieldTag tagName="jdo.key" paramName="serialized">
+ serialized="<XDtField:fieldTagValue tagName="jdo.key"
paramName="serialized" values="true,false"/>"
+ </XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.key"
paramName="delete-action">
delete-action="<XDtField:fieldTagValue tagName="jdo.key"
paramName="delete-action" values="restrict,cascade,null,default,none"/>"
***************
*** 21,23 ****
</XDtMerge:merge>
</XDtField:forAllFieldTags>
! </key>
\ No newline at end of file
--- 24,26 ----
</XDtMerge:merge>
</XDtField:forAllFieldTags>
! </key>
Index: jdo_xml.package_class_field.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field.xdt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** jdo_xml.package_class_field.xdt 25 Aug 2005 17:52:57 -0000 1.8
--- jdo_xml.package_class_field.xdt 27 Aug 2005 16:13:59 -0000 1.9
***************
*** 4,7 ****
--- 4,15 ----
persistence-modifier="<XDtField:fieldTagValue
tagName="jdo.field" paramName="persistence-modifier"
values="persistent,transactional,none" default="persistent"/>"
</XDtField:ifHasFieldTag>
+ <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
+ <XDtField:ifHasFieldTag tagName="jdo.field" paramName="table">
+ table="<XDtField:fieldTagValue tagName="jdo.field"
paramName="table"/>"
+ </XDtField:ifHasFieldTag>
+ <XDtField:ifHasFieldTag tagName="jdo.field" paramName="column">
+ column="<XDtField:fieldTagValue tagName="jdo.field"
paramName="column"/>"
+ </XDtField:ifHasFieldTag>
+ </XDtConfig:ifConfigParamEquals>
<XDtField:ifHasFieldTag tagName="jdo.field" paramName="primary-key">
primary-key="<XDtField:fieldTagValue tagName="jdo.field"
paramName="primary-key" values="true,false" default="false"/>"
***************
*** 17,23 ****
</XDtField:ifHasFieldTag>
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
- <XDtField:ifHasFieldTag tagName="jdo.field" paramName="table">
- table="<XDtField:fieldTagValue tagName="jdo.field"
paramName="table"/>"
- </XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.field" paramName="serialized">
serialized="<XDtField:fieldTagValue tagName="jdo.field"
paramName="serialized" values="true,false"/>"
--- 25,28 ----
***************
*** 29,47 ****
value-strategy="<XDtField:fieldTagValue tagName="jdo.field"
paramName="value-strategy"/>"
</XDtField:ifHasFieldTag>
- <XDtField:ifHasFieldTag tagName="jdo.field" paramName="foreign-key">
- foreign-key="<XDtField:fieldTagValue tagName="jdo.field"
paramName="foreign-key"/>"
- </XDtField:ifHasFieldTag>
- <XDtField:ifHasFieldTag tagName="jdo.field"
paramName="load-fetch-group">
- load-fetch-group="<XDtField:fieldTagValue tagName="jdo.field"
paramName="load-fetch-group"/>"
- </XDtField:ifHasFieldTag>
- <XDtField:ifHasFieldTag tagName="jdo.field" paramName="fetch-depth">
- fetch-depth="<XDtField:fieldTagValue tagName="jdo.field"
paramName="fetch-depth"/>"
- </XDtField:ifHasFieldTag>
- <XDtField:ifHasFieldTag tagName="jdo.field" paramName="mapped-by">
- mapped-by="<XDtField:fieldTagValue tagName="jdo.field"
paramName="mapped-by"/>"
- </XDtField:ifHasFieldTag>
- <XDtField:ifHasFieldTag tagName="jdo.field" paramName="column">
- column="<XDtField:fieldTagValue tagName="jdo.field"
paramName="column"/>"
- </XDtField:ifHasFieldTag>
<XDtField:ifHasFieldTag tagName="jdo.field"
paramName="delete-action">
delete-action="<XDtField:fieldTagValue tagName="jdo.field"
paramName="delete-action" values="restrict,cascade,null,default,none"/>"
--- 34,37 ----
***************
*** 56,62 ****
sequence="<XDtField:fieldTagValue tagName="jdo.field"
paramName="sequence"/>"
</XDtField:ifHasFieldTag>
</XDtConfig:ifConfigParamEquals>
> <XDtComment:comment> --- end tag *field* --- </XDtComment:comment>
!
<XDtField:forAllFieldTags tagName="jdo.field-vendor-extension"
superclasses="false">
<extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="vendor-name"/>"
--- 46,64 ----
sequence="<XDtField:fieldTagValue tagName="jdo.field"
paramName="sequence"/>"
</XDtField:ifHasFieldTag>
+ <XDtField:ifHasFieldTag tagName="jdo.field" paramName="foreign-key">
+ foreign-key="<XDtField:fieldTagValue tagName="jdo.field"
paramName="foreign-key"/>"
+ </XDtField:ifHasFieldTag>
+ <XDtField:ifHasFieldTag tagName="jdo.field"
paramName="load-fetch-group">
+ load-fetch-group="<XDtField:fieldTagValue tagName="jdo.field"
paramName="load-fetch-group"/>"
+ </XDtField:ifHasFieldTag>
+ <XDtField:ifHasFieldTag tagName="jdo.field" paramName="fetch-depth">
+ fetch-depth="<XDtField:fieldTagValue tagName="jdo.field"
paramName="fetch-depth"/>"
+ </XDtField:ifHasFieldTag>
+ <XDtField:ifHasFieldTag tagName="jdo.field" paramName="mapped-by">
+ mapped-by="<XDtField:fieldTagValue tagName="jdo.field"
paramName="mapped-by"/>"
+ </XDtField:ifHasFieldTag>
</XDtConfig:ifConfigParamEquals>
> <XDtComment:comment> --- end tag *field* --- </XDtComment:comment>
!
<XDtField:forAllFieldTags tagName="jdo.field-vendor-extension"
superclasses="false">
<extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="vendor-name"/>"
***************
*** 66,70 ****
</extension>
</XDtField:forAllFieldTags>
!
<XDtField:ifFieldTagValueEquals tagName="jdo.field"
paramName="collection-type" value="collection">
<collection
--- 68,72 ----
</extension>
</XDtField:forAllFieldTags>
!
<XDtField:ifFieldTagValueEquals tagName="jdo.field"
paramName="collection-type" value="collection">
<collection
***************
*** 145,158 ****
</XDtMerge:merge>
</XDtField:ifHasFieldTag>
- </XDtConfig:ifConfigParamEquals>
! <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtField:ifHasFieldTag tagName="jdo.element">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element.xdt">
</XDtMerge:merge>
</XDtField:ifHasFieldTag>
- </XDtConfig:ifConfigParamEquals>
! <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtField:forAllFieldTags tagName="jdo.key" superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key.xdt">
--- 147,170 ----
</XDtMerge:merge>
</XDtField:ifHasFieldTag>
!
<XDtField:ifHasFieldTag tagName="jdo.element">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element.xdt">
</XDtMerge:merge>
</XDtField:ifHasFieldTag>
! <XDtComment:comment> If there is no @jdo.element, there might still be a
@jdo.element-column. </XDtComment:comment>
! <XDtField:ifDoesntHaveFieldTag tagName="jdo.element"
superclasses="false">
! <XDtField:ifHasFieldTag tagName="jdo.element-column">
! <element>
! <XDtField:forAllFieldTags tagName="jdo.element-column"
superclasses="false">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element_column.xdt">
! </XDtMerge:merge>
! </XDtField:forAllFieldTags>
! </element>
! </XDtField:ifHasFieldTag>
! </XDtField:ifDoesntHaveFieldTag>
!
!
<XDtField:forAllFieldTags tagName="jdo.key" superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key.xdt">
***************
*** 172,182 ****
</XDtField:ifDoesntHaveFieldTag>
! <XDtField:forAllFieldTags tagName="jdo.value-column"
superclasses="false">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt">
</XDtMerge:merge>
</XDtField:forAllFieldTags>
- </XDtConfig:ifConfigParamEquals>
! <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtField:forAllFieldTags tagName="jdo.column"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_column.xdt">
--- 184,206 ----
</XDtField:ifDoesntHaveFieldTag>
!
! <XDtField:forAllFieldTags tagName="jdo.value" superclasses="false">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value.xdt">
</XDtMerge:merge>
</XDtField:forAllFieldTags>
! <XDtComment:comment> If there is no @jdo.value, there might still be a
@jdo.value-column. </XDtComment:comment>
! <XDtField:ifDoesntHaveFieldTag tagName="jdo.value"
superclasses="false">
! <XDtField:ifHasFieldTag tagName="jdo.value-column">
! <value>
! <XDtField:forAllFieldTags tagName="jdo.value-column"
superclasses="false">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt">
! </XDtMerge:merge>
! </XDtField:forAllFieldTags>
! </value>
! </XDtField:ifHasFieldTag>
! </XDtField:ifDoesntHaveFieldTag>
!
!
<XDtField:forAllFieldTags tagName="jdo.column"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_column.xdt">
Index: jdo_xml.package_class_field_element.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** jdo_xml.package_class_field_element.xdt 18 Jul 2005 22:09:37 -0000
1.2
--- jdo_xml.package_class_field_element.xdt 27 Aug 2005 16:13:59 -0000
1.3
***************
*** 7,15 ****
serialized="<XDtField:fieldTagValue tagName="jdo.element"
paramName="serialized" values="true,false"/>"
</XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element"
paramName="foreign-key">
! foreign-key="<XDtField:fieldTagValue
tagName="jdo.element" paramName="foreign-key"/>"
</XDtField:ifHasFieldTag>
> <XDtComment:comment> end tag *element* </XDtComment:comment>
! <XDtField:forAllFieldTags tagName="jdo.element-column"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element_column.xdt">
</XDtMerge:merge>
--- 7,24 ----
serialized="<XDtField:fieldTagValue tagName="jdo.element"
paramName="serialized" values="true,false"/>"
</XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element"
paramName="delete-action">
! delete-action="<XDtField:fieldTagValue
tagName="jdo.element" paramName="delete-action"
values="restrict,cascade,null,default,none"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element"
paramName="update-action">
! update-action="<XDtField:fieldTagValue
tagName="jdo.element" paramName="update-action"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element" paramName="indexed">
! indexed="<XDtField:fieldTagValue tagName="jdo.element"
paramName="indexed" values="true,false,unique"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element" paramName="unique">
! unique="<XDtField:fieldTagValue tagName="jdo.element"
paramName="unique" values="true,false"/>"
</XDtField:ifHasFieldTag>
> <XDtComment:comment> end tag *element* </XDtComment:comment>
! <XDtField:forAllFieldTags tagName="jdo.element-column"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element_column.xdt">
</XDtMerge:merge>
Index: jdo_xml.package_class_datastore-identity.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_datastore-identity.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** jdo_xml.package_class_datastore-identity.xdt 15 Jan 2005 00:09:28
-0000 1.2
--- jdo_xml.package_class_datastore-identity.xdt 27 Aug 2005 16:13:59
-0000 1.3
***************
*** 7,15 ****
strategy="<XDtClass:classTagValue
tagName="jdo.datastore-identity" paramName="strategy"/>"
</XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="jdo.datastore-identity"
paramName="sequence-name" superclasses="false">
! sequence-name="<XDtClass:classTagValue
tagName="jdo.datastore-identity" paramName="sequence-name"/>"
! </XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="jdo.datastore-identity"
paramName="factory-class" superclasses="false">
! factory-class="<XDtClass:classTagValue
tagName="jdo.datastore-identity" paramName="factory-class"/>"
</XDtClass:ifHasClassTag>
> <XDtComment:comment> end tag *datastore-identity*
</XDtComment:comment>
--- 7,12 ----
strategy="<XDtClass:classTagValue
tagName="jdo.datastore-identity" paramName="strategy"/>"
</XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="jdo.datastore-identity"
paramName="sequence" superclasses="false">
! sequence-name="<XDtClass:classTagValue
tagName="jdo.datastore-identity" paramName="sequence"/>"
</XDtClass:ifHasClassTag>
> <XDtComment:comment> end tag *datastore-identity*
</XDtComment:comment>
***************
*** 43,46 ****
--- 40,49 ----
allows-null="<XDtClass:classTagValue
tagName="jdo.datastore-identity-column" paramName="allows-null"/>"
</XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jdo.datastore-identity-column"
paramName="default-value" superclasses="false">
+ default-value="<XDtClass:classTagValue
tagName="jdo.datastore-identity-column" paramName="default-value"/>"
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jdo.datastore-identity-column"
paramName="insert-value" superclasses="false">
+ insert-value="<XDtClass:classTagValue
tagName="jdo.datastore-identity-column" paramName="insert-value"/>"
+ </XDtClass:ifHasClassTag>
> <XDtComment:comment> end tag *column* </XDtComment:comment>
Index: jdo_xml.package_sequence.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_sequence.xdt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_sequence.xdt 14 Aug 2004 20:19:34 -0000 1.1
--- jdo_xml.package_sequence.xdt 27 Aug 2005 16:13:59 -0000 1.2
***************
*** 4,9 ****
name="<XDtClass:classTagValue tagName="jdo.sequence"
paramName="name"/>"
</XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="jdo.sequence"
paramName="sequence-name" superclasses="false">
! sequence-name="<XDtClass:classTagValue
tagName="jdo.sequence" paramName="sequence-name"/>"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.sequence" paramName="strategy"
superclasses="false">
--- 4,12 ----
name="<XDtClass:classTagValue tagName="jdo.sequence"
paramName="name"/>"
</XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="jdo.sequence"
paramName="datastore-sequence" superclasses="false">
! sequence-name="<XDtClass:classTagValue
tagName="jdo.sequence" paramName="datastore-sequence"/>"
! </XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="jdo.sequence"
paramName="factory-class" superclasses="false">
! factory-class="<XDtClass:classTagValue
tagName="jdo.sequence" paramName="factory-class"/>"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.sequence" paramName="strategy"
superclasses="false">
Index: jdo_xml.package_class_fetch-group.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_fetch-group.xdt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_class_fetch-group.xdt 22 Nov 2004 14:43:19 -0000
1.1
--- jdo_xml.package_class_fetch-group.xdt 27 Aug 2005 16:13:59 -0000
1.2
***************
*** 5,9 ****
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.fetch-group"
paramName="post-load">
! post-load="<XDtClass:classTagValue
tagName="jdo.fetch-group" paramName="post-load"/>"
</XDtClass:ifHasClassTag>
>
--- 5,9 ----
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="jdo.fetch-group"
paramName="post-load">
! post-load="<XDtClass:classTagValue
tagName="jdo.fetch-group" paramName="post-load" values="true,false"/>"
</XDtClass:ifHasClassTag>
>
***************
*** 19,21 ****
</XDtClass:ifHasClassTag>
</fetch-group>
! </XDtClass:forAllClassTags>
\ No newline at end of file
--- 19,21 ----
</XDtClass:ifHasClassTag>
</fetch-group>
! </XDtClass:forAllClassTags>
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
xdoclet-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
