Update of
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11952/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
Modified Files:
ibm-ejb-jar-bnd_xmi.xdt ibm-ejb-jar-bnd-ejb-body_xmi.xdt
Log Message:
XDT-1185: Fixed the problem with a EJB-bean that defines both a local and a
remote interface.
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.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ibm-ejb-jar-bnd_xmi.xdt 15 Nov 2004 00:19:33 -0000 1.11
--- ibm-ejb-jar-bnd_xmi.xdt 27 Dec 2004 07:12:57 -0000 1.12
***************
*** 16,22 ****
<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>
--- 16,25 ----
<ejbBindings xmi:<XDtId:prefixedId prefix="Session_bnd"/>
jndiName="<XDtEjbHome:jndiName type='remote'/>">
</XDtEjb:ifRemoteEjb>
!
! <XDtComment:comment>Only define the local-jndi-name if no remote is
defined. Use the remote if both are defined</XDtComment:comment>
<XDtEjb:ifLocalEjb>
+ <XDtEjb:ifNotRemoteEjb>
<ejbBindings xmi:<XDtId:prefixedId prefix="Session_bnd"/>
jndiName="<XDtEjbHome:jndiName type='local'/>">
+ </XDtEjb:ifNotRemoteEjb>
</XDtEjb:ifLocalEjb>
***************
*** 55,60 ****
--- 58,66 ----
</XDtEjb:ifRemoteEjb>
+ <XDtComment:comment>Only define the local-jndi-name if no remote
is defined. Use the remote if both are defined</XDtComment:comment>
<XDtEjb:ifLocalEjb>
+ <XDtEjb:ifNotRemoteEjb>
jndiName="<XDtEjbHome:jndiName type='local'/>"
+ </XDtEjb:ifNotRemoteEjb>
</XDtEjb:ifLocalEjb>
>
Index: ibm-ejb-jar-bnd-ejb-body_xmi.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources/ibm-ejb-jar-bnd-ejb-body_xmi.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ibm-ejb-jar-bnd-ejb-body_xmi.xdt 7 Nov 2004 17:59:56 -0000 1.2
--- ibm-ejb-jar-bnd-ejb-body_xmi.xdt 27 Dec 2004 07:12:57 -0000 1.3
***************
*** 1,93 ****
! <XDtComment:comment>
! |
! | remote and local ejb refs
! |
! </XDtComment:comment>
!
! <XDtEjbRef:forAllEjbRefs>
!
! <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtEjbRef:ejbRefJndiName/>">
!
! <XDtEjb:ifRemoteEjb>
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
! </XDtEjb:ifRemoteEjb>
!
! <XDtEjb:ifLocalEjb>
! <bindingEjbRef xmi:type="common:EJBLocalRef"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='EJBLocalRef'
wrapInIdEquals='false'/>"/>
! </XDtEjb:ifLocalEjb>
!
! </ejbRefBindings>
!
! </XDtEjbRef:forAllEjbRefs>
!
!
! <XDtComment:comment>
! |
! | external remote ejb refs
! |
! </XDtComment:comment>
!
! <XDtClass:forAllClassTags tagName="ejb:ejb-external-ref">
!
! <XDtClass:ifHasClassTag tagName="ejb:ejb-external-ref"
paramName="jndi-name">
! <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtClass:classTagValue tagName='ejb:ejb-external-ref'
paramName='jndi-name'/>">
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
! </ejbRefBindings>
! </XDtClass:ifHasClassTag>
!
! </XDtClass:forAllClassTags>
!
!
! <XDtComment:comment>
! |
! | resource refs
! |
! </XDtComment:comment>
!
! <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'/>">
! <bindingResourceRef
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ResRef'
wrapInIdEquals='false'/>"/>
! </resRefBindings>
! </XDtClass:ifHasClassTag>
!
! </XDtClass:forAllClassTags>
!
!
! <XDtComment:comment>
! |
! | resource environment refs
! |
! </XDtComment:comment>
!
! <XDtClass:forAllClassTags tagName="ejb:resource-env-ref">
!
! <XDtClass:ifHasClassTag tagName="ejb:resource-env-ref"
paramName="jndi-name">
! <resourceEnvRefBindings xmi:<XDtId:prefixedId
prefix="ResourceEnvRefBnd"/> jndiName="<XDtClass:classTagValue
tagName='ejb:resource-env-ref' paramName='jndi-name'/>">
! <bindingResourceEnvRef
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ResEnvRef'
wrapInIdEquals='false'/>"/>
! </resourceEnvRefBindings>
! </XDtClass:ifHasClassTag>
!
! </XDtClass:forAllClassTags>
!
!
! <XDtComment:comment>
! |
! | datasource for CMP beans
! |
! </XDtComment:comment>
! <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>
--- 1,93 ----
! <XDtComment:comment>
! |
! | remote and local ejb refs
! |
! </XDtComment:comment>
!
! <XDtEjbRef:forAllEjbRefs>
!
! <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtWebSphereEjbRef:ejbRefJndiName/>">
!
! <XDtWebSphereEjbRef:ifRemoteEjbRef>
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
! </XDtWebSphereEjbRef:ifRemoteEjbRef>
!
! <XDtWebSphereEjbRef:ifLocalEjbRef>
! <bindingEjbRef xmi:type="common:EJBLocalRef"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='EJBLocalRef'
wrapInIdEquals='false'/>"/>
! </XDtWebSphereEjbRef:ifLocalEjbRef>
!
! </ejbRefBindings>
!
! </XDtEjbRef:forAllEjbRefs>
!
!
! <XDtComment:comment>
! |
! | external remote ejb refs
! |
! </XDtComment:comment>
!
! <XDtClass:forAllClassTags tagName="ejb:ejb-external-ref">
!
! <XDtClass:ifHasClassTag tagName="ejb:ejb-external-ref"
paramName="jndi-name">
! <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtClass:classTagValue tagName='ejb:ejb-external-ref'
paramName='jndi-name'/>">
! <bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
! </ejbRefBindings>
! </XDtClass:ifHasClassTag>
!
! </XDtClass:forAllClassTags>
!
!
! <XDtComment:comment>
! |
! | resource refs
! |
! </XDtComment:comment>
!
! <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'/>">
! <bindingResourceRef
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ResRef'
wrapInIdEquals='false'/>"/>
! </resRefBindings>
! </XDtClass:ifHasClassTag>
!
! </XDtClass:forAllClassTags>
!
!
! <XDtComment:comment>
! |
! | resource environment refs
! |
! </XDtComment:comment>
!
! <XDtClass:forAllClassTags tagName="ejb:resource-env-ref">
!
! <XDtClass:ifHasClassTag tagName="ejb:resource-env-ref"
paramName="jndi-name">
! <resourceEnvRefBindings xmi:<XDtId:prefixedId
prefix="ResourceEnvRefBnd"/> jndiName="<XDtClass:classTagValue
tagName='ejb:resource-env-ref' paramName='jndi-name'/>">
! <bindingResourceEnvRef
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='ResEnvRef'
wrapInIdEquals='false'/>"/>
! </resourceEnvRefBindings>
! </XDtClass:ifHasClassTag>
!
! </XDtClass:forAllClassTags>
!
!
! <XDtComment:comment>
! |
! | datasource for CMP beans
! |
! </XDtComment:comment>
! <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>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
xdoclet-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
