CVS: xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources hibernate-composite-id.xdt,NONE,1.1 hibernate-composite-id.xdt,NONE,1.1 hibernate-class.xdt,1.6,1.7 hibernate-composite-index.xdt,1.2,1.3 hibernate-key-many-to-one.xdt,1.3,1.4 hibernate-key-property.xdt,1.3,1.4 hibernate-composite-id.xdt,1.3,NONE
Paul Galbraith <[email protected]>
| Newsgroups | gmane.comp.java.xdoclet.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21893/modules/hibernate/src/xdoclet/modules/hibernate/resources
Modified Files:
hibernate-class.xdt hibernate-composite-index.xdt
hibernate-key-many-to-one.xdt hibernate-key-property.xdt
Added Files:
hibernate-composite-id$class.xdt
hibernate-composite-id$method.xdt
Removed Files:
hibernate-composite-id.xdt
Log Message:
[XDT-414] Allow composite-id composed of multiple class member properties
--- NEW FILE: hibernate-composite-id$class.xdt ---
<XDtClass:ifHasClassTag tagName="hibernate.composite-id">
<composite-id
<XDtClass:ifHasClassTag tagName="hibernate.composite-id" paramName="unsaved-value">
unsaved-value="<XDtClass:classTagValue tagName='hibernate.composite-id' paramName='unsaved-value' />"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="hibernate.composite-id" paramName="mapped">
mapped="<XDtClass:classTagValue tagName='hibernate.composite-id' paramName='mapped' />"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="hibernate.composite-id" paramName="node">
node="<XDtClass:classTagValue tagName='hibernate.composite-id' paramName='node' />"
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="hibernate.composite-id" paramName="access">
access="<XDtClass:classTagValue tagName='hibernate.composite-id' paramName='access' />"
</XDtClass:ifHasClassTag>
>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-meta$class.xdt"
>
</XDtMerge:merge>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-property.xdt"
parent-id="<XDtClass:classTagValue tagName='hibernate.composite-id' paramName='element-id'/>"
>
</XDtMerge:merge>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-many-to-one.xdt"
parent-id="<XDtClass:classTagValue tagName='hibernate.composite-id' paramName='element-id'/>"
>
</XDtMerge:merge>
</composite-id>
</XDtClass:ifHasClassTag>
--- NEW FILE: hibernate-composite-id$method.xdt ---
<XDtMethod:ifHasMethodTag tagName="hibernate.composite-id">
<composite-id
name="<XDtMethod:propertyName/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.composite-id" paramName="class">
class="<XDtMethod:methodTagValue tagName='hibernate.composite-id' paramName='class' />"
</XDtMethod:ifHasMethodTag>
<XDtMethod:ifHasMethodTag tagName="hibernate.composite-id" paramName="unsaved-value">
unsaved-value="<XDtMethod:methodTagValue tagName='hibernate.composite-id' paramName='unsaved-value' />"
</XDtMethod:ifHasMethodTag>
<XDtMethod:ifHasMethodTag tagName="hibernate.composite-id" paramName="mapped">
mapped="<XDtMethod:methodTagValue tagName='hibernate.composite-id' paramName='mapped' />"
</XDtMethod:ifHasMethodTag>
<XDtMethod:ifHasMethodTag tagName="hibernate.composite-id" paramName="node">
node="<XDtMethod:methodTagValue tagName='hibernate.composite-id' paramName='node' />"
</XDtMethod:ifHasMethodTag>
<XDtMethod:ifHasMethodTag tagName="hibernate.composite-id" paramName="access">
access="<XDtMethod:methodTagValue tagName='hibernate.composite-id' paramName='access' />"
</XDtMethod:ifHasMethodTag>
>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-meta$method.xdt"
>
</XDtMerge:merge>
<XDtClass:pushClass
value='<XDtMethod:methodTagValue tagName="hibernate.composite-id" paramName="class" default="<XDtMethod:methodType/>"/>'
>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-property.xdt"
>
</XDtMerge:merge>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-many-to-one.xdt"
>
</XDtMerge:merge>
</XDtClass:pushClass>
</composite-id>
</XDtMethod:ifHasMethodTag>
<XDtHibernate:ifHasCompositeId>
<XDtMethod:ifHasMethodTag tagName="hibernate.id">
<!-- Use of @hibernate.id for composite IDs is deprecated, use @hibernate.composite-id instead -->
<composite-id
name="<XDtMethod:propertyName/>"
class="<XDtMethod:methodTagValue tagName="hibernate.id" paramName="type" default="<XDtMethod:methodType/>"/>"
<XDtMethod:ifHasMethodTag tagName="hibernate.id" paramName="unsaved-value">
unsaved-value="<XDtMethod:methodTagValue tagName="hibernate.id" paramName="unsaved-value" values="any,none"/>"
</XDtMethod:ifHasMethodTag>
>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-meta$method.xdt"
>
</XDtMerge:merge>
<XDtClass:pushClass value='<XDtMethod:methodTagValue tagName="hibernate.id" paramName="type" default="<XDtMethod:methodType/>"/>'>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-property.xdt"
parent-id="__DEPRECATED__"
>
</XDtMerge:merge>
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-many-to-one.xdt"
parent-id="__DEPRECATED__"
>
</XDtMerge:merge>
</XDtClass:pushClass>
</composite-id>
</XDtMethod:ifHasMethodTag>
</XDtHibernate:ifHasCompositeId>
Index: hibernate-class.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-class.xdt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hibernate-class.xdt 29 Jul 2005 17:42:09 -0000 1.6
--- hibernate-class.xdt 26 Aug 2005 00:32:32 -0000 1.7
***************
*** 72,76 ****
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-comment$class.xdt"></XDtMerge:merge>
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-id.xdt"></XDtMerge:merge>
! <XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-composite-id.xdt"></XDtMerge:merge>
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-discriminator.xdt"></XDtMerge:merge>
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-version.xdt"></XDtMerge:merge>
--- 72,77 ----
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-comment$class.xdt"></XDtMerge:merge>
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-id.xdt"></XDtMerge:merge>
! <XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-composite-id$class.xdt"></XDtMerge:merge>
! <XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-composite-id$method.xdt"></XDtMerge:merge>
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-discriminator.xdt"></XDtMerge:merge>
<XDtMerge:merge file="xdoclet/modules/hibernate/resources/hibernate-version.xdt"></XDtMerge:merge>
Index: hibernate-composite-index.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-composite-index.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hibernate-composite-index.xdt 20 Jul 2005 17:50:03 -0000 1.2
--- hibernate-composite-index.xdt 26 Aug 2005 00:32:32 -0000 1.3
***************
*** 34,38 ****
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-property.xdt"
! parent-id="deprecated"
>
</XDtMerge:merge>
--- 34,38 ----
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-property.xdt"
! parent-id="__DEPRECATED__"
>
</XDtMerge:merge>
***************
*** 40,44 ****
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-many-to-one.xdt"
! parent-id="deprecated"
>
</XDtMerge:merge>
--- 40,44 ----
<XDtMerge:merge
file="xdoclet/modules/hibernate/resources/hibernate-key-many-to-one.xdt"
! parent-id="__DEPRECATED__"
>
</XDtMerge:merge>
Index: hibernate-key-many-to-one.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-key-many-to-one.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hibernate-key-many-to-one.xdt 20 Jul 2005 17:50:03 -0000 1.3
--- hibernate-key-many-to-one.xdt 26 Aug 2005 00:32:32 -0000 1.4
***************
*** 1,52 ****
<XDtMethod:forAllMethods superclasses="true" sort="true">
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one">
!
! <key-many-to-one
! name="<XDtMethod:propertyName/>"
- <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="access">
- access="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="access"/>"
- </XDtMethod:ifHasMethodTag>
-
- <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="class">
- class="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="class" />"
- </XDtMethod:ifHasMethodTag>
-
- <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="entity-name">
- entity-name="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="entity-name"/>"
- </XDtMethod:ifHasMethodTag>
-
- <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="column">
- column="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="column"/>"
- </XDtMethod:ifHasMethodTag>
-
- <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="foreign-key">
- foreign-key="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="foreign-key"/>"
- </XDtMethod:ifHasMethodTag>
-
- <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="lazy">
- lazy="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="lazy"/>"
- </XDtMethod:ifHasMethodTag>
-
- >
-
- <XDtMerge:merge
- file="xdoclet/modules/hibernate/resources/hibernate-meta$method.xdt"
- >
- </XDtMerge:merge>
-
- <XDtMerge:merge
- file="xdoclet/modules/hibernate/resources/hibernate-column$method.xdt"
- parent-id="<XDtMethod:methodTagValue tagName='hibernate.key-many-to-one' paramName='element-id'/>"
>
! </XDtMerge:merge>
!
! </key-many-to-one>
!
! </XDtMethod:ifHasMethodTag>
! <XDtMerge:ifParentIdEquals id="deprecated">
<XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
--- 1,54 ----
<XDtMethod:forAllMethods superclasses="true" sort="true">
! <XDtMerge:ifParentIdEquals id="<XDtMethod:methodTagValue tagName='hibernate.key-many-to-one' paramName='parent-element'/>">
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one">
! <key-many-to-one
!
! name="<XDtMethod:propertyName/>"
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="access">
! access="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="access"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="class">
! class="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="class" />"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="entity-name">
! entity-name="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="entity-name"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="column">
! column="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="column"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="foreign-key">
! foreign-key="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="foreign-key"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-many-to-one" paramName="lazy">
! lazy="<XDtMethod:methodTagValue tagName="hibernate.key-many-to-one" paramName="lazy"/>"
! </XDtMethod:ifHasMethodTag>
>
!
! <XDtMerge:merge
! file="xdoclet/modules/hibernate/resources/hibernate-meta$method.xdt"
! >
! </XDtMerge:merge>
!
! <XDtMerge:merge
! file="xdoclet/modules/hibernate/resources/hibernate-column$method.xdt"
! parent-id="<XDtMethod:methodTagValue tagName='hibernate.key-many-to-one' paramName='element-id'/>"
! >
! </XDtMerge:merge>
!
! </key-many-to-one>
!
! </XDtMethod:ifHasMethodTag>
! </XDtMerge:ifParentIdEquals>
! <XDtMerge:ifParentIdEquals id="__DEPRECATED__">
<XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
Index: hibernate-key-property.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-key-property.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hibernate-key-property.xdt 20 Jul 2005 17:50:03 -0000 1.3
--- hibernate-key-property.xdt 26 Aug 2005 00:32:32 -0000 1.4
***************
*** 1,48 ****
<XDtMethod:forAllMethods superclasses="true" sort="true">
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property">
!
! <key-property
! name="<XDtMethod:propertyName />"
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="access">
! access="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="access"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="type">
! type="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="type" default="<XDtMethod:methodType/>"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="column">
! column="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="column" default="<XDtHibernate:computeColumnName base='<XDtMethod:propertyName/>'/>"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="length">
! length="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="length" />"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="node">
! node="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="node" />"
! </XDtMethod:ifHasMethodTag>
! >
!
! <XDtMerge:merge
! file="xdoclet/modules/hibernate/resources/hibernate-meta$method.xdt"
>
- </XDtMerge:merge>
! <XDtMerge:merge
! file="xdoclet/modules/hibernate/resources/hibernate-column$method.xdt"
! parent-id="<XDtMethod:methodTagValue tagName='hibernate.key-property' paramName='element-id'/>"
! >
! </XDtMerge:merge>
! </key-property>
!
! </XDtMethod:ifHasMethodTag>
!
! <XDtMerge:ifParentIdEquals id="deprecated">
<XDtMethod:ifHasMethodTag tagName="hibernate.property">
<XDtMethod:ifDoesntHaveMethodTag tagName="hibernate.property" paramName="formula">
--- 1,50 ----
<XDtMethod:forAllMethods superclasses="true" sort="true">
! <XDtMerge:ifParentIdEquals id="<XDtMethod:methodTagValue tagName='hibernate.key-property' paramName='parent-element'/>">
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property">
! <key-property
! name="<XDtMethod:propertyName />"
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="access">
! access="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="access"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="type">
! type="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="type" default="<XDtMethod:methodType/>"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="column">
! column="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="column" default="<XDtHibernate:computeColumnName base='<XDtMethod:propertyName/>'/>"/>"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="length">
! length="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="length" />"
! </XDtMethod:ifHasMethodTag>
!
! <XDtMethod:ifHasMethodTag tagName="hibernate.key-property" paramName="node">
! node="<XDtMethod:methodTagValue tagName="hibernate.key-property" paramName="node" />"
! </XDtMethod:ifHasMethodTag>
!
>
! <XDtMerge:merge
! file="xdoclet/modules/hibernate/resources/hibernate-meta$method.xdt"
! >
! </XDtMerge:merge>
!
! <XDtMerge:merge
! file="xdoclet/modules/hibernate/resources/hibernate-column$method.xdt"
! parent-id="<XDtMethod:methodTagValue tagName='hibernate.key-property' paramName='element-id'/>"
! >
! </XDtMerge:merge>
!
! </key-property>
! </XDtMethod:ifHasMethodTag>
! </XDtMerge:ifParentIdEquals>
!
! <XDtMerge:ifParentIdEquals id="__DEPRECATED__">
<XDtMethod:ifHasMethodTag tagName="hibernate.property">
<XDtMethod:ifDoesntHaveMethodTag tagName="hibernate.property" paramName="formula">
--- hibernate-composite-id.xdt DELETED ---
-------------------------------------------------------
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