Update of
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7916/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
Modified Files:
ibm-ejb-jar-ext_xmi.xdt ibm-ejb-jar-bnd_xmi.xdt
Added Files:
ibm-ejb-jar-ext-ejb-body_xmi.xdt
Log Message:
XDT-1208: Added support for new tag websphere.resource-ref
--- NEW FILE: ibm-ejb-jar-ext-ejb-body_xmi.xdt ---
<XDtComment:comment>
|
| resource-ref extensions
|
</XDtComment:comment>
<XDtClass:forAllClassTags tagName="ejb.resource-ref">
<resourceRefExtensions xmi:<XDtId:prefixedId prefix="ResourceRef_ext"/>>
<resourceRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='ResRef' wrapInIdEquals='false'/>"/>
<XDtWebSphere:forAllResourceRefs>
<XDtClass:ifHasClassTag tagName="websphere.resource-ref"
paramName="isolation-level">
<isolationLevel><XDtClass:classTagValue
tagName="websphere.resource-ref" paramName="isolation-level"/></isolationLevel>
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="websphere.resource-ref"
paramName="connection-management-policy">
<connectionManagementPolicy><XDtClass:classTagValue
tagName="websphere.resource-ref"
paramName="connection-management-policy"/></connectionManagementPolicy>
</XDtClass:ifHasClassTag>
</XDtWebSphere:forAllResourceRefs>
</resourceRefExtensions>
</XDtClass:forAllClassTags>
Index: ibm-ejb-jar-ext_xmi.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-ext_xmi.xdt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ibm-ejb-jar-ext_xmi.xdt 27 Nov 2004 08:17:03 -0000 1.8
--- ibm-ejb-jar-ext_xmi.xdt 3 Jan 2005 09:35:15 -0000 1.9
***************
*** 1,50 ****
<ejbext:EJBJarExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI";
xmlns:ejbext="ejbext.xmi" xmlns:ejb="ejb.xmi" xmi:id="ejb-jar_ID_Ext">
- <ejbJar href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ejb-jar'
wrapInIdEquals='false'/>"/>
! <XDtEjbEntity:forAllEntityBeans>
! <XDtEjb:ifIsAConcreteEJBean>
! <ejbExtensions
! <XDtEjbCmp:ifEntityIsCmp>
! xmi:type="ejbext:EntityExtension" xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity_ext' wrapInIdEquals='false'/>">
! <!--enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#ContainerManagedEntity_<XDtEjb:id/>"/-->
! <enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ContainerManagedEntity'
wrapInIdEquals='false'/>"/>
! <structure xmi:id="<XDtEjb:id/>_BeanStructure" inheritenceRoot="false"/>
! <beanCache xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity__BeanCache' wrapInIdEquals='false'/>"
activateAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="activate-at" default="TRANSACTION"/>"
loadAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="load-at" default="TRANSACTION"/>"/>
! <internationalization xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity_BeanInternationalization'
wrapInIdEquals='false'/>" invocationLocale="CALLER"/>
! <localTran xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity_LocalTran' wrapInIdEquals='false'/>"
boundary="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="boundary" default="BEAN_METHOD"/>"
unresolvedAction="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="unresolved-action" default="ROLLBACK"/>"/>
! </XDtEjbCmp:ifEntityIsCmp>
! <XDtEjbBmp:ifEntityIsBmp>
! xmi:type="ejbext:EntityExtension" xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_ext' wrapInIdEquals='false'/>">
! <!--enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#BeanManagedEntity_<XDtEjb:id/>"/-->
! <enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='BeanManagedEntity'
wrapInIdEquals='false'/>"/>
! <structure xmi:id="<XDtEjb:id/>_BeanStructure" inheritenceRoot="false"/>
! <beanCache xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_BeanCache' wrapInIdEquals='false'/>"
activateAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="activate-at" default="TRANSACTION"/>"
loadAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="load-at" default="TRANSACTION"/>"/>
! <internationalization xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_BeanInternationalization' wrapInIdEquals='false'/>"
invocationLocale="CALLER"/>
! <localTran xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_LocalTran' wrapInIdEquals='false'/>"
boundary="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="boundary" default="BEAN_METHOD"/>"
unresolvedAction="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="unresolved-action" default="ROLLBACK"/>"/>
! </XDtEjbBmp:ifEntityIsBmp>
! <XDtClass:forAllClassTags tagName="websphere:finder-query">
! <finderDescriptors xmi:type="ejbext:WhereClauseFinderDescriptor"
xmi:id="<XDtId:prefixedId prefix='WhereClauseFinderDescriptor'
wrapInIdEquals='false'/>" whereClause="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='where-clause'/>">
! <finderMethodElements xmi:id="<XDtId:prefixedId
prefix='MethodElement' wrapInIdEquals='false'/>"
! name="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='name'/>"
! parms="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='parms'/>"
! type="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='home' default='Home'/>">
! <enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#ContainerManagedEntity_<XDtEjb:id/>"/>
! </finderMethodElements>
! </finderDescriptors>
</XDtClass:forAllClassTags>
</ejbExtensions>
! </XDtEjb:ifIsAConcreteEJBean>
! </XDtEjbEntity:forAllEntityBeans>
- <XDtEjbSession:forAllSessionBeans>
- <XDtEjb:ifIsAConcreteEJBean>
- <XDtClass:ifHasClassTag tagName="websphere:bean" paramName="timeout">
- <ejbExtensions xmi:type="ejbext:SessionExtension" xmi:<XDtId:prefixedId
prefix="Session_ext"/> timeout="<XDtClass:classTagValue
tagName='websphere:bean' paramName='timeout'/>">
- <enterpriseBean xmi:type="ejb:Session"
href="META-INF/ejb-jar.xml#Session_<XDtEjb:id/>" />
- </ejbExtensions>
- </XDtClass:ifHasClassTag>
- </XDtEjb:ifIsAConcreteEJBean>
- </XDtEjbSession:forAllSessionBeans>
</ejbext:EJBJarExtension>
--- 1,90 ----
<ejbext:EJBJarExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI";
xmlns:ejbext="ejbext.xmi" xmlns:ejb="ejb.xmi" xmi:id="ejb-jar_ID_Ext">
! <ejbJar href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ejb-jar'
wrapInIdEquals='false'/>"/>
! <XDtComment:comment>
! |
! | Session Beans
! |
! </XDtComment:comment>
!
! <XDtEjbSession:forAllSessionBeans>
! <XDtEjb:ifIsAConcreteEJBean>
! <ejbExtensions xmi:type="ejbext:SessionExtension" xmi:<XDtId:prefixedId
prefix="Session_ext"/>>
! <enterpriseBean xmi:type="ejb:Session"
href="META-INF/ejb-jar.xml#Session_<XDtEjb:id/>"/>
! <XDtClass:ifHasClassTag tagName="websphere:bean" paramName="timeout">
! <timeout><XDtClass:classTagValue tagName='websphere:bean'
paramName='timeout'/></timeout>
! </XDtClass:ifHasClassTag>
!
! <XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-ext-ejb-body_xmi.xdt">
! </XDtMerge:merge>
!
! </ejbExtensions>
! </XDtEjb:ifIsAConcreteEJBean>
! </XDtEjbSession:forAllSessionBeans>
!
!
! <XDtComment:comment>
! |
! | Entity Beans
! |
! </XDtComment:comment>
! <XDtEjbEntity:forAllEntityBeans>
! <XDtEjb:ifIsAConcreteEJBean>
! <ejbExtensions
! <XDtEjbCmp:ifEntityIsCmp>
! xmi:type="ejbext:ContainerManagedEntityExtension"
xmi:id="<XDtId:prefixedId prefix='ContainerManagedEntity_ext'
wrapInIdEquals='false'/>">
! <enterpriseBean xmi:type="ejb:ContainerManagedEntity"
href="META-INF/ejb-jar.xml#ContainerManagedEntity_<XDtEjb:id/>"/>
! <structure xmi:id="<XDtEjb:id/>_BeanStructure"
inheritenceRoot="false"/>
! <beanCache xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity__BeanCache' wrapInIdEquals='false'/>"
activateAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="activate-at" default="TRANSACTION"/>"
loadAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="load-at" default="TRANSACTION"/>"/>
! <internationalization xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity_BeanInternationalization'
wrapInIdEquals='false'/>" invocationLocale="CALLER"/>
! <localTran xmi:id="<XDtId:prefixedId
prefix='ContainerManagedEntity_LocalTran' wrapInIdEquals='false'/>"
boundary="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="boundary" default="BEAN_METHOD"/>"
unresolvedAction="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="unresolved-action" default="ROLLBACK"/>"/>
! </XDtEjbCmp:ifEntityIsCmp>
! <XDtEjbBmp:ifEntityIsBmp>
! xmi:type="ejbext:BeanManagedEntityExtension"
xmi:id="<XDtId:prefixedId prefix='BeanManagedEntity_ext'
wrapInIdEquals='false'/>">
! <enterpriseBean xmi:type="ejb:BeanManagedEntity"
href="META-INF/ejb-jar.xml#BeanManagedEntity_<XDtEjb:id/>"/>
! <structure xmi:id="<XDtEjb:id/>_BeanStructure"
inheritenceRoot="false"/>
! <beanCache xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_BeanCache' wrapInIdEquals='false'/>"
activateAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="activate-at" default="TRANSACTION"/>"
loadAt="<XDtClass:classTagValue tagName="websphere:bean-cache"
paramName="load-at" default="TRANSACTION"/>"/>
! <internationalization xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_BeanInternationalization' wrapInIdEquals='false'/>"
invocationLocale="CALLER"/>
! <localTran xmi:id="<XDtId:prefixedId
prefix='BeanManagedEntity_LocalTran' wrapInIdEquals='false'/>"
boundary="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="boundary" default="BEAN_METHOD"/>"
unresolvedAction="<XDtClass:classTagValue tagName="websphere:local-tran"
paramName="unresolved-action" default="ROLLBACK"/>"/>
! </XDtEjbBmp:ifEntityIsBmp>
! <XDtClass:forAllClassTags tagName="websphere:finder-query">
! <finderDescriptors xmi:type="ejbext:WhereClauseFinderDescriptor"
xmi:id="<XDtId:prefixedId prefix='WhereClauseFinderDescriptor'
wrapInIdEquals='false'/>" whereClause="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='where-clause'/>">
! <finderMethodElements xmi:id="<XDtId:prefixedId
prefix='MethodElement' wrapInIdEquals='false'/>"
! name="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='name'/>"
! parms="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='parms'/>"
! type="<XDtClass:classTagValue
tagName='websphere:finder-query' paramName='home' default='Home'/>">
! <enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#ContainerManagedEntity_<XDtEjb:id/>"/>
! </finderMethodElements>
! </finderDescriptors>
</XDtClass:forAllClassTags>
+
+ <XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-ext-ejb-body_xmi.xdt">
+ </XDtMerge:merge>
+
+ </ejbExtensions>
+ </XDtEjb:ifIsAConcreteEJBean>
+ </XDtEjbEntity:forAllEntityBeans>
+
+
+ <XDtComment:comment>
+ |
+ | Message Driven Beans
+ |
+ </XDtComment:comment>
+
+ <XDtEjbMdb:forAllMDBeans>
+ <XDtEjb:ifIsAConcreteEJBean>
+ <ejbExtensions xmi:type="ejbext:MessageDrivenExtension"
xmi:<XDtId:prefixedId prefix='MessageDriven_ext'/>>
+ <enterpriseBean xmi:type="ejb:MessageDriven"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='MessageDriven'
wrapInIdEquals='false'/>" />
+ <!-- ML FIX. enterpriseBean xmi:type="ejb:MessageDriven"
href="META-INF/ejb-jar.xml#MessageDriven_<XDtEjb:id/>"/-->
+
+ <XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-ext-ejb-body_xmi.xdt">
+ </XDtMerge:merge>
+
</ejbExtensions>
! </XDtEjb:ifIsAConcreteEJBean>
! </XDtEjbMdb:forAllMDBeans>
</ejbext:EJBJarExtension>
Index: ibm-ejb-jar-bnd_xmi.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-bnd_xmi.xdt,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** ibm-ejb-jar-bnd_xmi.xdt 29 Dec 2004 15:45:13 -0000 1.13
--- ibm-ejb-jar-bnd_xmi.xdt 3 Jan 2005 09:35:15 -0000 1.14
***************
*** 110,113 ****
--- 110,114 ----
<enterpriseBean xmi:type="ejb:MessageDriven"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='MessageDriven'
wrapInIdEquals='false'/>" />
+ <!-- ML FIX. enterpriseBean xmi:type="ejb:MessageDriven"
href="META-INF/ejb-jar.xml#MessageDriven_<XDtEjb:id/>"/-->
<XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-bnd-ejb-body_xmi.xdt">
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
