Update of /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25321/modules/jdo/src/xdoclet/modules/jdo/resources
Modified Files:
jdo_xml.xdt jdo_xml.package_class_field_element_column.xdt
jdo_xml.package_class_field.xdt
jdo_xml.package_class_field_element.xdt
Removed Files:
jdo_xml.package_class_field_fetch-group.xdt
Log Message:
- removed package/class/field/fetch-group as it has disappeared in the final
JDO2 DTD
- corrected order of the tags as the order seems to be important (got
validation errors)
Index: jdo_xml.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.xdt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** jdo_xml.xdt 14 Jul 2005 16:27:47 -0000 1.17
--- jdo_xml.xdt 18 Jul 2005 22:09:37 -0000 1.18
***************
*** 56,69 ****
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtClass:ifHasClassTag tagName="jdo.datastore-identity"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_datastore-identity.xdt">
</XDtMerge:merge>
</XDtClass:ifHasClassTag>
!
<XDtClass:ifHasClassTag tagName="jdo.inheritance" superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_inheritance.xdt">
</XDtMerge:merge>
</XDtClass:ifHasClassTag>
!
<XDtClass:forAllClassTags tagName="jdo.query" superclasses="false">
<XDtClass:ifClassTagValueNotEquals tagName="jdo.query"
paramName="global" value="true" superclasses="false">
--- 56,83 ----
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
+ <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_implements.xdt">
+ </XDtMerge:merge>
+ </XDtConfig:ifConfigParamEquals>
+
+ <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtClass:ifHasClassTag tagName="jdo.datastore-identity"
superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_datastore-identity.xdt">
</XDtMerge:merge>
</XDtClass:ifHasClassTag>
!
<XDtClass:ifHasClassTag tagName="jdo.inheritance" superclasses="false">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_inheritance.xdt">
</XDtMerge:merge>
</XDtClass:ifHasClassTag>
! </XDtConfig:ifConfigParamEquals>
!
! <XDtField:forAllFields superclasses="false">
! <XDtField:ifHasFieldTag tagName="jdo.field">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field.xdt">
! </XDtMerge:merge>
! </XDtField:ifHasFieldTag>
! </XDtField:forAllFields>
!
! <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtClass:forAllClassTags tagName="jdo.query" superclasses="false">
<XDtClass:ifClassTagValueNotEquals tagName="jdo.query"
paramName="global" value="true" superclasses="false">
***************
*** 79,89 ****
</XDtConfig:ifConfigParamEquals>
- <XDtField:forAllFields superclasses="false">
- <XDtField:ifHasFieldTag tagName="jdo.field">
- <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field.xdt">
- </XDtMerge:merge>
- </XDtField:ifHasFieldTag>
- </XDtField:forAllFields>
-
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
<XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_fetch-group.xdt">
--- 93,96 ----
***************
*** 91,99 ****
</XDtConfig:ifConfigParamEquals>
- <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
- <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_implements.xdt">
- </XDtMerge:merge>
- </XDtConfig:ifConfigParamEquals>
-
</class>
</XDtClass:ifHasClassTag>
--- 98,101 ----
Index: jdo_xml.package_class_field_element_column.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element_column.xdt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_class_field_element_column.xdt 14 Jul 2005 18:40:51
-0000 1.1
--- jdo_xml.package_class_field_element_column.xdt 18 Jul 2005 22:09:37
-0000 1.2
***************
*** 1,51 ****
! <element>
! <column
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="name">
! name="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="name"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="target">
! target="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="target"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="target-field">
! target-field="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="target-field"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="jdbc-type">
! jdbc-type="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="jdbc-type"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="sql-type">
! sql-type="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="sql-type"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="length">
! length="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="length"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="scale">
! scale="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="scale"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="precision">
! precision="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="precision"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="allows-null">
! allows-null="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="allows-null"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="default-value">
! default-value="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="default-value"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="insert-value">
! insert-value="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="insert-value"/>"
! </XDtField:ifHasFieldTag>
! > <XDtComment:comment> end tag *column* </XDtComment:comment>
!
! <XDtField:forAllFieldTags
tagName="jdo.element-column-vendor-extension" superclasses="false">
! <extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="vendor-name"/>"
! key="<XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="key"/>"
! value="<XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="value"/>">
! <XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="content" default=""/>
! </extension>
! </XDtField:forAllFieldTags>
!
! <XDtJdo:forAllVendorExtensions level="element-column">
! <XDtJdo:vendorExtension/>
! </XDtJdo:forAllVendorExtensions>
! </column>
! </element>
\ No newline at end of file
--- 1,49 ----
! <column
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="name">
! name="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="name"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="target">
! target="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="target"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="target-field">
! target-field="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="target-field"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="jdbc-type">
! jdbc-type="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="jdbc-type"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="sql-type">
! sql-type="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="sql-type"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="length">
! length="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="length"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="scale">
! scale="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="scale"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="precision">
! precision="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="precision"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="allows-null">
! allows-null="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="allows-null"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="default-value">
! default-value="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="default-value"/>"
! </XDtField:ifHasFieldTag>
! <XDtField:ifHasFieldTag tagName="jdo.element-column"
paramName="insert-value">
! insert-value="<XDtField:fieldTagValue
tagName="jdo.element-column" paramName="insert-value"/>"
! </XDtField:ifHasFieldTag>
! > <XDtComment:comment> end tag *column* </XDtComment:comment>
!
! <XDtField:forAllFieldTags
tagName="jdo.element-column-vendor-extension" superclasses="false">
! <extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="vendor-name"/>"
! key="<XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="key"/>"
! value="<XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="value"/>">
! <XDtField:fieldTagValue
tagName="jdo.element-column-vendor-extension" paramName="content" default=""/>
! </extension>
! </XDtField:forAllFieldTags>
!
! <XDtJdo:forAllVendorExtensions level="element-column">
! <XDtJdo:vendorExtension/>
! </XDtJdo:forAllVendorExtensions>
! </column>
\ No newline at end of file
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.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** jdo_xml.package_class_field.xdt 14 Jul 2005 18:40:51 -0000 1.5
--- jdo_xml.package_class_field.xdt 18 Jul 2005 22:09:37 -0000 1.6
***************
*** 58,61 ****
--- 58,69 ----
</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"/>"
+ key="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="key"/>"
+ value="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="value"/>">
+ <XDtField:fieldTagValue tagName="jdo.field-vendor-extension"
paramName="content" default=""/>
+ </extension>
+ </XDtField:forAllFieldTags>
<XDtField:ifFieldTagValueEquals tagName="jdo.field"
paramName="collection-type" value="collection">
***************
*** 131,155 ****
</array>
</XDtField:ifFieldTagValueEquals>
!
! <XDtField:forAllFieldTags tagName="jdo.field-vendor-extension"
superclasses="false">
! <extension vendor-name="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="vendor-name"/>"
! key="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="key"/>"
! value="<XDtField:fieldTagValue
tagName="jdo.field-vendor-extension" paramName="value"/>">
! <XDtField:fieldTagValue tagName="jdo.field-vendor-extension"
paramName="content" default=""/>
! </extension>
! </XDtField:forAllFieldTags>
!
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
! <XDtField:forAllFieldTags tagName="jdo.fetch-group"
superclasses="false">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_fetch-group.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">
</XDtMerge:merge>
! </XDtField:forAllFieldTags>
</XDtConfig:ifConfigParamEquals>
--- 139,155 ----
</array>
</XDtField:ifFieldTagValueEquals>
!
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
! <XDtField:ifHasFieldTag tagName="jdo.join">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join.xdt">
</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>
***************
*** 164,186 ****
</XDtMerge:merge>
</XDtField:forAllFieldTags>
-
- <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>
</XDtConfig:ifConfigParamEquals>
<XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
! <XDtField:ifHasFieldTag tagName="jdo.join">
! <XDtMerge:merge
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join.xdt">
! </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>
--- 164,174 ----
</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">
</XDtMerge:merge>
! </XDtField:forAllFieldTags>
</XDtConfig:ifConfigParamEquals>
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.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_class_field_element.xdt 1 Sep 2004 20:47:41 -0000
1.1
--- jdo_xml.package_class_field_element.xdt 18 Jul 2005 22:09:37 -0000
1.2
***************
*** 11,13 ****
--- 11,17 ----
</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>
+ </XDtField:forAllFieldTags>
</element>
--- jdo_xml.package_class_field_fetch-group.xdt DELETED ---
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
