Menu
▾
▴
[xdoclet-plugins-commits] xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor EjbJarXmlPlugin.jelly, 1.5, 1.6 asm-descriptor.jelly, 1.5, 1.6 beans.jelly, 1.6, 1.7 ejb-ref.jelly, 1.4, 1.5 entity-beans.jelly, 1.2, 1.3 res-ref.jelly, 1.2, 1.3
|
From: Konstantin P. <ko...@us...> - 2006-09-24 11:59:00
|
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-serv9889/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor Modified Files: EjbJarXmlPlugin.jelly asm-descriptor.jelly beans.jelly ejb-ref.jelly entity-beans.jelly res-ref.jelly Log Message: reworked jelly merge, moved taglib from web plugin to generama to provide standard merge capabilities Index: entity-beans.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/entity-beans.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** entity-beans.jelly 13 Oct 2003 23:51:12 -0000 1.2 --- entity-beans.jelly 24 Sep 2006 11:58:56 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + <?xml version="1.0" encoding="UTF-8"?> <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml"> <x:comment>merge point: org/xdoclet/plugin/ejb/descriptor/entity-beans.jelly</x:comment> 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.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** beans.jelly 12 Jun 2006 06:44:07 -0000 1.6 --- beans.jelly 24 Sep 2006 11:58:56 -0000 1.7 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <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)}"> --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl" ! xmlns:g="jelly:org.generama.jelly.GeneramaTaglib"> <j:forEach var="class" items="${util.getBeans(metadata)}"> <j:if test="${util.shouldGenerate(class)}"> *************** *** 57,61 **** </j:forEach> <j:if test="${!empty(plugin.primaryKeyClassPlugin.pkField(class))}"> ! <primkey-field>${plugin.primaryKeyClassPlugin.pkField(class)}</primkey-field> </j:if> </j:if> --- 58,62 ---- </j:forEach> <j:if test="${!empty(plugin.primaryKeyClassPlugin.pkField(class))}"> ! <primkey-field>${plugin.primaryKeyClassPlugin.pkField(class)}</primkey-field> </j:if> </j:if> *************** *** 137,169 **** </j:choose> </j:if> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-env-entries-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-env-entries-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your Ejb env entries in a file called ${plugin.expandFileName('ejb-env-entries-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.env-entry's</x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.env-entry')}"> ! <j:set var="envEntryTag" value="${reference.tag}"/> ! <env-entry> ! <j:if test="${!empty(envEntryTag.description)}"> ! <description>${envEntryTag.description}</description> ! </j:if> ! <env-entry-name>${envEntryTag.name_}</env-entry-name> ! <env-entry-type>${envEntryTag.type}</env-entry-type> ! <j:if test="${!empty(envEntryTag.value_)}"> ! <env-entry-value>${envEntryTag.value_}</env-entry-value> ! </j:if> ! </env-entry> ! </j:forEach> ! </j:otherwise> ! </j:choose> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-ejbrefs-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-ejbrefs-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your Ejb refs entries in a file called ${plugin.expandFileName('ejb-ejbrefs-{0}.xml', class)} and place it in your merge directory.</x:comment> ! </j:otherwise> ! </j:choose> <j:import uri="/ejb-ref.jelly" inherit="true"/> --- 138,171 ---- </j:choose> </j:if> ! ! <g:merge file="ejb-env-entries-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your Ejb env entries in a file called ${util.getEjbName(class)}.xml} ! and place it in your merge directory. Overrides @ejb.env-entry's ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.env-entry')}"> ! <j:set var="envEntryTag" value="${reference.tag}"/> ! <env-entry> ! <j:if test="${!empty(envEntryTag.description)}"> ! <description>${envEntryTag.description}</description> ! </j:if> ! <env-entry-name>${envEntryTag.name_}</env-entry-name> ! <env-entry-type>${envEntryTag.type}</env-entry-type> ! <j:if test="${!empty(envEntryTag.value_)}"> ! <env-entry-value>${envEntryTag.value_}</env-entry-value> ! </j:if> ! </env-entry> ! </j:forEach> ! </g:merge> ! ! <g:merge file="ejb-ejbrefs-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your Ejb refs entries in a file called ! ${util.getEjbName(class)}.xml and place ! it in your merge directory. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> <j:import uri="/ejb-ref.jelly" inherit="true"/> *************** *** 171,213 **** <j:if test="${version.greaterOrEquals(2.1)}"> <j:import uri="/res-ref.jelly" inherit="true"/> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your Ejb destination refs entries in a file called ${plugin.expandFileName('ejb-destinationrefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.destination-ref's</x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}"> ! <j:set var="destRefTag" value="${reference.tag}"/> ! <message-destination-ref> ! <j:if test="${!empty(destRefTag.description)}"> ! <description>${destRefTag.description}</description> ! </j:if> ! <message-destination-ref-name>${destRefTag.name_}</message-destination-ref-name> ! <message-destination-type>${destRefTag.type}</message-destination-type> ! <message-destination-usage>${destRefTag.usage}</message-destination-usage> ! <j:if test="${!empty(destRefTag.link)}"> ! <message-destination-link>${destRefTag.link}</message-destination-link> ! </j:if> ! </message-destination-ref> ! </j:forEach> ! </j:otherwise> ! </j:choose> </j:if> <j:if test="${util.isEntityBean(class) or util.isSessionBean(class)}"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-sec-rolerefs-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-sec-rolerefs-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your Ejb security role refs entries in a file called ${plugin.expandFileName('ejb-sec-rolerefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.security-role-ref's</x:comment> ! <j:forEach var="secRoleRefTag" items="${class.getTagsByName('ejb.security-role-ref')}"> ! <security-role-ref> ! <role-name>${secRoleRefTag.roleName}</role-name> ! <role-link>${secRoleRefTag.roleLink}</role-link> ! </security-role-ref> ! </j:forEach> ! </j:otherwise> ! </j:choose> </j:if> --- 173,218 ---- <j:if test="${version.greaterOrEquals(2.1)}"> <j:import uri="/res-ref.jelly" inherit="true"/> ! <g:merge file="ejb-destinationrefs-${util.getEjbName(class)}.xml"> ! ! <x:comment> ! Define your Ejb destination refs entries in a file called ! ejb-destinationrefs-${util.getEjbName(class)}.xml and place ! it in your merge directory. ! Overrides @ejb.destination-ref's ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}"> ! <j:set var="destRefTag" value="${reference.tag}"/> ! <message-destination-ref> ! <j:if test="${!empty(destRefTag.description)}"> ! <description>${destRefTag.description}</description> ! </j:if> ! <message-destination-ref-name>${destRefTag.name_}</message-destination-ref-name> ! <message-destination-type>${destRefTag.type}</message-destination-type> ! <message-destination-usage>${destRefTag.usage}</message-destination-usage> ! <j:if test="${!empty(destRefTag.link)}"> ! <message-destination-link>${destRefTag.link}</message-destination-link> ! </j:if> ! </message-destination-ref> ! </j:forEach> ! </g:merge> </j:if> <j:if test="${util.isEntityBean(class) or util.isSessionBean(class)}"> ! <g:merge file="ejb-sec-rolerefs-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your Ejb security role refs entries in a file called ! ${plugin.expandFileName('ejb-sec-rolerefs-{0}.xml', class)} and ! place it in your merge directory. ! Overrides @ejb.security-role-ref's ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <j:forEach var="secRoleRefTag" items="${class.getTagsByName('ejb.security-role-ref')}"> ! <security-role-ref> ! <role-name>${secRoleRefTag.roleName}</role-name> ! <role-link>${secRoleRefTag.roleLink}</role-link> ! </security-role-ref> ! </j:forEach> ! </g:merge> </j:if> *************** *** 283,294 **** </j:forEach> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-finders-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-finders-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your extra finders in a file called ${plugin.expandFileName('ejb-finders-{0}.xml', class)} and place it in your merge directory.</x:comment> ! </j:otherwise> ! </j:choose> </j:if> </x:element> --- 288,299 ---- </j:forEach> ! <g:merge file="ejb-finders-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your extra finders in a file called ! ejb-finders-${util.getEjbName(class)}.xml ! and place it in your merge directory. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> </j:if> </x:element> Index: res-ref.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/res-ref.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** res-ref.jelly 6 Oct 2005 13:46:48 -0000 1.2 --- res-ref.jelly 24 Sep 2006 11:58:56 -0000 1.3 *************** *** 1,62 **** ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-resourcerefs-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-resourcerefs-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your resource references in a file called ${plugin.expandFileName('ejb-resourcerefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.resource-ref's</x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-ref')}"> ! <j:set var="resRefTag" value="${reference.tag}"/> ! <resource-ref id="${plugin.prefixedId('ResRef')}"> ! <j:if test="${!empty(resRefTag.description)}"> ! <description>${resRefTag.description}</description> ! </j:if> ! <res-ref-name>${util.refName(reference)}</res-ref-name> ! <res-type>${util.refType(reference)}</res-type> ! <res-auth>${resRefTag.resAuth}</res-auth> ! <res-sharing-scope>${resRefTag.resSharingScope}</res-sharing-scope> ! </resource-ref> ! </j:forEach> ! </j:otherwise> ! </j:choose> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-resource-env-refs-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-resource-env-refs-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your resource env references in a file called ${plugin.expandFileName('ejb-resource-env-refs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.resource-env-ref's</x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-env-ref')}"> ! <j:set var="resEnvRefTag" value="${reference.tag}"/> <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}"> ! <j:if test="${!empty(resEnvRefTag.description)}"> ! <description>${resEnvRefTag.description}</description> </j:if> ! <resource-env-ref-name>${util.refName(reference)}</resource-env-ref-name> ! <resource-env-ref-type>${util.refType(reference)}</resource-env-ref-type> </resource-env-ref> </j:forEach> ! </j:otherwise> ! </j:choose> ! ! <j:if test="${!version.greaterOrEquals(2.1)}"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment>Define your destination references in a file called ${plugin.expandFileName('ejb-destinationrefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.destination-ref's</x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}"> ! <j:set var="destRefTag" value="${reference.tag}"/> ! <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}"> ! <j:if test="${!empty(destRefTag.description)}"> ! <description>${destRefTag.description}</description> ! </j:if> ! <resource-env-ref-name>${destRefTag.name_}</resource-env-ref-name> ! <resource-env-ref-type>${destRefTag.type}</resource-env-ref-type> ! </resource-env-ref> ! </j:forEach> ! </j:otherwise> ! </j:choose> </j:if> </j:jelly> \ No newline at end of file --- 1,67 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" ! xmlns:g="jelly:org.generama.jelly.GeneramaTaglib"> ! <g:merge file="ejb-resourcerefs-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your resource references in a file called ! ejb-resourcerefs-${util.getEjbName(class)}.xml ! and place it in your merge directory. ! Overrides @ejb.resource-ref's ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-ref')}"> ! <j:set var="resRefTag" value="${reference.tag}"/> ! <resource-ref id="${plugin.prefixedId('ResRef')}"> ! <j:if test="${!empty(resRefTag.description)}"> ! <description>${resRefTag.description}</description> ! </j:if> ! <res-ref-name>${util.refName(reference)}</res-ref-name> ! <res-type>${util.refType(reference)}</res-type> ! <res-auth>${resRefTag.resAuth}</res-auth> ! <res-sharing-scope>${resRefTag.resSharingScope}</res-sharing-scope> ! </resource-ref> ! </j:forEach> ! </g:merge> ! <g:merge file="ejb-resource-env-refs-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your resource env references in a file called ! ejb-resource-env-refs-${util.getEjbName(class)}.xml ! and place it in your merge directory. ! Overrides @ejb.resource-env-ref's ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-env-ref')}"> ! <j:set var="resEnvRefTag" value="${reference.tag}"/> ! <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}"> ! <j:if test="${!empty(resEnvRefTag.description)}"> ! <description>${resEnvRefTag.description}</description> ! </j:if> ! <resource-env-ref-name>${util.refName(reference)}</resource-env-ref-name> ! <resource-env-ref-type>${util.refType(reference)}</resource-env-ref-type> ! </resource-env-ref> ! </j:forEach> ! </g:merge> ! ! <j:if test="${!version.greaterOrEquals(2.1)}"> ! <g:merge file="ejb-destinationrefs-${util.getEjbName(class)}.xml"> ! <x:comment> ! Define your destination references in a file called ! ejb-destinationrefs-${util.getEjbName(class)}.xml ! and place it in your merge directory. ! Overrides @ejb.destination-ref's ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}"> ! <j:set var="destRefTag" value="${reference.tag}"/> <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}"> ! <j:if test="${!empty(destRefTag.description)}"> ! <description>${destRefTag.description}</description> </j:if> ! <resource-env-ref-name>${destRefTag.name_}</resource-env-ref-name> ! <resource-env-ref-type>${destRefTag.type}</resource-env-ref-type> </resource-env-ref> </j:forEach> ! </g:merge> </j:if> </j:jelly> \ No newline at end of file Index: asm-descriptor.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/asm-descriptor.jelly,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** asm-descriptor.jelly 7 Jun 2006 01:42:34 -0000 1.5 --- asm-descriptor.jelly 24 Sep 2006 11:58:56 -0000 1.6 *************** *** 1,150 **** ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('assembly-descriptor.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('assembly-descriptor.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To specify your own assembly descriptor info here, add a file to your XDoclet merge directory called assembly-descriptor.xml that contains the <assembly-descriptor></assembly-descriptor> markup. Overrides xdoclet generation.</x:comment> ! <assembly-descriptor id="${plugin.prefixedId('AssemblyDescriptor')}"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-security-roles.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-security-roles.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To specify additional security-role elements, add a file in the merge directory called ejb-security-roles.xml that contains them.</x:comment> ! </j:otherwise> ! </j:choose> ! <j:forEach var="role" items="${util.getSecurityRoles(metadata)}"> ! <security-role> ! <description>Description not supported yet</description> ! <role-name>${role}</role-name> ! </security-role> ! </j:forEach> ! <!-- Method permissions --> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-method-permissions.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-method-permissions.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To specify additional method-permission elements, add a file in the merge directory called ejb-method-permissions.xml that contains them.</x:comment> ! </j:otherwise> ! </j:choose> ! <j:forEach var="bean" items="${util.getBeans(metadata)}"> ! <j:forEach var="methodPermission" items="${util.getMethodPermissions(bean)}"> ! <method-permission id="${plugin.prefixedId('MethodPermission')}"> <description>Description not supported yet</description> <j:choose> ! <j:when test="${!empty(methodPermission.roles)}"> ! <j:forEach var="role" items="${methodPermission.roles}"> ! <role-name>${role}</role-name> ! </j:forEach> ! </j:when> ! <j:when test="${version.greaterOrEquals(2.0)}"> ! <unchecked /> </j:when> </j:choose> ! <method id="${plugin.prefixedId('MethodElement')}"> ! <description>Description not supported yet</description> ! <ejb-name>${util.getEjbName(bean)}</ejb-name> ! <method-intf>${methodPermission.ifaceType}</method-intf> ! <j:choose> ! <j:when test="${methodPermission.method != null}"> ! <method-name>${methodPermission.method.name}</method-name> ! <j:if test="${!empty(methodPermission.method.parameters)}"> ! <method-params> ! <j:forEach var="param" items="${methodPermission.method.parameters}"> ! <method-param>${param.type}</method-param> ! </j:forEach> ! </method-params> ! </j:if> ! </j:when> ! <j:otherwise> ! <method-name>*</method-name> ! </j:otherwise> ! </j:choose> ! </method> ! </method-permission> ! </j:forEach> </j:forEach> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-container-transactions.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-container-transactions.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To specify additional container-transaction elements, add a file in the merge directory called ejb-container-transactions.xml that contains them.</x:comment> ! </j:otherwise> ! </j:choose> ! ! <j:forEach var="bean" items="${util.getBeans(metadata)}"> ! <j:forEach var="containerTransaction" items="${util.getContainerTransactions(bean)}"> ! <container-transaction id="${plugin.prefixedId('MethodTransaction')}"> <description>Description not supported yet</description> ! <method id="${plugin.prefixedId('MethodElement')}"> ! <description>Description not supported yet</description> ! <ejb-name>${util.getEjbName(bean)}</ejb-name> ! <j:if test="${!empty(containerTransaction.ifaceType)}"> ! <method-intf>${containerTransaction.ifaceType}</method-intf> ! </j:if> ! <j:choose> ! <j:when test="${containerTransaction.method != null}"> ! <method-name>${containerTransaction.method.name}</method-name> ! <j:if test="${!empty(containerTransaction.method.parameters)}"> ! <method-params> ! <j:forEach var="param" items="${containerTransaction.method.parameters}"> ! <method-param>${param.type}</method-param> ! </j:forEach> ! </method-params> ! </j:if> ! </j:when> ! <j:otherwise> ! <method-name>*</method-name> ! </j:otherwise> ! </j:choose> ! </method> ! <trans-attribute>${containerTransaction.transType}</trans-attribute> ! </container-transaction> ! </j:forEach> </j:forEach> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-message-destinations.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-message-destinations.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To specify additional message-destination elements, add a file in the merge directory called ejb-message-destinations.xml that contains them.</x:comment> ! </j:otherwise> ! </j:choose> ! ! <j:if test="${version.greaterOrEquals(2.1)}"> ! <j:forEach var="bean" items="${util.getMessageDrivenBeans(metadata)}"> ! <j:set var="ejbMessageDestinationTag" value="${bean.getTagByName('ejb.message-destination')}"/> ! <j:if test="${ejbMessageDestinationTag != null}"> ! <message-destination> ! <j:if test="${!empty(ejbMessageDestinationTag.description)}"> ! <description>${ejbMessageDestinationTag.description}</description> ! </j:if> ! <j:if test="${!empty(ejbMessageDestinationTag.displayName)}"> ! <display-name>${ejbMessageDestinationTag.displayName}</display-name> ! </j:if> ! <message-destination-name>${ejbMessageDestinationTag.name_}</message-destination-name> ! </message-destination> ! </j:if> ! </j:forEach> ! </j:if> ! <j:if test="${version.greaterOrEquals(2.0)}"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('ejb-exclude-list.xml', class).exists()}"> ! <j:import file="${plugin.getMergeFile('ejb-exclude-list.xml', class).path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To specify an exclude-list element, add a file in the merge directory called ejb-exclude-list.xml that contains it.</x:comment> ! </j:otherwise> ! </j:choose> ! </j:if> ! </assembly-descriptor> ! </j:otherwise> ! </j:choose> </j:jelly> \ No newline at end of file --- 1,151 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" ! xmlns:g="jelly:org.generama.jelly.GeneramaTaglib"> ! <g:merge file="assembly-descriptor.xml"> ! <x:comment trim="false"> ! To specify your own assembly descriptor info here, add a file to ! your XDoclet merge directory called assembly-descriptor.xml that ! contains the <assembly-descriptor></assembly-descriptor> markup. ! Overrides xdoclet generation. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! <assembly-descriptor id="${plugin.prefixedId('AssemblyDescriptor')}"> ! <g:merge file="ejb-security-roles.xml"> ! <x:comment trim="false"> ! To specify additional security-role elements, ! add a file in the merge directory called ejb-security-roles.xml ! that contains them. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> ! <j:forEach var="role" items="${util.getSecurityRoles(metadata)}"> ! <security-role> ! <description>Description not supported yet</description> ! <role-name>${role}</role-name> ! </security-role> ! </j:forEach> ! <!-- Method permissions --> ! <g:merge file="ejb-method-permissions.xml"> ! <x:comment trim="false"> ! To specify additional method-permission elements, add a file in ! the merge directory called ejb-method-permissions.xml that contains ! them. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> ! ! <j:forEach var="bean" items="${util.getBeans(metadata)}"> ! <j:forEach var="methodPermission" items="${util.getMethodPermissions(bean)}"> ! <method-permission id="${plugin.prefixedId('MethodPermission')}"> ! <description>Description not supported yet</description> ! <j:choose> ! <j:when test="${!empty(methodPermission.roles)}"> ! <j:forEach var="role" items="${methodPermission.roles}"> ! <role-name>${role}</role-name> ! </j:forEach> ! </j:when> ! <j:when test="${version.greaterOrEquals(2.0)}"> ! <unchecked /> ! </j:when> ! </j:choose> ! <method id="${plugin.prefixedId('MethodElement')}"> <description>Description not supported yet</description> + <ejb-name>${util.getEjbName(bean)}</ejb-name> + <method-intf>${methodPermission.ifaceType}</method-intf> <j:choose> ! <j:when test="${methodPermission.method != null}"> ! <method-name>${methodPermission.method.name}</method-name> ! <j:if test="${!empty(methodPermission.method.parameters)}"> ! <method-params> ! <j:forEach var="param" items="${methodPermission.method.parameters}"> ! <method-param>${param.type}</method-param> ! </j:forEach> ! </method-params> ! </j:if> </j:when> + <j:otherwise> + <method-name>*</method-name> + </j:otherwise> </j:choose> ! </method> ! </method-permission> </j:forEach> + </j:forEach> + <g:merge file="ejb-container-transactions.xml"> + <x:comment trim="false"> + To specify additional container-transaction elements, add a file + in the merge directory called ejb-container-transactions.xml that + contains them. + Define root element as <j:jelly xmlns:j="jelly:core"> + </x:comment> + </g:merge> ! <j:forEach var="bean" items="${util.getBeans(metadata)}"> ! <j:forEach var="containerTransaction" items="${util.getContainerTransactions(bean)}"> ! <container-transaction id="${plugin.prefixedId('MethodTransaction')}"> ! <description>Description not supported yet</description> ! <method id="${plugin.prefixedId('MethodElement')}"> <description>Description not supported yet</description> ! <ejb-name>${util.getEjbName(bean)}</ejb-name> ! <j:if test="${!empty(containerTransaction.ifaceType)}"> ! <method-intf>${containerTransaction.ifaceType}</method-intf> ! </j:if> ! <j:choose> ! <j:when test="${containerTransaction.method != null}"> ! <method-name>${containerTransaction.method.name}</method-name> ! <j:if test="${!empty(containerTransaction.method.parameters)}"> ! <method-params> ! <j:forEach var="param" items="${containerTransaction.method.parameters}"> ! <method-param>${param.type}</method-param> ! </j:forEach> ! </method-params> ! </j:if> ! </j:when> ! <j:otherwise> ! <method-name>*</method-name> ! </j:otherwise> ! </j:choose> ! </method> ! <trans-attribute>${containerTransaction.transType}</trans-attribute> ! </container-transaction> </j:forEach> + </j:forEach> + <g:merge file="ejb-message-destinations.xml"> + <x:comment trim="false"> + To specify additional message-destination elements, add a file + in the merge directory called ejb-message-destinations.xml + that contains them. + Define root element as <j:jelly xmlns:j="jelly:core"> + </x:comment> + </g:merge> ! <j:if test="${version.greaterOrEquals(2.1)}"> ! <j:forEach var="bean" items="${util.getMessageDrivenBeans(metadata)}"> ! <j:set var="ejbMessageDestinationTag" value="${bean.getTagByName('ejb.message-destination')}"/> ! <j:if test="${ejbMessageDestinationTag != null}"> ! <message-destination> ! <j:if test="${!empty(ejbMessageDestinationTag.description)}"> ! <description>${ejbMessageDestinationTag.description}</description> ! </j:if> ! <j:if test="${!empty(ejbMessageDestinationTag.displayName)}"> ! <display-name>${ejbMessageDestinationTag.displayName}</display-name> ! </j:if> ! <message-destination-name>${ejbMessageDestinationTag.name_}</message-destination-name> ! </message-destination> ! </j:if> ! </j:forEach> ! </j:if> ! <j:if test="${version.greaterOrEquals(2.0)}"> ! <g:merge file="ejb-exclude-list.xml"> ! <x:comment trim="false"> ! To specify an exclude-list element, add a file in the merge ! directory called ejb-exclude-list.xml that contains it. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> ! </j:if> ! </assembly-descriptor> ! </g:merge> </j:jelly> \ No newline at end of file Index: EjbJarXmlPlugin.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/EjbJarXmlPlugin.jelly,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EjbJarXmlPlugin.jelly 6 Oct 2005 13:46:48 -0000 1.5 --- EjbJarXmlPlugin.jelly 24 Sep 2006 11:58:56 -0000 1.6 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl"> <j:if test="${plugin.version.isDtd()}"> <x:doctype name="ejb-jar" publicId="${plugin.version.publicId}" systemId="${plugin.version.systemId}" trim="true" /> --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> ! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl" ! xmlns:g="jelly:org.generama.jelly.GeneramaTaglib"> <j:if test="${plugin.version.isDtd()}"> <x:doctype name="ejb-jar" publicId="${plugin.version.publicId}" systemId="${plugin.version.systemId}" trim="true" /> *************** *** 32,60 **** <!-- Merge Points START --> ! <j:choose> ! <j:when test="${plugin.getMergeFile('session-beans.xml').exists()}"> ! <j:import file="${plugin.getMergeFile('session-beans.xml').path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To add session beans that you have deployment descriptor info for, add a file to your XDoclet merge directory called session-beans.xml that contains the <session></session> markup for those beans.</x:comment> ! </j:otherwise> ! </j:choose> ! <j:choose> ! <j:when test="${plugin.getMergeFile('entity-beans.xml').exists()}"> ! <j:import file="${plugin.getMergeFile('entity-beans.xml').path}" inherit="true"/> ! </j:when> ! <j:otherwise> ! <x:comment trim="false">To add entity beans that you have deployment descriptor info for, add a file to your XDoclet merge directory called entity-beans.xml that contains the <entity></entity> markup for those beans.</x:comment> ! </j:otherwise> ! </j:choose> <j:if test="${version.greaterOrEquals(2.0)}"> ! <j:choose> ! <j:when test="${plugin.getMergeFile('message-driven-beans.xml').exists()}"> ! <j:import file="${plugin.getMergeFile('message-driven-beans.xml').path}" inherit="true"/> ! </j:when> ! <j:otherwise trim="false"> ! <x:comment>To add message driven beans that you have deployment descriptor info for, add a file to your XDoclet merge directory called message-driven-beans.xml that contains the <message-driven></message-driven> markup for those beans.</x:comment> ! </j:otherwise> ! </j:choose> </j:if> <!-- Merge Points END --> --- 33,61 ---- <!-- Merge Points START --> ! <g:merge file="session-beans.xml"> ! <x:comment> ! To add session beans that you have deployment descriptor info for, ! add a file to your XDoclet merge directory called session-beans.xml ! that contains the <session></session> markup for those beans. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> ! <g:merge file="entity-beans.xml"> ! <x:comment> ! To add entity beans that you have deployment descriptor info for, ! add a file to your XDoclet merge directory called entity-beans.xml ! that contains the <entity></entity> markup for those beans. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> <j:if test="${version.greaterOrEquals(2.0)}"> ! <g:merge file="message-driven-beans.xml"> ! <x:comment> ! To add message driven beans that you have deployment descriptor info for, ! add a file to your XDoclet merge directory called session-beans.xml ! that contains the <message-driven></message-driven> markup for those beans. ! Define root element as <j:jelly xmlns:j="jelly:core"> ! </x:comment> ! </g:merge> </j:if> <!-- Merge Points END --> Index: ejb-ref.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/ejb-ref.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ejb-ref.jelly 13 Dec 2005 03:35:32 -0000 1.4 --- ejb-ref.jelly 24 Sep 2006 11:58:56 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + <?xml version="1.0" encoding="UTF-8"?> <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml"> <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.ejb-ref')}"> |
