Update of 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/dd/resources
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24148/modules/ejb/src/xdoclet/modules/ejb/dd/resources

Modified Files:
        asm-descriptor.xdt 
Log Message:
added full method-permission scopability (XDT-658)

Index: asm-descriptor.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/dd/resources/asm-descriptor.xdt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** asm-descriptor.xdt  25 Mar 2005 20:58:38 -0000      1.14
--- asm-descriptor.xdt  26 Mar 2005 09:22:20 -0000      1.15
***************
*** 40,83 ****
   <XDtEjb:forAllBeans>
   <XDtEjb:ifIsAConcreteEJBean>
!   <XDtClass:ifHasClassTag tagName="ejb:permission">
!       <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
           <description><![CDATA[<XDtI18n:getString 
bundle="xdoclet.modules.ejb.XDocletModulesEjbMessages" 
resource="description_not_supported"/>]]></description>
!       <XDtClass:forAllClassTags tagName="ejb:permission">
!        <XDtClass:ifHasClassTag tagName="ejb:permission" paramName="role-name">
!         <XDtClass:forAllClassTagTokens tagName="ejb:permission" 
paramName="role-name" delimiter=",">
!          <role-name><XDtClass:currentToken/></role-name>
!         </XDtClass:forAllClassTagTokens>
!        </XDtClass:ifHasClassTag>
!        <XDtClass:ifDoesntHaveClassTag tagName="ejb:permission" 
paramName="role-name">
!         <XDtClass:ifHasClassTag tagName="ejb:permission" 
paramName="unchecked">
!         <XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" 
value="2.0">
!          <unchecked/>
!         </XDtConfig:ifConfigParamGreaterOrEquals>
          </XDtClass:ifHasClassTag>
!        </XDtClass:ifDoesntHaveClassTag>
!       </XDtClass:forAllClassTags>
!          <method <XDtId:prefixedId prefix="MethodElement"/>>
!             <description><![CDATA[<XDtI18n:getString 
bundle="xdoclet.modules.ejb.XDocletModulesEjbMessages" 
resource="description_not_supported"/>]]></description>
!            <XDtType:ifIsOfType type="javax.ejb.SessionBean">
!             <ejb-name><XDtEjb:ejbName/></ejb-name>
!            </XDtType:ifIsOfType>
!            <XDtType:ifIsOfType type="javax.ejb.EntityBean">
!             <ejb-name><XDtEjb:ejbName/></ejb-name>
!            </XDtType:ifIsOfType>
!            <XDtType:ifIsOfType type="javax.ejb.MessageDrivenBean">
!             <ejb-name><XDtEjb:ejbName/></ejb-name>
!            </XDtType:ifIsOfType>
!             <method-name>*</method-name>
!          </method>
!       </method-permission>
!   </XDtClass:ifHasClassTag>
  
    <XDtMethod:forAllMethods>
!    <XDtMethod:ifHasMethodTag tagName="ejb:permission">
      <XDtEjbIntf:ifIsInterfaceMethod>
       <XDtEjbIntf:forAllInterfaceViewTypes>
     <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
        <description><![CDATA[<XDtI18n:getString 
bundle="xdoclet.modules.ejb.XDocletModulesEjbMessages" 
resource="description_not_supported"/>]]></description>
-    <XDtMethod:forAllMethodTags tagName="ejb:permission">
      <XDtMethod:ifHasMethodTag tagName="ejb:permission" paramName="role-name">
          <XDtMethod:forAllMethodTagTokens tagName="ejb:permission" 
paramName="role-name" delimiter=",">
--- 40,89 ----
   <XDtEjb:forAllBeans>
   <XDtEjb:ifIsAConcreteEJBean>
!   <XDtClass:forAllClassTags tagName="ejb:permission">
!    <XDtEjbIntf:forAllClassTagIntf paramName="view-type">
!    <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
!       <description><![CDATA[<XDtI18n:getString 
bundle="xdoclet.modules.ejb.XDocletModulesEjbMessages" 
resource="description_not_supported"/>]]></description>
!     <XDtClass:ifHasClassTag tagName="ejb:permission" paramName="role-name">
!      <XDtClass:forAllClassTagTokens tagName="ejb:permission" 
paramName="role-name" delimiter=",">
!       <role-name><XDtClass:currentToken/></role-name>
!      </XDtClass:forAllClassTagTokens>
!     </XDtClass:ifHasClassTag>
!     <XDtClass:ifDoesntHaveClassTag tagName="ejb:permission" 
paramName="role-name">
!      <XDtClass:ifHasClassTag tagName="ejb:permission" paramName="unchecked">
!      <XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
!       <unchecked/>
!      </XDtConfig:ifConfigParamGreaterOrEquals>
!      </XDtClass:ifHasClassTag>
!     </XDtClass:ifDoesntHaveClassTag>
!       <method <XDtId:prefixedId prefix="MethodElement"/>>
           <description><![CDATA[<XDtI18n:getString 
bundle="xdoclet.modules.ejb.XDocletModulesEjbMessages" 
resource="description_not_supported"/>]]></description>
!         <XDtType:ifIsOfType type="javax.ejb.SessionBean">
!          <ejb-name><XDtEjb:ejbName/></ejb-name>
!         </XDtType:ifIsOfType>
!         <XDtType:ifIsOfType type="javax.ejb.EntityBean">
!          <ejb-name><XDtEjb:ejbName/></ejb-name>
!         </XDtType:ifIsOfType>
!         <XDtType:ifIsOfType type="javax.ejb.MessageDrivenBean">
!          <ejb-name><XDtEjb:ejbName/></ejb-name>
!         </XDtType:ifIsOfType>
!         <XDtEjbIntf:ifHasClassTagIntf>
!          <method-intf><XDtEjbIntf:classTagIntf/></method-intf>
!         </XDtEjbIntf:ifHasClassTagIntf>
!         <XDtClass:ifHasClassTag tagName="ejb:permission" 
paramName="method-intf">
!          <method-intf><XDtClass:classTagValue tagName="ejb:permission" 
paramName="method-intf" 
values="Home,Remote,LocalHome,Local,ServiceEndpoint"/></method-intf>
          </XDtClass:ifHasClassTag>
!          <method-name>*</method-name>
!       </method>
!    </method-permission>
!    </XDtEjbIntf:forAllClassTagIntf>
!   </XDtClass:forAllClassTags>
  
    <XDtMethod:forAllMethods>
!    <XDtMethod:forAllMethodTags tagName="ejb:permission">
      <XDtEjbIntf:ifIsInterfaceMethod>
       <XDtEjbIntf:forAllInterfaceViewTypes>
+       <XDtEjbIntf:ifCurrentMethodViewTypeEquals paramName="view-type">
     <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
        <description><![CDATA[<XDtI18n:getString 
bundle="xdoclet.modules.ejb.XDocletModulesEjbMessages" 
resource="description_not_supported"/>]]></description>
      <XDtMethod:ifHasMethodTag tagName="ejb:permission" paramName="role-name">
          <XDtMethod:forAllMethodTagTokens tagName="ejb:permission" 
paramName="role-name" delimiter=",">
***************
*** 92,96 ****
      </XDtMethod:ifHasMethodTag>
      </XDtMethod:ifDoesntHaveMethodTag>
-    </XDtMethod:forAllMethodTags>
        <method <XDtId:prefixedId prefix="MethodElement"/>>
           
<description><![CDATA[<XDtMethod:firstSentenceDescriptionOfCurrentMethod/>]]></description>
--- 98,101 ----
***************
*** 115,124 ****
        </method>
     </method-permission>
       </XDtEjbIntf:forAllInterfaceViewTypes>
      </XDtEjbIntf:ifIsInterfaceMethod>
!    </XDtMethod:ifHasMethodTag>
    </XDtMethod:forAllMethods>
  
     <!-- finder permissions -->
    <XDtClass:forAllClassTags tagName="ejb:finder">
     <XDtClass:ifHasClassTag tagName="ejb:finder" paramName="role-name">
--- 120,132 ----
        </method>
     </method-permission>
+       </XDtEjbIntf:ifCurrentMethodViewTypeEquals>
       </XDtEjbIntf:forAllInterfaceViewTypes>
      </XDtEjbIntf:ifIsInterfaceMethod>
!    </XDtMethod:forAllMethodTags>
    </XDtMethod:forAllMethods>
  
+   <XDtClass:ifHasClassTag tagName="ejb:finder" paramName="role-name">
     <!-- finder permissions -->
+   </XDtClass:ifHasClassTag>
    <XDtClass:forAllClassTags tagName="ejb:finder">
     <XDtClass:ifHasClassTag tagName="ejb:finder" paramName="role-name">
***************
*** 322,325 ****
--- 330,335 ----
   
    <XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
+ 
+    <!-- exclude list -->
      <XDtMerge:merge file="ejb-exclude-list.xml">
       <!--



-------------------------------------------------------
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
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to