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-serv18337/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate

Modified Files:
        Class.jelly 
Added Files:
        Query.jelly 
Log Message:
fixed XDP-178 , refactored queries to separate 
jelly template


--- NEW FILE: Query.jelly ---
<?xml version="1.0" encoding="UTF-8"?>
<j:jelly xmlns:j="jelly:core">
    <j:forEach var="query" 
items="${queryHolder.getTagsByName('hibernate.query',true)}">
        <query name="${query.name_}" cacheable="${query.cacheable}" 
cache-region="${query.cacheRegion}">
            <j:if test="${(query.representation != null) and 
(query.representation != '')}">
                <representation name="${query.representation}"/>
            </j:if>
            &lt;![CDATA[${query.query}]]&gt;
        </query>
    </j:forEach>
</j:jelly>

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.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Class.jelly 17 Sep 2005 15:57:41 -0000      1.24
--- Class.jelly 14 Jun 2006 19:58:39 -0000      1.25
***************
*** 160,186 ****
      </class>
  
!     <!-- queries    todo: refactor it -->
!     <j:forEach var="query" 
items="${metadata.getTagsByName('hibernate.query',true)}">
!         <query name="${query.name_}" cacheable="${query.cacheable}" 
cache-region="${query.cacheRegion}">
!             <j:if test="${!empty(query.representation)}">
!                 <representation name="${query.representation}"/>
!             </j:if>
!             &lt;![CDATA[${query.query}]]&gt;
!         </query>
!     </j:forEach>
!     <j:forEach var="subclass" 
items="${plugin.getSubclasses(metadata,'hibernate.subclass')}">
!         <j:forEach var="query" 
items="${subclass.getTagsByName('hibernate.query',false)}">
!             <query name="${query.name_}" cacheable="${query.cacheable}" 
cache-region="${query.cacheRegion}">&lt;![CDATA[${query.query}]]&gt;</query>
!         </j:forEach>
      </j:forEach>
!     <j:forEach var="subclass" 
items="${plugin.getSubclasses(metadata,'hibernate.joined-subclass')}">
!         <j:forEach var="query" 
items="${subclass.getTagsByName('hibernate.query',false)}">
!             <query name="${query.name_}" cacheable="${query.cacheable}" 
cache-region="${query.cacheRegion}">&lt;![CDATA[${query.query}]]&gt;</query>
!         </j:forEach>
      </j:forEach>
!     <j:forEach var="subclass" 
items="${plugin.getSubclasses(metadata,'hibernate.union-subclass')}">
!         <j:forEach var="query" 
items="${subclass.getTagsByName('hibernate.query',false)}">
!             <query name="${query.name_}" cacheable="${query.cacheable}" 
cache-region="${query.cacheRegion}">&lt;![CDATA[${query.query}]]&gt;</query>
!         </j:forEach>
      </j:forEach>
  
--- 160,177 ----
      </class>
  
!     <!-- basic queries -->
!     <j:set var="queryHolder" value="${metadata}"/>
!     <j:import uri="/Query.jelly" inherit="true"/>
!     <!-- subclass queries -->
!     <j:forEach var="queryHolder" 
items="${plugin.getSubclasses(metadata,'hibernate.subclass')}">
!         <j:import uri="/Query.jelly" inherit="true"/>    
      </j:forEach>
!     <!-- joined subclass queries -->
!     <j:forEach var="queryHolder" 
items="${plugin.getSubclasses(metadata,'hibernate.joined-subclass')}">
!         <j:import uri="/Query.jelly" inherit="true"/>    
      </j:forEach>
!     <!-- union subclass queries -->
!     <j:forEach var="queryHolder" 
items="${plugin.getSubclasses(metadata,'hibernate.union-subclass')}">
!         <j:import uri="/Query.jelly" inherit="true"/>    
      </j:forEach>
  



_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits

Reply via email to