Update of
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv25395/src/xdoclet/modules/hibernate/resources
Modified Files:
hibernate-collections.xdt hibernate-properties.xdt
hibernate-subclass.xdt hibernate.xdt
Log Message:
fixed bugs with subclass mappings
- subclasses > 1 level deep were not working
- properties inherited from unmapped superclasses were included twice (once from
class, once from subclass)
removed hibernate-collection and hibernate-collection-subcollection tags (which were
nonworking anyway)
removed unnecessary role attribute for collection tags (use property name instead)
Index: hibernate-collections.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-collections.xdt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hibernate-collections.xdt 19 Feb 2003 17:11:36 -0000 1.4
--- hibernate-collections.xdt 6 Mar 2003 12:37:00 -0000 1.5
***************
*** 58,79 ****
</XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.collection-subcollection">
- <subcollection
- <XDtMethod:ifHasMethodTag tagName="hibernatecollection-subcollection"
paramName="column">
- column="<XDtMethod:methodTagValue
tagName="hibernate.collection-subcollection" paramName="column"/>"
- </XDtMethod:ifHasMethodTag>
- role="<XDtMethod:methodTagValue
tagName="hibernate.collection-subcollection" paramName="role" />"
- <XDtMethod:ifHasMethodTag tagName="hibernate.collection-subcollection"
paramName="length">
- length="<XDtMethod:methodTagValue
tagName="collection-subcollection" paramName="length" />"
- </XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.collection-subcollection"
paramName="not-null">
- not-null="<XDtMethod:methodTagValue
tagName="hibernate.collection-subcollection" paramName="not-null" />"
- </XDtMethod:ifHasMethodTag>
- <XDtMethod:ifHasMethodTag tagName="hibernate.collection-subcollection"
paramName="unique">
- unique="<XDtMethod:methodTagValue
tagName="hibernate.collection-subcollection" paramName="unique" />"
- </XDtMethod:ifHasMethodTag>
- />
- </XDtMethod:ifHasMethodTag>
-
<XDtMethod:ifHasMethodTag tagName="hibernate.collection-composite-element">
<composite-element
--- 58,61 ----
Index: hibernate-properties.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** hibernate-properties.xdt 3 Feb 2003 21:13:57 -0000 1.8
--- hibernate-properties.xdt 6 Mar 2003 12:37:00 -0000 1.9
***************
*** 1,3 ****
- <XDtMethod:forAllMethods superclasses="true" sort="true">
<XDtMethod:ifHasMethodTag tagName="hibernate.property">
<property
--- 1,2 ----
***************
*** 33,65 ****
constrained="<XDtMethod:methodTagValue tagName="hibernate.one-to-one"
paramName="constrained" values="true,false" default="false"/>"
/>
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.collection">
! <!-- NEED TO VERIFY THIS PART WITH THE DTD -->
! <collection
! name="<XDtMethod:propertyName />"
! role="<XDtMethod:methodTagValue tagName="hibernate.collection"
paramName="role" default="<XDtMethod:propertyName/>"/>"
! <XDtMethod:ifHasMethodTag tagName="hibernate.collection"
paramName="column">
! column="<XDtMethod:methodTagValue tagName="hibernate.collection"
paramName="column" />"
! </XDtMethod:ifHasMethodTag>
! <XDtMethod:ifHasMethodTag tagName="hibernate.collection"
paramName="length">
! length="<XDtMethod:methodTagValue tagName="hibernate.collection"
paramName="length" />"
! </XDtMethod:ifHasMethodTag>
! <XDtMethod:ifHasMethodTag tagName="hibernate.collection"
paramName="not-null">
! not-null="<XDtMethod:methodTagValue tagName="hibernate.collection"
paramName="not-null" />"
! </XDtMethod:ifHasMethodTag>
! <XDtMethod:ifHasMethodTag tagName="hibernate.collection"
paramName="unique">
! unique="<XDtMethod:methodTagValue tagName="hibernate.collection"
paramName="unique" />"
! </XDtMethod:ifHasMethodTag>
! <XDtMethod:ifHasMethodTag tagName="hibernate.collection"
paramName="cascade">
! cascade="<XDtMethod:methodTagValue tagName="hibernate.collection"
paramName="cascade" values="none,all,save/update,delete" />"
! </XDtMethod:ifHasMethodTag>
! >
!
! <XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-collections.xdt">
! </XDtMerge:merge>
!
! </collection>
! </XDtMethod:ifHasMethodTag>
<XDtMethod:ifHasMethodTag tagName="hibernate.component">
--- 32,36 ----
constrained="<XDtMethod:methodTagValue tagName="hibernate.one-to-one"
paramName="constrained" values="true,false" default="false"/>"
/>
! </XDtMethod:ifHasMethodTag>
<XDtMethod:ifHasMethodTag tagName="hibernate.component">
***************
*** 85,89 ****
<XDtMethod:ifHasMethodTag tagName="hibernate.set">
<set
! role="<XDtMethod:methodTagValue tagName="hibernate.set" paramName="role"
default="<XDtMethod:propertyName/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.set"
paramName="table" />"
--- 56,60 ----
<XDtMethod:ifHasMethodTag tagName="hibernate.set">
<set
! role="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.set"
paramName="table" />"
***************
*** 109,113 ****
<XDtMethod:ifHasMethodTag tagName="hibernate.bag">
<bag
! role="<XDtMethod:methodTagValue tagName="hibernate.bag" paramName="role"
default="<XDtMethod:propertyName/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.bag"
paramName="table" />"
--- 80,84 ----
<XDtMethod:ifHasMethodTag tagName="hibernate.bag">
<bag
! role="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.bag"
paramName="table" />"
***************
*** 132,136 ****
<XDtMethod:ifHasMethodTag tagName="hibernate.list">
<list
! role="<XDtMethod:methodTagValue tagName="hibernate.list"
paramName="role" default="<XDtMethod:propertyName/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.list"
paramName="table" />"
--- 103,107 ----
<XDtMethod:ifHasMethodTag tagName="hibernate.list">
<list
! role="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.list"
paramName="table" />"
***************
*** 149,153 ****
<XDtMethod:ifHasMethodTag tagName="hibernate.map">
<map
! role="<XDtMethod:methodTagValue tagName="hibernate.map" paramName="role"
default="<XDtMethod:propertyName/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.map"
paramName="table" />"
--- 120,124 ----
<XDtMethod:ifHasMethodTag tagName="hibernate.map">
<map
! role="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.map"
paramName="table" />"
***************
*** 172,176 ****
<XDtMethod:ifHasMethodTag tagName="hibernate.array">
<array
! role="<XDtMethod:methodTagValue tagName="hibernate.array"
paramName="role" default="<XDtMethod:propertyName/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.array"
paramName="table" />"
--- 143,147 ----
<XDtMethod:ifHasMethodTag tagName="hibernate.array">
<array
! role="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.array"
paramName="table" />"
***************
*** 193,197 ****
<XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
<primitive-array
! role="<XDtMethod:methodTagValue tagName="hibernate.primitive-array"
paramName="role" default="<XDtMethod:propertyName/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array"
paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.primitive-array"
paramName="table" />"
--- 164,168 ----
<XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
<primitive-array
! role="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array"
paramName="table">
table="<XDtMethod:methodTagValue tagName="hibernate.primitive-array"
paramName="table" />"
***************
*** 205,208 ****
</primitive-array>
</XDtMethod:ifHasMethodTag>
-
- </XDtMethod:forAllMethods>
--- 176,177 ----
Index: hibernate-subclass.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-subclass.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hibernate-subclass.xdt 23 Jan 2003 01:02:03 -0000 1.3
--- hibernate-subclass.xdt 6 Mar 2003 12:37:01 -0000 1.4
***************
*** 11,20 ****
>
! <XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-properties.xdt">
! </XDtMerge:merge>
! <!-- JRS:FIXME - why was this self inclusion here? A mistake?
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-subclass.xdt">
</XDtMerge:merge>
! -->
</subclass>
</XDtClass:ifHasClassTag>
--- 11,22 ----
>
! <XDtMethod:forAllMethods superclasses="false" sort="true">
! <XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-properties.xdt">
! </XDtMerge:merge>
! </XDtMethod:forAllMethods>
!
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-subclass.xdt">
</XDtMerge:merge>
!
</subclass>
</XDtClass:ifHasClassTag>
Index: hibernate.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate.xdt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** hibernate.xdt 3 Feb 2003 21:19:15 -0000 1.8
--- hibernate.xdt 6 Mar 2003 12:37:01 -0000 1.9
***************
*** 130,135 ****
<XDtCollection:put name="backupClass" key="oldClassName"
value="<XDtClass:fullClassName />" />
! <XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-properties.xdt">
! </XDtMerge:merge>
<XDtMerge:merge file="hibernate-properties.xml">
--- 130,137 ----
<XDtCollection:put name="backupClass" key="oldClassName"
value="<XDtClass:fullClassName />" />
! <XDtMethod:forAllMethods superclasses="true" sort="true">
! <XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-properties.xdt">
! </XDtMerge:merge>
! </XDtMethod:forAllMethods>
<XDtMerge:merge file="hibernate-properties.xml">
***************
*** 138,142 ****
<XDtMerge:merge file="hibernate-properties-<XDtClass:className />.xml">
<!--
! To add non XDoclet properties, create a file named
hibernate-properties-<XDtClass:className />.xml
--- 140,144 ----
<XDtMerge:merge file="hibernate-properties-<XDtClass:className />.xml">
<!--
! To add non XDoclet property mappings, create a file named
hibernate-properties-<XDtClass:className />.xml
***************
*** 145,149 ****
-->
</XDtMerge:merge>
!
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-subclass.xdt">
</XDtMerge:merge>
--- 147,151 ----
-->
</XDtMerge:merge>
!
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-subclass.xdt">
</XDtMerge:merge>
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger
for complex code. Debugging C/C++ programs can leave you feeling lost and
disoriented. TotalView can help you find your way. Available on major UNIX
and Linux platforms. Try it free. www.etnus.com
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
