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-serv2946/src/main/java/org/xdoclet/plugin/hibernate
Modified Files:
Class.jelly HibernateMappingPlugin.java JoinedSubclass.jelly
QueryList.jelly Subclass.jelly
Removed Files:
HelperTaglib.jelly
Log Message:
Remove 'HelperTaglib.jelly' to avoid 'script already garbaged' exception with
latest version of 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JoinedSubclass.jelly 26 Apr 2005 07:00:08 -0000 1.10
--- JoinedSubclass.jelly 4 May 2005 09:48:40 -0000 1.11
***************
*** 1,9 ****
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:helper="helper">
<j:set var="class" value="${joinedSubclass}"/>
<j:set var="joinedSubclassTag"
value="${class.getTagByName('hibernate.joined-subclass')}"/>
- <helper:getFirstNonEmptyValue var="className"
value1="${joinedSubclassTag.name_}" value2="${class.fullyQualifiedName}"/>
! <joined-subclass name="${className}"
entity-name="${joinedSubclassTag.entityName}"
proxy="${joinedSubclassTag.proxy}"
--- 1,8 ----
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
<j:set var="class" value="${joinedSubclass}"/>
<j:set var="joinedSubclassTag"
value="${class.getTagByName('hibernate.joined-subclass')}"/>
! <joined-subclass
name="${plugin.getFirstNonEmptyValue(joinedSubclassTag.name_,
class.fullyQualifiedName)}"
entity-name="${joinedSubclassTag.entityName}"
proxy="${joinedSubclassTag.proxy}"
Index: QueryList.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/QueryList.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QueryList.jelly 26 Apr 2005 07:00:08 -0000 1.1
--- QueryList.jelly 4 May 2005 09:48:40 -0000 1.2
***************
*** 1,3 ****
<j:jelly xmlns:j="jelly:core">
! <query-list name="${queryListTag.name}"
query-ref="queryListTag.queryRef"/>
</j:jelly>
--- 1,3 ----
<j:jelly xmlns:j="jelly:core">
! <query-list name="${queryListTag.name}"
query-ref="${queryListTag.queryRef}"/>
</j:jelly>
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.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** HibernateMappingPlugin.java 28 Apr 2005 11:15:45 -0000 1.32
--- HibernateMappingPlugin.java 4 May 2005 09:48:40 -0000 1.33
***************
*** 117,120 ****
--- 117,130 ----
/**
+ * Returns first argument wich is not empty or last argument if all are
empty
+ * @param value1 first argument
+ * @param value2 second argument
+ * @return
+ */
+ public String getFirstNonEmptyValue(String value1, String value2) {
+ return value1 != null && value1.trim().length() > 0 ? value1 : value2;
+ }
+
+ /**
* retrieve type of identificator. use (return) type of element if not
* specified explicitely, "type" parameter overrides
--- HelperTaglib.jelly DELETED ---
Index: Subclass.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Subclass.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Subclass.jelly 26 Apr 2005 07:00:08 -0000 1.6
--- Subclass.jelly 4 May 2005 09:48:40 -0000 1.7
***************
*** 1,10 ****
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:helper="helper">
!
<j:set var="class" value="${subclass}"/>
<j:set var="subclassTag"
value="${class.getTagByName('hibernate.subclass')}"/>
- <helper:getFirstNonEmptyValue var="className"
value1="${subclassTag.name_}" value2="${class.fullyQualifiedName}"/>
! <subclass name="${className}"
entity-name="${subclassTag.entityName}"
proxy="${subclassTag.proxy}"
--- 1,8 ----
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
<j:set var="class" value="${subclass}"/>
<j:set var="subclassTag"
value="${class.getTagByName('hibernate.subclass')}"/>
! <subclass name="${plugin.getFirstNonEmptyValue(subclassTag.name_,
class.fullyQualifiedName)}"
entity-name="${subclassTag.entityName}"
proxy="${subclassTag.proxy}"
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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Class.jelly 26 Apr 2005 07:00:07 -0000 1.14
--- Class.jelly 4 May 2005 09:48:40 -0000 1.15
***************
*** 1,9 ****
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:helper="helper">
!
! <j:import uri="org/xdoclet/plugin/hibernate/HelperTaglib.jelly"/>
!
! <j:set var="hibernateClass"
value="${class.getTagByName('hibernate.class')}"/>
! <helper:getFirstNonEmptyValue var="className"
value1="${hibernateClass.name_}" value2="${class.fullyQualifiedName}"/>
<!-- process filter definition -->
--- 1,5 ----
<?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
! <j:set var="classTag" value="${class.getTagByName('hibernate.class')}"/>
<!-- process filter definition -->
***************
*** 13,38 ****
</j:if>
! <class name="${className}"
! table="${hibernateClass.table}"
! schema="${hibernateClass.schema}"
! proxy="${hibernateClass.proxy}"
! discriminator-value="${hibernateClass.discriminatorValue}"
! mutable="${hibernateClass.mutable}"
! polymorphism="${hibernateClass.polymorphism}"
! where="${hibernateClass.where}"
! dynamic-update="${hibernateClass.dynamicUpdate}"
! dynamic-insert="${hibernateClass.dynamicInsert}"
! batch-size="${hibernateClass.batchSize}"
! select-before-update="${hibernateClass.selectBeforeUpdate}"
! optimistic-lock="${hibernateClass.optimisticLock}"
! lazy="${hibernateClass.lazy}"
! entity-name="${hibernateClass.entityName}"
! catalog="${hibernateClass.catalog}"
! subselect="${hibernateClass.subselect}"
! abstract="${hibernateClass.abstract}"
! persister="${hibernateClass.persister}"
! check="${hibernateClass.check}"
! rowid="${hibernateClass.rowid}"
! node="${hibernateClass.node}">
<!-- process meta elements on class level -->
--- 9,34 ----
</j:if>
! <class name="${plugin.getFirstNonEmptyValue(classTag.name_,
class.fullyQualifiedName)}"
! table="${classTag.table}"
! schema="${classTag.schema}"
! proxy="${classTag.proxy}"
! discriminator-value="${classTag.discriminatorValue}"
! mutable="${classTag.mutable}"
! polymorphism="${classTag.polymorphism}"
! where="${classTag.where}"
! dynamic-update="${classTag.dynamicUpdate}"
! dynamic-insert="${classTag.dynamicInsert}"
! batch-size="${classTag.batchSize}"
! select-before-update="${classTag.selectBeforeUpdate}"
! optimistic-lock="${classTag.optimisticLock}"
! lazy="${classTag.lazy}"
! entity-name="${classTag.entityName}"
! catalog="${classTag.catalog}"
! subselect="${classTag.subselect}"
! abstract="${classTag.abstract}"
! persister="${classTag.persister}"
! check="${classTag.check}"
! rowid="${classTag.rowid}"
! node="${classTag.node}">
<!-- process meta elements on class level -->
***************
*** 130,134 ****
<!-- process properties -->
<j:forEach var="property" items="${plugin.getClassProperties(class)}">
- <!--<echo>property: ${property} name: ${property.name} access:
${property.access}</echo>-->
<j:if
test="${property.entity.getTagByName('hibernate.properties') == null}">
<!-- If this property has 'hibernate.properties' it means
that property already outputted -->
--- 126,129 ----
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
