Update of
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/dd/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16817/modules/ejb/src/xdoclet/modules/ejb/dd/resources
Modified Files:
ejb-body.xdt
Added Files:
res-ref.xdt
Log Message:
support security-identity and security-role-ref elements movement in ejb spec
2.1 (XDT-1146)
--- NEW FILE: res-ref.xdt ---
<XDtMerge:merge file="ejb-resourcerefs-{0}.xml">
<XDtClass:forAllClassTags tagName="ejb:resource-ref">
<resource-ref <XDtId:prefixedId prefix="ResRef"/>>
<XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-name">
<res-ref-name><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-name"/></res-ref-name>
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-ref-name">
<res-ref-name><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-ref-name"/></res-ref-name>
</XDtClass:ifHasClassTag>
<res-type><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-type" mandatory="true"/></res-type>
<res-auth><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-auth" mandatory="true"/></res-auth>
<XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-sharing-scope">
<res-sharing-scope><XDtClass:classTagValue
tagName="ejb:resource-ref" paramName="res-sharing-scope"
values="Shareable,Unshareable"/></res-sharing-scope>
</XDtClass:ifHasClassTag>
</resource-ref>
</XDtClass:forAllClassTags>
</XDtMerge:merge>
<XDtMerge:merge file="ejb-resource-env-refs-{0}.xml">
<XDtClass:forAllClassTags tagName="ejb:resource-env-ref">
<resource-env-ref <XDtId:prefixedId prefix="ResEnvRef"/>>
<XDtClass:ifHasClassTag tagName="ejb:resource-env-ref"
paramName="description">
<description><![CDATA[<XDtClass:classTagValue
tagName="ejb:resource-env-ref" paramName="description"/>]]></description>
</XDtClass:ifHasClassTag>
<resource-env-ref-name><XDtClass:classTagValue
tagName="ejb:resource-env-ref" paramName="name"
mandatory="true"/></resource-env-ref-name>
<resource-env-ref-type><XDtClass:classTagValue
tagName="ejb:resource-env-ref" paramName="type"
mandatory="true"/></resource-env-ref-type>
</resource-env-ref>
</XDtClass:forAllClassTags>
</XDtMerge:merge>
<XDtConfig:ifConfigParamNotGreaterOrEquals paramName="EjbSpec"
value="2.1">
<XDtMerge:merge file="ejb-destinationrefs-{0}.xml">
<XDtClass:forAllClassTags tagName="ejb:destination-ref">
<resource-env-ref <XDtId:prefixedId prefix="ResEnvRef"/>>
<XDtClass:ifHasClassTag tagName="ejb:destination-ref"
paramName="description">
<description><![CDATA[<XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="description"/>]]></description>
</XDtClass:ifHasClassTag>
<resource-env-ref-name><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="name"
mandatory="true"/></resource-env-ref-name>
<resource-env-ref-type><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="type"
mandatory="true"/></resource-env-ref-type>
</resource-env-ref>
</XDtClass:forAllClassTags>
</XDtMerge:merge>
</XDtConfig:ifConfigParamNotGreaterOrEquals>
Index: ejb-body.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/dd/resources/ejb-body.xdt,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** ejb-body.xdt 2 Mar 2005 00:00:31 -0000 1.34
--- ejb-body.xdt 2 Mar 2005 21:00:04 -0000 1.35
***************
*** 187,190 ****
--- 187,212 ----
</XDtMerge:merge>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec"
value="2.1">
+ <XDtMerge:merge file="xdoclet/modules/ejb/dd/resources/res-ref.xdt">
+ </XDtMerge:merge>
+ <XDtMerge:merge file="ejb-destinationrefs-{0}.xml">
+ <XDtClass:forAllClassTags tagName="ejb:destination-ref">
+ <message-destination-ref>
+ <XDtClass:ifHasClassTag tagName="ejb:destination-ref"
paramName="description">
+ <description><![CDATA[<XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="description"/>]]></description>
+ </XDtClass:ifHasClassTag>
+ <message-destination-ref-name><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="name"/></message-destination-ref-name>
+ <message-destination-type><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="type"/></message-destination-type>
+ <XDtClass:ifHasClassTag tagName="ejb:destination-ref"
paramName="usage">
+ <message-destination-usage><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="usage"
values="Consumes,Produces,ConsumesProduces"/></message-destination-usage>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifDoesntHaveClassTag tagName="ejb:destination-ref"
paramName="usage">
+
<message-destination-usage>ConsumesProduces</message-destination-usage>
+ </XDtClass:ifDoesntHaveClassTag>
+ </message-destination-ref>
+ </XDtClass:forAllClassTags>
+ </XDtMerge:merge>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
+
<XDtMerge:merge file="ejb-sec-rolerefs-{0}.xml">
<XDtClass:forAllClassTags tagName="ejb:security-role-ref">
***************
*** 217,282 ****
</XDtConfig:ifConfigParamGreaterOrEquals>
! <XDtMerge:merge file="ejb-resourcerefs-{0}.xml">
! <XDtClass:forAllClassTags tagName="ejb:resource-ref">
! <resource-ref <XDtId:prefixedId prefix="ResRef"/>>
! <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-name">
! <res-ref-name><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-name"/></res-ref-name>
! </XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-ref-name">
! <res-ref-name><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-ref-name"/></res-ref-name>
! </XDtClass:ifHasClassTag>
! <res-type><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-type" mandatory="true"/></res-type>
! <res-auth><XDtClass:classTagValue tagName="ejb:resource-ref"
paramName="res-auth" mandatory="true"/></res-auth>
! <XDtClass:ifHasClassTag tagName="ejb:resource-ref"
paramName="res-sharing-scope">
! <res-sharing-scope><XDtClass:classTagValue
tagName="ejb:resource-ref" paramName="res-sharing-scope"
values="Shareable,Unshareable"/></res-sharing-scope>
! </XDtClass:ifHasClassTag>
! </resource-ref>
! </XDtClass:forAllClassTags>
! </XDtMerge:merge>
!
! <XDtMerge:merge file="ejb-resource-env-refs-{0}.xml">
! <XDtClass:forAllClassTags tagName="ejb:resource-env-ref">
! <resource-env-ref <XDtId:prefixedId prefix="ResEnvRef"/>>
! <XDtClass:ifHasClassTag tagName="ejb:resource-env-ref"
paramName="description">
! <description><![CDATA[<XDtClass:classTagValue
tagName="ejb:resource-env-ref" paramName="description"/>]]></description>
! </XDtClass:ifHasClassTag>
! <resource-env-ref-name><XDtClass:classTagValue
tagName="ejb:resource-env-ref" paramName="name"
mandatory="true"/></resource-env-ref-name>
! <resource-env-ref-type><XDtClass:classTagValue
tagName="ejb:resource-env-ref" paramName="type"
mandatory="true"/></resource-env-ref-type>
! </resource-env-ref>
! </XDtClass:forAllClassTags>
</XDtMerge:merge>
! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="EjbSpec"
value="2.1">
! <XDtMerge:merge file="ejb-destinationrefs-{0}.xml">
! <XDtClass:forAllClassTags tagName="ejb:destination-ref">
! <resource-env-ref <XDtId:prefixedId prefix="ResEnvRef"/>>
! <XDtClass:ifHasClassTag tagName="ejb:destination-ref"
paramName="description">
! <description><![CDATA[<XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="description"/>]]></description>
! </XDtClass:ifHasClassTag>
! <resource-env-ref-name><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="name"
mandatory="true"/></resource-env-ref-name>
! <resource-env-ref-type><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="type"
mandatory="true"/></resource-env-ref-type>
! </resource-env-ref>
! </XDtClass:forAllClassTags>
! </XDtMerge:merge>
! </XDtConfig:ifConfigParamNotGreaterOrEquals>
!
! <XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec"
value="2.1">
! <XDtMerge:merge file="ejb-destinationrefs-{0}.xml">
! <XDtClass:forAllClassTags tagName="ejb:destination-ref">
! <message-destination-ref>
! <XDtClass:ifHasClassTag tagName="ejb:destination-ref"
paramName="description">
! <description><![CDATA[<XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="description"/>]]></description>
! </XDtClass:ifHasClassTag>
! <message-destination-ref-name><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="name"/></message-destination-ref-name>
! <message-destination-type><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="type"/></message-destination-type>
! <XDtClass:ifHasClassTag tagName="ejb:destination-ref"
paramName="usage">
! <message-destination-usage><XDtClass:classTagValue
tagName="ejb:destination-ref" paramName="usage"
values="Consumes,Produces,ConsumesProduces"/></message-destination-usage>
! </XDtClass:ifHasClassTag>
! <XDtClass:ifDoesntHaveClassTag tagName="ejb:destination-ref"
paramName="usage">
!
<message-destination-usage>ConsumesProduces</message-destination-usage>
! </XDtClass:ifDoesntHaveClassTag>
! </message-destination-ref>
! </XDtClass:forAllClassTags>
! </XDtMerge:merge>
! </XDtConfig:ifConfigParamGreaterOrEquals>
<XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
--- 239,246 ----
</XDtConfig:ifConfigParamGreaterOrEquals>
! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="EjbSpec"
value="2.1">
! <XDtMerge:merge file="xdoclet/modules/ejb/dd/resources/res-ref.xdt">
</XDtMerge:merge>
! </XDtConfig:ifConfigParamNotGreaterOrEquals>
<XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
-------------------------------------------------------
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://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
