Update of 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor
In directory 
sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6699/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor

Modified Files:
        beans.jelly 
Log Message:
Place contents of queries inside CDATA section (XDP-185) & avoid using 
shouldGenerate for interfaces

Index: beans.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/beans.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** beans.jelly 11 Oct 2005 09:22:26 -0000      1.5
--- beans.jelly 12 Jun 2006 06:44:07 -0000      1.6
***************
*** 2,6 ****
  <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
      <j:forEach var="class" items="${util.getBeans(metadata)}">
!         <j:if test="${plugin.shouldGenerate(class)}">
              <j:set var="ejbBeanTag" 
value="${class.getTagByName('ejb.bean')}"/>
              <x:element name="${util.entityType(class)}">
--- 2,6 ----
  <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
      <j:forEach var="class" items="${util.getBeans(metadata)}">
!         <j:if test="${util.shouldGenerate(class)}">
              <j:set var="ejbBeanTag" 
value="${class.getTagByName('ejb.bean')}"/>
              <x:element name="${util.entityType(class)}">
***************
*** 19,35 ****
                  </j:if>
                  <ejb-name>${util.getEjbName(class)}</ejb-name>
!                 <j:if 
test="${plugin.remoteHomeInterfacePlugin.shouldGenerate(class)}">
                      
<home>${plugin.remoteHomeInterfacePlugin.getVirtualType(class)}</home>
                  </j:if>
!                 <j:if 
test="${plugin.remoteInterfacePlugin.shouldGenerate(class)}">
                      
<remote>${plugin.remoteInterfacePlugin.getVirtualType(class)}</remote>
                  </j:if>
!                 <j:if 
test="${plugin.localHomeInterfacePlugin.shouldGenerate(class)}">
                      
<local-home>${plugin.localHomeInterfacePlugin.getVirtualType(class)}</local-home>
                  </j:if>
!                 <j:if 
test="${plugin.localInterfacePlugin.shouldGenerate(class)}">
                      
<local>${plugin.localInterfacePlugin.getVirtualType(class)}</local>
                  </j:if>
!                 <j:if 
test="${plugin.serviceEndpointPlugin.shouldGenerate(class)}">
                      
<service-endpoint>${plugin.serviceEndpointPlugin.getVirtualType(class)}</service-endpoint>
                  </j:if>
--- 19,35 ----
                  </j:if>
                  <ejb-name>${util.getEjbName(class)}</ejb-name>
!                 <j:if test="${util.hasRemoteHomeInterface(class)}">
                      
<home>${plugin.remoteHomeInterfacePlugin.getVirtualType(class)}</home>
                  </j:if>
!                 <j:if test="${util.hasRemoteInterface(class)}">
                      
<remote>${plugin.remoteInterfacePlugin.getVirtualType(class)}</remote>
                  </j:if>
!                 <j:if test="${util.hasLocalHomeInterface(class)}">
                      
<local-home>${plugin.localHomeInterfacePlugin.getVirtualType(class)}</local-home>
                  </j:if>
!                 <j:if test="${util.hasLocalInterface(class)}">
                      
<local>${plugin.localInterfacePlugin.getVirtualType(class)}</local>
                  </j:if>
!                 <j:if test="${util.hasServiceEndPoint(class)}">
                      
<service-endpoint>${plugin.serviceEndpointPlugin.getVirtualType(class)}</service-endpoint>
                  </j:if>
***************
*** 261,265 ****
                                  
<result-type-mapping>${finderTag.resultTypeMapping}</result-type-mapping>
                              </j:if>
!                             <ejb-ql>${finderTag.query}</ejb-ql>
                          </query>
                      </j:forEach>
--- 261,265 ----
                                  
<result-type-mapping>${finderTag.resultTypeMapping}</result-type-mapping>
                              </j:if>
!                             
<ejb-ql>&lt;![CDATA[${finderTag.query}]]&gt;</ejb-ql>
                          </query>
                      </j:forEach>
***************
*** 279,283 ****
                                  
<result-type-mapping>${selectMethod.getTagByName('ejb.select').resultTypeMapping}</result-type-mapping>
                              </j:if>
!                             
<ejb-ql>${selectMethod.getTagByName('ejb.select').query}</ejb-ql>
                          </query>
                      </j:forEach>
--- 279,283 ----
                                  
<result-type-mapping>${selectMethod.getTagByName('ejb.select').resultTypeMapping}</result-type-mapping>
                              </j:if>
!                             
<ejb-ql>&lt;![CDATA[${selectMethod.getTagByName('ejb.select').query}]]&gt;</ejb-ql>
                          </query>
                      </j:forEach>



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

Reply via email to