Menu
▾
▴
[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate Comment.jelly, NONE, 1.1 Array.jelly, 1.10, 1.11 Bag.jelly, 1.13, 1.14 BaseCollectionHead.jelly, 1.2, 1.3 Class.jelly, 1.25, 1.26 Idbag.jelly, 1.6, 1.7 Join.jelly, 1.3, 1.4 JoinedSubclass.jelly, 1.14, 1.15 List.jelly, 1.13, 1.14 Map.jelly, 1.15, 1.16 PrimitiveArray.jelly, 1.10, 1.11 Set.jelly, 1.13, 1.14 UnionSubclass.jelly, 1.4, 1.5
|
From: Konstantin P. <ko...@us...> - 2006-09-09 13:16:09
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19076/src/main/java/org/xdoclet/plugin/hibernate Modified Files: Array.jelly Bag.jelly BaseCollectionHead.jelly Class.jelly Idbag.jelly Join.jelly JoinedSubclass.jelly List.jelly Map.jelly PrimitiveArray.jelly Set.jelly UnionSubclass.jelly Added Files: Comment.jelly Log Message: fix for XDP-141 problem, tag parameters are changed!!! --- NEW FILE: Comment.jelly --- <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:l="jelly:log"> <j:if test="${commentTag != null}"> <comment>${commentTag.value}</comment> </j:if> </j:jelly> Index: Idbag.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Idbag.jelly,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Idbag.jelly 17 Sep 2005 15:57:41 -0000 1.6 --- Idbag.jelly 9 Sep 2006 13:16:04 -0000 1.7 *************** *** 43,52 **** <j:import uri="/Synchronize.jelly" inherit="true"/> </j:forEach> ! ! <!-- process comment --> ! <j:if test="${idBagTag.comment != null}"> ! <comment>${idBagTag.comment}</comment> ! </j:if> ! <!-- process collection-id --> <j:import uri="/CollectionId.jelly" inherit="true"/> --- 43,51 ---- <j:import uri="/Synchronize.jelly" inherit="true"/> </j:forEach> ! ! <!-- process comment if any --> ! <j:set var="commentTag" value="${property.entity.getTagByName('hibernate.comment')}"/> ! <j:import uri="/Comment.jelly" inherit="true"/> ! <!-- process collection-id --> <j:import uri="/CollectionId.jelly" inherit="true"/> Index: JoinedSubclass.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/JoinedSubclass.jelly,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JoinedSubclass.jelly 24 Aug 2005 09:42:35 -0000 1.14 --- JoinedSubclass.jelly 9 Sep 2006 13:16:04 -0000 1.15 *************** *** 52,59 **** </j:forEach> ! <!-- process comment --> ! <j:if test="${joinedSubclassTag.comment != null}"> ! <comment>${joinedSubclassTag.comment}</comment> ! </j:if> <!-- process loader --> --- 52,59 ---- </j:forEach> ! <!-- process comment if any --> ! <j:set var="commentTag" value="${class.getTagByName('hibernate.comment')}"/> ! <j:import uri="/Comment.jelly" inherit="true"/> ! <!-- process loader --> Index: List.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/List.jelly,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** List.jelly 17 Sep 2005 15:57:41 -0000 1.13 --- List.jelly 9 Sep 2006 13:16:04 -0000 1.14 *************** *** 45,52 **** <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> - <!-- process comment --> - <j:if test="${listTag.comment != null}"> - <comment>${listTag.comment}</comment> - </j:if> </list> </j:if> --- 45,48 ---- Index: UnionSubclass.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/UnionSubclass.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UnionSubclass.jelly 29 Dec 2005 15:41:27 -0000 1.4 --- UnionSubclass.jelly 9 Sep 2006 13:16:04 -0000 1.5 *************** *** 48,55 **** </j:forEach> ! <!-- process comment --> ! <j:if test="${unionSubclassTag.comment != null}"> ! <comment>${unionSubclassTag.comment}</comment> ! </j:if> <!-- process loader --> --- 48,55 ---- </j:forEach> ! <!-- process comment if any --> ! <j:set var="commentTag" value="${class.getTagByName('hibernate.comment')}"/> ! <j:import uri="/Comment.jelly" inherit="true"/> ! <!-- process loader --> Index: Map.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Map.jelly,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Map.jelly 17 Sep 2005 15:57:41 -0000 1.15 --- Map.jelly 9 Sep 2006 13:16:04 -0000 1.16 *************** *** 43,51 **** <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> - <!-- process comment --> - <j:if test="${mapTag.comment != null}"> - <comment>${mapTag.comment}</comment> - </j:if> - </map> </j:jelly> --- 43,46 ---- Index: Class.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Class.jelly 14 Jun 2006 19:58:39 -0000 1.25 --- Class.jelly 9 Sep 2006 13:16:04 -0000 1.26 *************** *** 47,54 **** <j:set var="cacheEntiry" value="null"/> ! <!-- process comment element --> ! <j:if test="${classTag.comment != null}"> ! <comment>${classTag.comment}</comment> ! </j:if> <!-- process class ID tags --> --- 47,53 ---- <j:set var="cacheEntiry" value="null"/> ! <!-- process comment if any --> ! <j:set var="commentTag" value="${class.getTagByName('hibernate.comment')}"/> ! <j:import uri="/Comment.jelly" inherit="true"/> <!-- process class ID tags --> Index: PrimitiveArray.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/PrimitiveArray.jelly,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PrimitiveArray.jelly 17 Sep 2005 15:57:41 -0000 1.10 --- PrimitiveArray.jelly 9 Sep 2006 13:16:04 -0000 1.11 *************** *** 57,65 **** <j:set var="sqlOperationEntity" value="${property.entity}"/> <j:import uri="/SqlOperations.jelly" inherit="true"/> - - <!-- process comment --> - <j:if test="${primitiveArrayTag.comment != null}"> - <comment>${primitiveArrayTag.comment}</comment> - </j:if> </primitive-array> </j:if> --- 57,60 ---- Index: Bag.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Bag.jelly,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Bag.jelly 17 Sep 2005 15:57:41 -0000 1.13 --- Bag.jelly 9 Sep 2006 13:16:04 -0000 1.14 *************** *** 27,34 **** <j:import uri="/BaseCollectionHead.jelly" inherit="true"/> <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> ! <!-- process comment --> ! <j:if test="${bagTag.comment != null}"> ! <comment>${bagTag.comment}</comment> ! </j:if> </bag> </j:if> --- 27,31 ---- <j:import uri="/BaseCollectionHead.jelly" inherit="true"/> <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> ! </bag> </j:if> Index: BaseCollectionHead.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/BaseCollectionHead.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BaseCollectionHead.jelly 31 May 2005 11:24:35 -0000 1.2 --- BaseCollectionHead.jelly 9 Sep 2006 13:16:04 -0000 1.3 *************** *** 20,24 **** <j:import uri="/Synchronize.jelly" inherit="true"/> </j:forEach> ! <!-- process key --> <j:set var="keyTag" value="${property.entity.getTagByName('hibernate.key')}"/> --- 20,28 ---- <j:import uri="/Synchronize.jelly" inherit="true"/> </j:forEach> ! ! <!-- process comment if any --> ! <j:set var="commentTag" value="${property.entity.getTagByName('hibernate.comment')}"/> ! <j:import uri="/Comment.jelly" inherit="true"/> ! <!-- process key --> <j:set var="keyTag" value="${property.entity.getTagByName('hibernate.key')}"/> Index: Join.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Join.jelly,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Join.jelly 24 Aug 2005 09:42:35 -0000 1.3 --- Join.jelly 9 Sep 2006 13:16:04 -0000 1.4 *************** *** 9,12 **** --- 9,17 ---- optional="${joinTag.optional}"> + + <!-- process comment if any --> + <j:set var="commentTag" value="${property.entity.getTagByName('hibernate.comment')}"/> + <j:import uri="/Comment.jelly" inherit="true"/> + <!-- process key --> <j:set var="keyTag" value="${class.getTagByName('hibernate.join-key')}"/> *************** *** 17,24 **** <j:import uri="/Key.jelly" inherit="true"/> - <!-- process comment --> - <j:if test="${joinTag.comment != null}"> - <comment>${joinTag.comment}</comment> - </j:if> <!-- process subselect --> --- 22,25 ---- Index: Array.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Array.jelly,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Array.jelly 17 Sep 2005 15:57:41 -0000 1.10 --- Array.jelly 9 Sep 2006 13:16:04 -0000 1.11 *************** *** 43,50 **** <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> - <!-- process comment --> - <j:if test="${arrayTag.comment != null}"> - <comment>${arrayTag.comment}</comment> - </j:if> </array> </j:if> --- 43,46 ---- Index: Set.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Set.jelly,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Set.jelly 17 Sep 2005 15:57:41 -0000 1.13 --- Set.jelly 9 Sep 2006 13:16:04 -0000 1.14 *************** *** 27,34 **** <j:import uri="/BaseCollectionHead.jelly" inherit="true"/> <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> ! <!-- process comment --> ! <j:if test="${setTag.comment != null}"> ! <comment>${setTag.comment}</comment> ! </j:if> </set> </j:jelly> --- 27,31 ---- <j:import uri="/BaseCollectionHead.jelly" inherit="true"/> <j:import uri="/BaseCollectionTail.jelly" inherit="true"/> ! </set> </j:jelly> |
