User: vharcq
Date: 02/04/17 16:02:30
Modified: core/test/xml-ref/Transaction ejb-jar.xml
Log:
Important patch!
I split currentTag in one for class tag and one for method tag
I check if it is set in getTagValue (the biggest method around)
This is to solve in once problems like having
@ejb:permission role-name="a,b" on class and/or method
or having
* @ejb.finder
* signature="Collection findByCode(String code)"
* query="SELECT OBJECT(p) FROM LANGUAGE as p WHERE p.id = ?1"
* @ejb.finder
* signature "Collection findByCode(java.lang.String a, java.lang.String b)"
* query="SELECT OBJECT(p) FROM LANGUAGE as p WHERE p.id = ?1 AND p.id = ?2"
Plus all tags that merge forAllClass and forAllMethod
Plus all tags that have in a forAllMethod on a tag/param a lookup on another
(tag)/(param)
It passes samples and unit tests
Revision Changes Path
1.2 +111 -46 xdoclet/core/test/xml-ref/Transaction/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/test/xml-ref/Transaction/ejb-jar.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ejb-jar.xml 14 Mar 2002 18:32:26 -0000 1.1
+++ ejb-jar.xml 17 Apr 2002 23:02:30 -0000 1.2
@@ -8,8 +8,17 @@
<enterprise-beans>
+ <!-- Session Beans -->
+
+ <!--
+ To add session beans that you have deployment descriptor info for, add
+ a file to your merge directory called session-beans.xml that contains
+ the <session></session> markup for those beans.
+ -->
+
+ <!-- Entity Beans -->
<entity id="ContainerManagedEntity_1">
- <description><![CDATA[No Description.]]></description>
+ <description><![CDATA[]]></description>
<ejb-name>ejbtrans/Transaction</ejb-name>
@@ -35,10 +44,29 @@
</entity>
+ <!--
+ To add entity beans that you have deployment descriptor info for, add
+ a file to your merge directory called entity-beans.xml that contains
+ the <entity></entity> markup for those beans.
+ -->
+
+ <!-- Message Driven Beans -->
+ <!--
+ To add message driven beans that you have deployment descriptor info for, add
+ a file to your merge directory called message-driven-beans.xml that contains
+ the <message-driven></message-driven> markup for those beans.
+ -->
+
</enterprise-beans>
+ <!-- Relationships -->
+
+ <!-- Assembly Descriptor -->
<assembly-descriptor id="AssemblyDescriptor_1">
+ <!-- finder permissions -->
+
+ <!-- transactions -->
<container-transaction id="MethodTransaction_1">
<method id="MethodElement_1">
<ejb-name>ejbtrans/Transaction</ejb-name>
@@ -54,7 +82,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -67,7 +95,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -78,7 +106,7 @@
<method-intf>LocalHome</method-intf>
<method-name>createBothMethodSupports</method-name>
<method-params>
- <method-param>java.lang.Object[][]</method-param>
+ <method-param>java.lang.Object</method-param>
</method-params>
</method>
<trans-attribute>Supports</trans-attribute>
@@ -89,7 +117,7 @@
<method-intf>Home</method-intf>
<method-name>createBothMethodSupports</method-name>
<method-params>
- <method-param>java.lang.Object[][]</method-param>
+ <method-param>java.lang.Object</method-param>
</method-params>
</method>
<trans-attribute>Supports</trans-attribute>
@@ -100,12 +128,22 @@
<method-intf>LocalHome</method-intf>
<method-name>createLocalMethodSupports</method-name>
<method-params>
- <method-param>java.lang.Object[][]</method-param>
+ <method-param>java.lang.Object</method-param>
+ </method-params>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ <container-transaction id="MethodTransaction_7">
+ <method id="MethodElement_7">
+ <ejb-name>ejbtrans/Transaction</ejb-name>
+ <method-intf>Home</method-intf>
+ <method-name>createLocalMethodSupports</method-name>
+ <method-params>
+ <method-param>java.lang.Object</method-param>
</method-params>
</method>
<trans-attribute>Supports</trans-attribute>
</container-transaction>
-
<container-transaction id="MethodTransaction_8">
<method id="MethodElement_8">
<ejb-name>ejbtrans/Transaction</ejb-name>
@@ -154,7 +192,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -167,7 +205,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -240,7 +278,7 @@
<method-intf>LocalHome</method-intf>
<method-name>createMethodSupports</method-name>
<method-params>
- <method-param>java.lang.Object[][]</method-param>
+ <method-param>java.lang.Object</method-param>
</method-params>
</method>
<trans-attribute>Supports</trans-attribute>
@@ -251,7 +289,7 @@
<method-intf>Home</method-intf>
<method-name>createMethodSupports</method-name>
<method-params>
- <method-param>java.lang.Object[][]</method-param>
+ <method-param>java.lang.Object</method-param>
</method-params>
</method>
<trans-attribute>Supports</trans-attribute>
@@ -292,7 +330,18 @@
</method>
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
-
+ <container-transaction id="MethodTransaction_25">
+ <method id="MethodElement_25">
+ <ejb-name>ejbtrans/Transaction</ejb-name>
+ <method-intf>Home</method-intf>
+ <method-name>localMethodNotSupported</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>int</method-param>
+ </method-params>
+ </method>
+ <trans-attribute>NotSupported</trans-attribute>
+ </container-transaction>
<container-transaction id="MethodTransaction_26">
<method id="MethodElement_26">
<ejb-name>ejbtrans/Transaction</ejb-name>
@@ -341,7 +390,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -354,7 +403,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -529,7 +578,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -542,7 +591,7 @@
<method-params>
<method-param>java.lang.String</method-param>
<method-param>int</method-param>
- <method-param>byte[]</method-param>
+ <method-param>byte</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -626,136 +675,152 @@
<container-transaction id="MethodTransaction_56">
<method id="MethodElement_56">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByNotSupported</method-name>
+ <method-name>java.util.Collection findByNotSupported()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>NotSupported</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_57">
<method id="MethodElement_57">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findBySupports</method-name>
+ <method-name>java.util.Collection findBySupports()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_58">
<method id="MethodElement_58">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByRequired</method-name>
+ <method-name>java.util.Collection findByRequired()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Required</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_59">
<method id="MethodElement_59">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByRequiresNew</method-name>
+ <method-name>java.util.Collection findByRequiresNew()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>RequiresNew</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_60">
<method id="MethodElement_60">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByMandatory</method-name>
+ <method-name>java.util.Collection findByMandatory()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Mandatory</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_61">
<method id="MethodElement_61">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByNever</method-name>
+ <method-name>java.util.Collection findByNever()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Never</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_62">
<method id="MethodElement_62">
<ejb-name>ejbtrans/Transaction</ejb-name>
<method-intf>LocalHome</method-intf>
- <method-name>findByLocalNotSupported</method-name>
+ <method-name>java.util.Collection findByLocalNotSupported()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>NotSupported</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_63">
<method id="MethodElement_63">
<ejb-name>ejbtrans/Transaction</ejb-name>
<method-intf>Home</method-intf>
- <method-name>findByHomeSupports</method-name>
+ <method-name>java.util.Collection findByHomeSupports()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute></trans-attribute>
+ </container-transaction>
+ <container-transaction id="MethodTransaction_64">
+ <method id="MethodElement_64">
+ <ejb-name>ejbtrans/Transaction</ejb-name>
+ <method-name>java.util.Collection findByLocalNotSupported()</method-name>
+ <method-params>
+ </method-params>
+ </method>
+ <trans-attribute></trans-attribute>
</container-transaction>
-
<container-transaction id="MethodTransaction_65">
<method id="MethodElement_65">
<ejb-name>ejbtrans/Transaction</ejb-name>
<method-intf>LocalHome</method-intf>
- <method-name>findByLocalLocalNotSupported</method-name>
+ <method-name>java.util.Collection
findByLocalLocalNotSupported()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>NotSupported</trans-attribute>
+ <trans-attribute></trans-attribute>
+ </container-transaction>
+ <container-transaction id="MethodTransaction_66">
+ <method id="MethodElement_66">
+ <ejb-name>ejbtrans/Transaction</ejb-name>
+ <method-name>java.util.Collection findByRemoteNotSupported()</method-name>
+ <method-params>
+ </method-params>
+ </method>
+ <trans-attribute></trans-attribute>
</container-transaction>
-
<container-transaction id="MethodTransaction_67">
<method id="MethodElement_67">
<ejb-name>ejbtrans/Transaction</ejb-name>
<method-intf>Home</method-intf>
- <method-name>findByHomeRemoteBySupports</method-name>
+ <method-name>java.util.Collection
findByHomeRemoteBySupports()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_68">
<method id="MethodElement_68">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByBothNotSupported</method-name>
+ <method-name>java.util.Collection findByBothNotSupported()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>NotSupported</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_69">
<method id="MethodElement_69">
<ejb-name>ejbtrans/Transaction</ejb-name>
- <method-name>findByBothSupports</method-name>
+ <method-name>java.util.Collection findByBothSupports()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_70">
<method id="MethodElement_70">
<ejb-name>ejbtrans/Transaction</ejb-name>
<method-intf>LocalHome</method-intf>
- <method-name>findByBoth</method-name>
+ <method-name>java.util.Collection findByBoth()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>NotSupported</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
<container-transaction id="MethodTransaction_71">
<method id="MethodElement_71">
<ejb-name>ejbtrans/Transaction</ejb-name>
<method-intf>Home</method-intf>
- <method-name>findByBoth</method-name>
+ <method-name>java.util.Collection findByBoth()</method-name>
<method-params>
</method-params>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute></trans-attribute>
</container-transaction>
</assembly-descriptor>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
