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-serv30325/src/main/java/org/xdoclet/plugin/hibernate
Modified Files:
Element.jelly ManyToMany.jelly ManyToOne.jelly MapKey.jelly
MapKeyManyToMany.jelly Property.jelly
Added Files:
ColumnAndFormula.jelly
Log Message:
refactored column / formula tags to keep order as proposed by Stanislav
Bryzgalov
Index: ManyToOne.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/ManyToOne.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ManyToOne.jelly 17 Sep 2005 15:57:41 -0000 1.12
--- ManyToOne.jelly 7 May 2006 12:38:27 -0000 1.13
***************
*** 29,40 ****
<j:import uri="/Meta.jelly" inherit="true"/>
</j:forEach>
- <j:forEach var="columnTag"
items="${property.entity.getTagsByName('hibernate.column')}">
- <j:import uri="/Column.jelly" inherit="true"/>
- </j:forEach>
-
- <j:forEach var="formulaTag"
items="${plugin.getTags(property.entity,'hibernate.formula')}">
- <j:import uri="/Formula.jelly" inherit="true"/>
- </j:forEach>
</many-to-one>
</j:if>
--- 29,37 ----
<j:import uri="/Meta.jelly" inherit="true"/>
</j:forEach>
+ <!--
+ keep order of column / formula tags
+ -->
+ <j:import uri="/ColumnAndFormula.jelly" inherit="true"/>
</many-to-one>
</j:if>
Index: Property.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Property.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Property.jelly 15 Jan 2006 11:49:17 -0000 1.15
--- Property.jelly 7 May 2006 12:38:27 -0000 1.16
***************
*** 25,35 ****
</j:forEach>
! <j:forEach var="columnTag"
items="${property.entity.getTagsByName('hibernate.column')}">
! <j:import uri="/Column.jelly" inherit="true"/>
! </j:forEach>
!
! <j:forEach var="formulaTag"
items="${plugin.getTags(property.entity,'hibernate.formula')}">
! <j:import uri="/Formula.jelly" inherit="true"/>
! </j:forEach>
<j:set var="typeTag"
value="${property.entity.getTagByName('hibernate.type')}"/>
--- 25,32 ----
</j:forEach>
! <!--
! keep order of column / formula tags
! -->
! <j:import uri="/ColumnAndFormula.jelly" inherit="true"/>
<j:set var="typeTag"
value="${property.entity.getTagByName('hibernate.type')}"/>
Index: MapKeyManyToMany.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/MapKeyManyToMany.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MapKeyManyToMany.jelly 31 May 2005 11:24:36 -0000 1.4
--- MapKeyManyToMany.jelly 7 May 2006 12:38:27 -0000 1.5
***************
*** 9,19 ****
foreign-key="${mapKeyManyToManyTag.foreignKey}">
! <j:forEach var="columnTag"
items="${property.entity.getTagsByName('hibernate.index-column')}">
! <j:import uri="/Column.jelly" inherit="true"/>
! </j:forEach>
!
! <j:forEach var="formulaTag"
items="${property.entity.getTagsByName('hibernate.index-formula')}">
! <j:import uri="/Formula.jelly" inherit="true"/>
! </j:forEach>
</map-key-many-to-many>
--- 9,16 ----
foreign-key="${mapKeyManyToManyTag.foreignKey}">
! <!--
! keep order of column / formula tags
! -->
! <j:import uri="/ColumnAndFormula.jelly" inherit="true"/>
</map-key-many-to-many>
--- NEW FILE: ColumnAndFormula.jelly ---
<j:jelly xmlns:j="jelly:core">
<!-- process formulas and columns to preserve their order -->
<j:forEach var="enclosedTag"
items="${property.entity.getTags()}">
<j:choose>
<j:when
test="${enclosedTag.name=='hibernate.column'}">
<j:set var="columnTag"
value="${enclosedTag}"/>
<j:import uri="/Column.jelly"
inherit="true"/>
</j:when>
<j:when
test="${enclosedTag.name=='hibernate.formula'}">
<j:set var="formulaTag"
value="${enclosedTag}"/>
<j:import uri="/Formula.jelly"
inherit="true"/>
</j:when>
</j:choose>
</j:forEach>
</j:jelly>
Index: Element.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Element.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Element.jelly 31 May 2005 11:24:36 -0000 1.6
--- Element.jelly 7 May 2006 12:38:27 -0000 1.7
***************
*** 11,21 ****
formula="${elementTag.formula}">
! <j:forEach var="columnTag"
items="${property.entity.getTagsByName('hibernate.column')}">
! <j:import uri="/Column.jelly" inherit="true"/>
! </j:forEach>
!
! <j:forEach var="formulaTag"
items="${plugin.getTags(property.entity,'hibernate.formula')}">
! <j:import uri="/Formula.jelly" inherit="true"/>
! </j:forEach>
</element>
</j:if>
--- 11,18 ----
formula="${elementTag.formula}">
! <!--
! keep order of column / formula tags
! -->
! <j:import uri="/ColumnAndFormula.jelly" inherit="true"/>
</element>
</j:if>
Index: MapKey.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/MapKey.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MapKey.jelly 31 May 2005 11:24:36 -0000 1.4
--- MapKey.jelly 7 May 2006 12:38:27 -0000 1.5
***************
*** 9,19 ****
node="${mapKeyTag.node}">
! <j:forEach var="columnTag"
items="${property.entity.getTagsByName('hibernate.index-column')}">
! <j:import uri="/Column.jelly" inherit="true"/>
! </j:forEach>
!
! <j:forEach var="formulaTag"
items="${property.entity.getTagsByName('hibernate.index-formula')}">
! <j:import uri="/Formula.jelly" inherit="true"/>
! </j:forEach>
</map-key>
--- 9,16 ----
node="${mapKeyTag.node}">
! <!--
! keep order of column / formula tags
! -->
! <j:import uri="/ColumnAndFormula.jelly" inherit="true"/>
</map-key>
Index: ManyToMany.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/ManyToMany.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ManyToMany.jelly 31 May 2005 11:24:36 -0000 1.9
--- ManyToMany.jelly 7 May 2006 12:38:27 -0000 1.10
***************
*** 18,29 ****
<j:import uri="/Meta.jelly" inherit="true"/>
</j:forEach>
! <!-- process columns elements -->
! <j:forEach var="columnTag"
items="${property.entity.getTagsByName('hibernate.column')}">
! <j:import uri="/Column.jelly" inherit="true"/>
! </j:forEach>
- <j:forEach var="formulaTag"
items="${plugin.getTags(property.entity,'hibernate.formula')}">
- <j:import uri="/Formula.jelly" inherit="true"/>
- </j:forEach>
</many-to-many>
--- 18,26 ----
<j:import uri="/Meta.jelly" inherit="true"/>
</j:forEach>
! <!--
! keep order of column / formula tags
! -->
! <j:import uri="/ColumnAndFormula.jelly" inherit="true"/>
</many-to-many>
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
