Update of
/cvsroot/xdoclet/xdoclet/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2130/modules/ibm/src/xdoclet/modules/ibm/websphere/ejb/resources
Modified Files:
ibm-ejb-jar-bnd-ejb-body_xmi.xdt
Log Message:
Fix for ejb-external-ref with view-type="local" and mixed ejb-ref and
ejb-external-ref with view-type="local" (XDT-1250)
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.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ibm-ejb-jar-bnd-ejb-body_xmi.xdt 4 Jan 2005 08:01:45 -0000 1.6
--- ibm-ejb-jar-bnd-ejb-body_xmi.xdt 4 Feb 2005 17:04:03 -0000 1.7
***************
*** 1,5 ****
<XDtComment:comment>
|
! | remote and local ejb refs
|
</XDtComment:comment>
--- 1,5 ----
<XDtComment:comment>
|
! | remote ejb refs
|
</XDtComment:comment>
***************
*** 7,21 ****
<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>
--- 7,15 ----
<XDtEjbRef:forAllEjbRefs>
<XDtWebSphereEjbRef:ifRemoteEjbRef>
+ <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtWebSphereEjbRef:ejbRefJndiName/>">
<bindingEjbRef href="META-INF/ejb-jar.xml#<XDtId:prefixedId
prefix='EJBRef' wrapInIdEquals='false'/>"/>
</ejbRefBindings>
+ </XDtWebSphereEjbRef:ifRemoteEjbRef>
</XDtEjbRef:forAllEjbRefs>
***************
*** 24,36 ****
<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>
--- 18,35 ----
<XDtComment:comment>
|
! | external 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'/>">
+ <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>
</XDtClass:ifHasClassTag>
***************
*** 41,44 ****
--- 40,62 ----
<XDtComment:comment>
|
+ | local ejb refs
+ | (must be generated after external local refs because it is done
this way in the ejb module
+ | and we have to do it the same way to be sure to get the same id's)
+ |
+ </XDtComment:comment>
+
+ <XDtEjbRef:forAllEjbRefs>
+
+ <XDtWebSphereEjbRef:ifLocalEjbRef>
+ <ejbRefBindings xmi:<XDtId:prefixedId prefix="EJBRefBnd"/>
jndiName="<XDtWebSphereEjbRef:ejbRefJndiName/>">
+ <bindingEjbRef xmi:type="common:EJBLocalRef"
href="META-INF/ejb-jar.xml#<XDtId:prefixedId prefix='EJBLocalRef'
wrapInIdEquals='false'/>"/>
+ </ejbRefBindings>
+ </XDtWebSphereEjbRef:ifLocalEjbRef>
+
+ </XDtEjbRef:forAllEjbRefs>
+
+
+ <XDtComment:comment>
+ |
| resource refs
|
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
