Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18409/src/main/java/org/xdoclet/plugin/hibernate
Modified Files:
Array.jelly Bag.jelly Class.jelly Column.jelly
HibernateMappingPlugin.java Idbag.jelly Join.jelly
JoinedSubclass.jelly List.jelly Map.jelly PrimitiveArray.jelly
Set.jelly UnionSubclass.jelly
Log Message:
(XDP-92) Added comment support. Thanks to Ranieri J D Severiano
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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** List.jelly 22 Jun 2005 15:54:03 -0000 1.10
--- List.jelly 24 Aug 2005 09:42:35 -0000 1.11
***************
*** 46,49 ****
--- 46,54 ----
<!-- process filter -->
<j:import uri="/Filter.jelly" inherit="true"/>
+
+ <!-- process comment -->
+ <j:if test="${listTag.comment != null}">
+ <comment>${listTag.comment}</comment>
+ </j:if>
</list>
</j:if>
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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UnionSubclass.jelly 31 May 2005 11:24:36 -0000 1.2
--- UnionSubclass.jelly 24 Aug 2005 09:42:35 -0000 1.3
***************
*** 48,51 ****
--- 48,56 ----
</j:forEach>
+ <!-- process comment -->
+ <j:if test="${unionSubclassTag.comment != null}">
+ <comment>${unionSubclassTag.comment}</comment>
+ </j:if>
+
<!-- process loader -->
<j:set var="loaderTag"
value="${class.getTagByName('hibernate.loader')}"/>
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.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Class.jelly 22 Jun 2005 15:54:03 -0000 1.21
--- Class.jelly 24 Aug 2005 09:42:35 -0000 1.22
***************
*** 53,56 ****
--- 53,61 ----
<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 -->
<j:forEach var="property" items="${plugin.getClassId(class)}">
***************
*** 196,198 ****
</j:forEach>
! </j:jelly>
\ No newline at end of file
--- 201,203 ----
</j:forEach>
! </j:jelly>
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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Set.jelly 31 May 2005 11:24:36 -0000 1.10
--- Set.jelly 24 Aug 2005 09:42:35 -0000 1.11
***************
*** 29,32 ****
<!-- process filter -->
<j:import uri="/Filter.jelly" inherit="true"/>
</set>
! </j:jelly>
\ No newline at end of file
--- 29,36 ----
<!-- process filter -->
<j:import uri="/Filter.jelly" inherit="true"/>
+ <!-- process comment -->
+ <j:if test="${setTag.comment != null}">
+ <comment>${setTag.comment}</comment>
+ </j:if>
</set>
! </j:jelly>
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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PrimitiveArray.jelly 22 Jun 2005 15:54:03 -0000 1.8
--- PrimitiveArray.jelly 24 Aug 2005 09:42:35 -0000 1.9
***************
*** 57,61 ****
<j:set var="sqlOperationEntity" value="${property.entity}"/>
<j:import uri="/SqlOperations.jelly" inherit="true"/>
</primitive-array>
</j:if>
! </j:jelly>
\ No newline at end of file
--- 57,66 ----
<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>
! </j:jelly>
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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Array.jelly 22 Jun 2005 15:54:03 -0000 1.8
--- Array.jelly 24 Aug 2005 09:42:35 -0000 1.9
***************
*** 43,46 ****
--- 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>
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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Idbag.jelly 22 Jun 2005 15:54:03 -0000 1.3
--- Idbag.jelly 24 Aug 2005 09:42:35 -0000 1.4
***************
*** 44,47 ****
--- 44,52 ----
</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"/>
***************
*** 79,81 ****
</j:if>
! </j:jelly>
\ No newline at end of file
--- 84,86 ----
</j:if>
! </j:jelly>
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.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JoinedSubclass.jelly 31 May 2005 11:24:36 -0000 1.13
--- JoinedSubclass.jelly 24 Aug 2005 09:42:35 -0000 1.14
***************
*** 52,55 ****
--- 52,60 ----
</j:forEach>
+ <!-- process comment -->
+ <j:if test="${joinedSubclassTag.comment != null}">
+ <comment>${joinedSubclassTag.comment}</comment>
+ </j:if>
+
<!-- process loader -->
<j:set var="loaderTag"
value="${class.getTagByName('hibernate.loader')}"/>
Index: HibernateMappingPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateMappingPlugin.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** HibernateMappingPlugin.java 20 Aug 2005 11:49:27 -0000 1.48
--- HibernateMappingPlugin.java 24 Aug 2005 09:42:35 -0000 1.49
***************
*** 436,440 ****
* recursive property retrival stopping at stop tag
* @param skipStopTags needs more explanation here. We need to skip
checking on stop tags on the first method invocation
! * (I mean when we dont dive into recursion cycle) because it have
already @hibernate.property tag (which is stop tag)
*/
private void accumulatePropertiesRecursive(JavaClass clazz, Collection
stopTags, boolean skipStopTags,
--- 436,440 ----
* recursive property retrival stopping at stop tag
* @param skipStopTags needs more explanation here. We need to skip
checking on stop tags on the first method invocation
! * (I mean when we didnt dive into recursion cycle yet) because it have
already @hibernate.property tag (which is stop tag by itself)
*/
private void accumulatePropertiesRecursive(JavaClass clazz, Collection
stopTags, boolean skipStopTags,
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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Bag.jelly 22 Jun 2005 15:54:03 -0000 1.10
--- Bag.jelly 24 Aug 2005 09:42:35 -0000 1.11
***************
*** 29,32 ****
--- 29,36 ----
<!-- process filter -->
<j:import uri="/Filter.jelly" inherit="true"/>
+ <!-- process comment -->
+ <j:if test="${bagTag.comment != null}">
+ <comment>${bagTag.comment}</comment>
+ </j:if>
</bag>
</j:if>
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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Map.jelly 25 Jul 2005 16:02:51 -0000 1.12
--- Map.jelly 24 Aug 2005 09:42:35 -0000 1.13
***************
*** 45,48 ****
--- 45,54 ----
<!-- process filter -->
<j:import uri="/Filter.jelly" inherit="true"/>
+
+ <!-- process comment -->
+ <j:if test="${mapTag.comment != null}">
+ <comment>${mapTag.comment}</comment>
+ </j:if>
+
</map>
</j:jelly>
Index: Column.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Column.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Column.jelly 1 Jun 2005 14:52:57 -0000 1.8
--- Column.jelly 24 Aug 2005 09:42:35 -0000 1.9
***************
*** 10,13 ****
sql-type="${columnTag.sqlType}"
index="${columnTag.index}"
! check="${columnTag.check}"/>
</j:jelly>
--- 10,19 ----
sql-type="${columnTag.sqlType}"
index="${columnTag.index}"
! check="${columnTag.check}">
!
! <j:if test="${columnTag.comment != null}">
! <comment>${columnTag.comment}</comment>
! </j:if>
!
! </column>
</j:jelly>
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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Join.jelly 31 May 2005 11:24:36 -0000 1.2
--- Join.jelly 24 Aug 2005 09:42:35 -0000 1.3
***************
*** 17,20 ****
--- 17,25 ----
<j:import uri="/Key.jelly" inherit="true"/>
+ <!-- process comment -->
+ <j:if test="${joinTag.comment != null}">
+ <comment>${joinTag.comment}</comment>
+ </j:if>
+
<!-- process subselect -->
<j:set var="subselectTag"
value="${class.getTagByName('hibernate.join-subselect')}"/>
***************
*** 28,30 ****
<j:import uri="/SqlDeleteAll.jelly" inherit="true"/>
</join>
! </j:jelly>
\ No newline at end of file
--- 33,35 ----
<j:import uri="/SqlDeleteAll.jelly" inherit="true"/>
</join>
! </j:jelly>
-------------------------------------------------------
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-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
