Update of
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16118/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
Modified Files:
ibm-ejb-jar-bnd_xmi.xdt
Log Message:
Major update of the IBM WebSphere module to support WebSphere v5.* and v6.0,
see XDT-1107 for details
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.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ibm-ejb-jar-bnd_xmi.xdt 18 Sep 2004 07:53:15 -0000 1.9
--- ibm-ejb-jar-bnd_xmi.xdt 7 Nov 2004 18:01:08 -0000 1.10
***************
*** 1,159 ****
! <ejbbnd:EJBJarBinding xmi:version="2.0"
! xmlns:xmi="http://www.omg.org/XMI" xmlns:ejbbnd="ejbbnd.xmi"
! xmlns:ejb="ejb.xmi" xmlns:commonbnd="commonbnd.xmi"
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
! xmi:id="ejb-jar_ID_Bnd">
! <ejbJar href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ejb-jar'
wrapInIdEquals='false'/>"/>
! <XDtClass:forAllClasses type="javax.ejb.SessionBean">
! <XDtEjb:ifIsAConcreteEJBean>
! <ejbBindings
! xmi:<XDtId:prefixedId prefix="Session_bnd"/>
! <XDtEjbHome:ifRemoteEjb>
! jndiName="<XDtEjbHome:jndiName type='remote'/>">
! </XDtEjbHome:ifRemoteEjb>
! <XDtEjbHome:ifNotRemoteEjb>
! jndiName="<XDtEjbHome:jndiName type='local'/>">
! </XDtEjbHome:ifNotRemoteEjb>
!
! <XDtEjbRef:forAllEjbRefs>
! <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtEjbRef:ejbRefJndiName/>">
! <XDtClass:ifClassTagValueEquals tagName="ejb:ejb-ref"
paramName="view-type" value="local">
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBLocalRef' wrapInIdEquals='false'/>"/>
! </XDtClass:ifClassTagValueEquals>
! <XDtClass:ifClassTagValueNotEquals tagName="ejb:ejb-ref"
paramName="view-type" value="local">
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
! </XDtClass:ifClassTagValueNotEquals>
! </ejbRefBindings>
! </XDtEjbRef:forAllEjbRefs>
!
! <XDtClass:forAllClassTags tagName="ejb:ejb-external-ref">
! <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtEjbRef:ejbRefJndiName/>">
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
! </ejbRefBindings>
! </XDtClass:forAllClassTags>
!
! <XDtClass:forAllClassTags tagName="ejb:resource-ref">
! <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="jndi-name">
! <resRefBindings xmi:<XDtId:prefixedId prefix="ResRefBnd"/>
jndiName="<XDtClass:classTagValue tagName='ejb:resource-ref'
paramName='jndi-name'/>">
! <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-auth">
! <defaultAuth xmi:type="commonbnd:BasicAuthData"
xmi:<XDtId:prefixedId prefix="BasicAuthData"/>>
! <userId xsi:nil="true"/>
! <password xdi:nul="true"/>
! </defaultAuth>
! </XDtClass:ifHasClassTag>
! <bindingResourceRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='ResRef' wrapInIdEquals='false'/>"/>
! </resRefBindings>
! </XDtClass:ifHasClassTag>
! </XDtClass:forAllClassTags>
! <XDtClass:ifHasClassTag tagName="websphere:datasource"
paramName="jndi-name">
! <datasource
! xmi:id="<XDtId:prefixedId prefix='Datasource'
wrapInIdEquals='false'/>"
! jndiName="<XDtClass:classTagValue tagName='websphere:datasource'
paramName='jndi-name'/>">
! <defaultAuth
! xmi:type="commonbnd:BasicAuthData"
! xmi:id="<XDtId:prefixedId prefix='BasicAuthData'
wrapInIdEquals='false'/>">
! <userId xsi:nil="true"/>
! <password xsi:nil="true"/>
! </defaultAuth>
! </datasource>
! </XDtClass:ifHasClassTag>
! <enterpriseBean
! xmi:type="ejb:Session"
href="META-INF/ejb-jar.xml#Session_<XDtEjb:id/>" />
! </ejbBindings>
! </XDtEjb:ifIsAConcreteEJBean>
</XDtClass:forAllClasses>
- <XDtClass:forAllClasses type="javax.ejb.EntityBean">
- <XDtEjb:ifIsAConcreteEJBean>
- <ejbBindings
- <XDtEjbCmp:ifEntityIsCmp>
- xmi:<XDtId:prefixedId prefix="ContainerManagedEntity_bnd"/>
- </XDtEjbCmp:ifEntityIsCmp>
- <XDtEjbBmp:ifEntityIsBmp>
- xmi:<XDtId:prefixedId prefix="BeanManagedEntity_bnd"/>
- </XDtEjbBmp:ifEntityIsBmp>
- <XDtEjbHome:ifRemoteEjb>
- jndiName="<XDtEjbHome:jndiName type='remote'/>">
- </XDtEjbHome:ifRemoteEjb>
- <XDtEjbHome:ifNotRemoteEjb>
- jndiName="<XDtEjbHome:jndiName type='local'/>">
- </XDtEjbHome:ifNotRemoteEjb>
-
- <XDtEjbRef:forAllEjbRefs>
- <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtEjbRef:ejbRefJndiName/>">
- <XDtClass:ifClassTagValueEquals tagName="ejb:ejb-ref"
paramName="view-type" value="local">
- <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBLocalRef' wrapInIdEquals='false'/>"/>
- </XDtClass:ifClassTagValueEquals>
- <XDtClass:ifClassTagValueNotEquals tagName="ejb:ejb-ref"
paramName="view-type" value="local">
- <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
- </XDtClass:ifClassTagValueNotEquals>
- </ejbRefBindings>
- </XDtEjbRef:forAllEjbRefs>
-
- <XDtClass:forAllClassTags tagName="ejb:ejb-external-ref">
- <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtEjbRef:ejbRefJndiName/>">
- <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
- </ejbRefBindings>
- </XDtClass:forAllClassTags>
-
- <XDtClass:forAllClassTags tagName="ejb:resource-ref">
- <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="jndi-name">
- <resRefBindings xmi:<XDtId:prefixedId prefix="ResRefBnd"/>
jndiName="<XDtClass:classTagValue tagName='ejb:resource-ref'
paramName='jndi-name'/>">
- <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-auth">
- <defaultAuth xmi:type="commonbnd:BasicAuthData"
xmi:<XDtId:prefixedId prefix="BasicAuthData"/>>
- <userId xsi:nil="true"/>
- <password xdi:nul="true"/>
- </defaultAuth>
- </XDtClass:ifHasClassTag>
- <bindingResourceRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='ResRef' wrapInIdEquals='false'/>"/>
- </resRefBindings>
- </XDtClass:ifHasClassTag>
- </XDtClass:forAllClassTags>
! <XDtClass:ifHasClassTag tagName="websphere:datasource"
paramName="jndi-name">
! <datasource
! xmi:id="<XDtId:prefixedId prefix='Datasource'
wrapInIdEquals='false'/>"
! jndiName="<XDtClass:classTagValue tagName='websphere:datasource'
paramName='jndi-name'/>">
! <defaultAuth
! xmi:type="commonbnd:BasicAuthData"
! xmi:id="<XDtId:prefixedId prefix='BasicAuthData'
wrapInIdEquals='false'/>">
! <userId xsi:nil="true"/>
! <password xsi:nil="true"/>
! </defaultAuth>
! </datasource>
! </XDtClass:ifHasClassTag>
! <enterpriseBean
! <XDtEjbCmp:ifEntityIsCmp>
! xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#ContainerManagedEntity_<XDtEjb:id/>"
! </XDtEjbCmp:ifEntityIsCmp>
! <XDtEjbBmp:ifEntityIsBmp>
! xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#BeanManagedEntity_<XDtEjb:id/>"
! </XDtEjbBmp:ifEntityIsBmp> />
! </ejbBindings>
! </XDtEjb:ifIsAConcreteEJBean>
</XDtClass:forAllClasses>
<XDtConfig:ifHasConfigParam paramName="DefaultDatasource">
! <defaultDatasource
! xmi:id="<XDtId:prefixedId prefix='Datasource'
wrapInIdEquals='false'/>"
! jndiName="<XDtConfig:configParameterValue
paramName="DefaultDatasource"/>">
! <defaultAuth
! xmi:type="commonbnd:BasicAuthData"
! xmi:id="<XDtId:prefixedId prefix='BasicAuthData'
wrapInIdEquals='false'/>">
! <userId xsi:nil="true"/>
! <password xsi:nil="true"/>
! </defaultAuth>
! </defaultDatasource>
</XDtConfig:ifHasConfigParam>
! </ejbbnd:EJBJarBinding>
--- 1,133 ----
! <?xml version="1.0" encoding="UTF-8"?>
! <ejbbnd:EJBJarBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:commonbnd="commonbnd.xmi" xmlns:ejbbnd="ejbbnd.xmi" xmlns:ejb="ejb.xmi"
xmlns:common="common.xmi" xmi:id="EJBJarBinding_1">
! <ejbJar href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ejb-jar'
wrapInIdEquals='false'/>"/>
! <XDtComment:comment>
! |
! | javax.ejb.SessionBean
! |
! </XDtComment:comment>
! <XDtClass:forAllClasses type="javax.ejb.SessionBean">
! <XDtEjb:ifIsAConcreteEJBean>
!
! <XDtEjb:ifRemoteEjb>
! <ejbBindings xmi:<XDtId:prefixedId prefix="Session_bnd"/>
jndiName="<XDtEjbHome:jndiName type='remote'/>">
! </XDtEjb:ifRemoteEjb>
!
! <XDtEjb:ifLocalEjb>
! <ejbBindings xmi:<XDtId:prefixedId prefix="Session_bnd"/>
jndiName="<XDtEjbHome:jndiName type='local'/>">
! </XDtEjb:ifLocalEjb>
!
! <enterpriseBean xmi:type="ejb:Session"
href="META-INF/ejb-jar.xml#Session_<XDtEjb:id/>"/>
! <XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-bnd-ejb-body_xmi.xdt">
! </XDtMerge:merge>
! </ejbBindings>
+ </XDtEjb:ifIsAConcreteEJBean>
</XDtClass:forAllClasses>
! <XDtComment:comment>
! |
! | javax.ejb.EntityBean
! |
! </XDtComment:comment>
!
! <XDtClass:forAllClasses type="javax.ejb.EntityBean">
! <XDtEjb:ifIsAConcreteEJBean>
!
! <ejbBindings
!
! <XDtEjbCmp:ifEntityIsCmp>
! xmi:<XDtId:prefixedId prefix="ContainerManagedEntity_bnd"/>
! </XDtEjbCmp:ifEntityIsCmp>
!
! <XDtEjbBmp:ifEntityIsBmp>
! xmi:<XDtId:prefixedId prefix="BeanManagedEntity_bnd"/>
! </XDtEjbBmp:ifEntityIsBmp>
!
! <XDtEjb:ifRemoteEjb>
! jndiName="<XDtEjbHome:jndiName type='remote'/>"
! </XDtEjb:ifRemoteEjb>
!
! <XDtEjb:ifLocalEjb>
! jndiName="<XDtEjbHome:jndiName type='local'/>"
! </XDtEjb:ifLocalEjb>
! >
!
! <XDtEjbCmp:ifEntityIsCmp>
! <enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#ContainerManagedEntity_<XDtEjb:id/>"/>
! </XDtEjbCmp:ifEntityIsCmp>
!
! <XDtEjbBmp:ifEntityIsBmp>
! <enterpriseBean xmi:type="ejb:Entity"
href="META-INF/ejb-jar.xml#BeanManagedEntity_<XDtEjb:id/>"/>
! </XDtEjbBmp:ifEntityIsBmp>
!
! <XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-bnd-ejb-body_xmi.xdt">
! </XDtMerge:merge>
!
! <XDtClass:ifHasClassTag tagName="websphere:persistence"
paramName="datasource">
! <cmpConnectionFactory xmi:<XDtId:prefixedId
prefix="CMPConnectionFactoryBinding"/> jndiName="<XDtClass:classTagValue
tagName="websphere:persistence" paramName="datasource"/>"
resAuth="Per_Connection_Factory"/>
! </XDtClass:ifHasClassTag>
! </ejbBindings>
! </XDtEjb:ifIsAConcreteEJBean>
! </XDtClass:forAllClasses>
!
!
! <XDtComment:comment>
! |
! | javax.ejb.MessageDrivenBean
! |
! </XDtComment:comment>
!
! <XDtClass:forAllClasses type="javax.ejb.MessageDrivenBean">
! <XDtEjb:ifIsAConcreteEJBean>
!
! <ejbBindings xmi:type="ejbbnd:MessageDrivenBeanBinding"
xmi:<XDtId:prefixedId prefix="Message_bnd"/>
listenerInputPortName="<XDtClass:classTagValue tagName="websphere:bean"
paramName="listenerPort"/>" >
!
! <enterpriseBean xmi:type="ejb:MessageDriven"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='MessageDriven'
wrapInIdEquals='false'/>" />
!
! <XDtMerge:merge
file="xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-bnd-ejb-body_xmi.xdt">
! </XDtMerge:merge>
!
! </ejbBindings>
+ </XDtEjb:ifIsAConcreteEJBean>
</XDtClass:forAllClasses>
+
+ <XDtComment:comment>
+ |
+ | DefaultDatasource
+ |
+ </XDtComment:comment>
+
<XDtConfig:ifHasConfigParam paramName="DefaultDatasource">
! <defaultDatasource
! xmi:id="<XDtId:prefixedId prefix='Datasource'
wrapInIdEquals='false'/>"
! jndiName="<XDtConfig:configParameterValue
paramName="DefaultDatasource"/>"
! >
!
! <defaultAuth
! xmi:type="commonbnd:BasicAuthData"
! xmi:id="<XDtId:prefixedId prefix='BasicAuthData'
wrapInIdEquals='false'/>"
! >
!
! <userId xsi:nil="true"/>
! <password xsi:nil="true"/>
!
! </defaultAuth>
! </defaultDatasource>
</XDtConfig:ifHasConfigParam>
! <XDtConfig:ifHasConfigParam paramName="datasource">
! <defaultCMPConnectionFactory xmi:<XDtId:prefixedId
prefix="CMPConnectionFactoryBinding"/>
jndiName="<XDtConfig:configParameterValue paramName="datasource"/>"
resAuth="Per_Connection_Factory"/>
! </XDtConfig:ifHasConfigParam>
+ </ejbbnd:EJBJarBinding>
\ No newline at end of file
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel