Update of /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/dd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17381
Modified Files:
EjbDotXmlSubTask.java
Log Message:
Add new merge points, and adjust scope of existing ones for consistency.
Fixes XDT-801 and XDT-427.
Index: EjbDotXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/dd/EjbDotXmlSubTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** EjbDotXmlSubTask.java 7 Aug 2004 08:31:05 -0000 1.14
--- EjbDotXmlSubTask.java 15 Aug 2004 23:36:11 -0000 1.15
***************
*** 13,16 ****
--- 13,18 ----
/**
+ * Subtask for generating standard EJB deployment descriptor.
+ *
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
***************
*** 40,48 ****
* containing query elements for a bean, for additional finder and select
methods not defined in the bean class or
* its tags."
! * @xdoclet.merge-file file="assembly-descriptor.xml" relates-to="ejb-jar.xml"
description="An XML unparsed entity
! * containing "additional assembly descriptor info"."
* @xdoclet.merge-file file="ejb-security-roles.xml" relates-to="ejb-jar.xml"
description="An XML unparsed entity
! * containing security-role elements, to use instead of generating them from
role-name parameters on
! * ejb.permission, ejb.finder and ejb.pk tags."
* @xdoclet.merge-file file="relationships.xml" relates-to="ejb-jar.xml"
description="AN XML unparsed entity
* containing ejb-relationship elements to add additional relationships that
were not generated through Xdoclet."
--- 42,55 ----
* containing query elements for a bean, for additional finder and select
methods not defined in the bean class or
* its tags."
! * @xdoclet.merge-file file="assembly-descriptor.xml" relates-to="ejb-jar.xml"
description="An XML document containing
! * assembly-descriptor markup, to use instead of generating it."
* @xdoclet.merge-file file="ejb-security-roles.xml" relates-to="ejb-jar.xml"
description="An XML unparsed entity
! * containing any additional security-role elements not generated by XDoclet."
! * @xdoclet.merge-file file="ejb-method-permissions.ent" relates-to="ejb-jar.xml"
description="An XML unparsed entity
! * containing any additional method-permission elements not generated by
XDoclet."
! * @xdoclet.merge-file file="ejb-container-transactions.ent"
relates-to="ejb-jar.xml" description="An XML unparsed
! * entity containing any additional container-transaction elements not
generated by XDoclet."
! * @xdoclet.merge-file file="ejb-exclude-list.xml" relates-to="ejb-jar.xml"
description="An XML document containing
! * any exclude-list element. Only used with EJB 2.0+"
* @xdoclet.merge-file file="relationships.xml" relates-to="ejb-jar.xml"
description="AN XML unparsed entity
* containing ejb-relationship elements to add additional relationships that
were not generated through Xdoclet."
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
