User: ara_e_w
Date: 02/03/07 11:57:10
Modified: core/resources/xdoclet/ejb asm-descriptor.j ejb-body.j
ejb-jar_xml.j relationships.j
Log:
- much better id management and generation for xml elements, XDtId:prefixedId
introduced
- a useIds parameter is introduced for XmlSubTask so all xml subtasks have the
ability to enable/disable id="IDPrefix_i" (by default off, enable it for websphere)
Revision Changes Path
1.26 +21 -21 xdoclet/core/resources/xdoclet/ejb/asm-descriptor.j
Index: asm-descriptor.j
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/asm-descriptor.j,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- asm-descriptor.j 5 Feb 2002 23:42:10 -0000 1.25
+++ asm-descriptor.j 7 Mar 2002 19:57:09 -0000 1.26
@@ -1,5 +1,5 @@
- <assembly-descriptor>
+ <assembly-descriptor <XDtId:prefixedId prefix="AssemblyDescriptor"/>>
<XDtMerge:merge file="ejb-security-roles.xml">
<XDtEjbSec:forAllSecurityRoles>
<security-role>
@@ -12,7 +12,7 @@
<XDtEjb:forAllBeans>
<XDtEjb:ifIsAConcreteEJBean>
<XDtClass:ifHasClassTag tagName="ejb:permission">
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="description_not_supported"/></description>
<XDtClass:forAllClassTags tagName="ejb:permission">
<XDtClass:ifHasClassTag tagName="ejb:permission" paramName="role-name">
@@ -28,7 +28,7 @@
</XDtClass:ifHasClassTag>
</XDtClass:ifDoesntHaveClassTag>
</XDtClass:forAllClassTags>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="description_not_supported"/></description>
<XDtType:ifIsOfType type="javax.ejb.SessionBean">
<ejb-name><XDtEjb:ejbName/></ejb-name>
@@ -45,7 +45,7 @@
<XDtMethod:ifHasMethodTag tagName="ejb:permission">
<XDtEjbIntf:ifIsInterfaceMethod>
<XDtEjbIntf:forAllInterfaceViewTypes>
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="description_not_supported"/></description>
<XDtMethod:forAllMethodTags tagName="ejb:permission">
<XDtMethod:ifHasMethodTag tagName="ejb:permission" paramName="role-name">
@@ -61,7 +61,7 @@
</XDtMethod:ifHasMethodTag>
</XDtMethod:ifDoesntHaveMethodTag>
</XDtMethod:forAllMethodTags>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<description><![CDATA[<XDtMethod:firstSentenceDescriptionOfCurrentMethod/>]]></description>
<XDtType:ifIsOfType type="javax.ejb.SessionBean">
<ejb-name><XDtEjb:ejbName/></ejb-name>
@@ -88,12 +88,12 @@
<!-- finder permissions -->
<XDtClass:forAllClassTags tagName="ejb:finder">
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="role-name">
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="description_not_supported"/></description>
<XDtClass:forAllClassTagTokens tagName="ejb:finder" paramName="role-name"
delimiter=",">
<role-name><XDtClass:currentToken/></role-name>
</XDtClass:forAllClassTagTokens>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
<ejb-name><XDtEjb:ejbName/></ejb-name>
</XDtClass:ifHasClassTag>
@@ -112,10 +112,10 @@
<XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="unchecked">
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="description_not_supported"/></description>
<unchecked/>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
<ejb-name><XDtEjb:ejbName/></ejb-name>
</XDtClass:ifHasClassTag>
@@ -135,12 +135,12 @@
</XDtClass:forAllClassTags>
<XDtClass:ifHasClassTag tagName="ejb:pk" paramName="role-name">
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="dd_findbypk_perm"/></description>
<XDtClass:forAllClassTagTokens tagName="ejb:pk" paramName="role-name"
delimiter=",">
<role-name><XDtClass:currentToken/></role-name>
</XDtClass:forAllClassTagTokens>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
<ejb-name><XDtEjb:ejbName/></ejb-name>
</XDtClass:ifHasClassTag>
@@ -154,10 +154,10 @@
<XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
<XDtClass:ifHasClassTag tagName="ejb:pk" paramName="unchecked">
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="dd_findbypk_perm"/></description>
<unchecked/>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
<ejb-name><XDtEjb:ejbName/></ejb-name>
</XDtClass:ifHasClassTag>
@@ -171,10 +171,10 @@
</XDtConfig:ifConfigParamGreaterOrEquals>
<XDtConfig:ifConfigParamNotGreaterOrEquals paramName="EjbSpec" value="2.0">
<XDtClass:ifHasClassTag tagName="ejb:pk" paramName="unchecked">
- <method-permission>
+ <method-permission <XDtId:prefixedId prefix="MethodPermission"/>>
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="dd_findbypk_perm"/></description>
<unchecked/>
- <method>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
<ejb-name><XDtEjb:ejbName/></ejb-name>
</XDtClass:ifHasClassTag>
@@ -193,8 +193,8 @@
<XDtEjb:forAllBeans>
<XDtEjb:ifIsAConcreteEJBean>
<XDtClass:ifHasClassTag tagName="ejb:transaction">
- <container-transaction>
- <method>
+ <container-transaction <XDtId:prefixedId prefix="MethodTransaction"/>>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<ejb-name><XDtEjb:ejbName/></ejb-name>
<method-name>*</method-name>
</method>
@@ -205,8 +205,8 @@
<XDtMethod:ifHasMethodTag tagName="ejb:transaction">
<XDtEjbIntf:ifIsInterfaceMethod>
<XDtEjbIntf:forAllInterfaceViewTypes>
- <container-transaction>
- <method>
+ <container-transaction <XDtId:prefixedId prefix="MethodTransaction"/>>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<ejb-name><XDtEjb:ejbName/></ejb-name>
<method-intf><XDtEjbIntf:methodIntf/></method-intf>
<method-name><XDtEjbIntf:interfaceMethodName/></method-name>
@@ -230,8 +230,8 @@
<XDtEjb:ifIsAConcreteEJBean>
<XDtClass:forAllClassTags tagName="ejb:finder">
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="transaction-type">
- <container-transaction>
- <method>
+ <container-transaction <XDtId:prefixedId prefix="MethodTransaction"/>>
+ <method <XDtId:prefixedId prefix="MethodElement"/>>
<ejb-name><XDtEjb:ejbName/></ejb-name>
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="method-intf">
<method-intf><XDtClass:classTagValue tagName="ejb:finder"
paramName="method-intf" values="Home,LocalHome"/ default="Home"></method-intf>
1.43 +9 -9 xdoclet/core/resources/xdoclet/ejb/ejb-body.j
Index: ejb-body.j
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/ejb-body.j,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -w -r1.42 -r1.43
--- ejb-body.j 1 Mar 2002 06:14:28 -0000 1.42
+++ ejb-body.j 7 Mar 2002 19:57:09 -0000 1.43
@@ -63,7 +63,7 @@
<cmp-version><XDtClass:classTagValue tagName="ejb:bean"
paramName="cmp-version" values="1.x,2.x" default="2.x" /></cmp-version>
<abstract-schema-name><XDtClass:classTagValue tagName="ejb:bean"
paramName="schema" default="<XDtEjb:ejbName/>"/></abstract-schema-name>
<XDtEjbBmp:ifUseSoftLocking>
- <cmp-field>
+ <cmp-field <XDtId:prefixedId prefix="CMPAttribute"/>>
<description>Version number for soft locking</description>
<field-name>version</field-name>
</cmp-field>
@@ -71,7 +71,7 @@
</XDtEjbCmp:ifEntityIsCmp>
</XDtConfig:ifConfigParamGreaterOrEquals>
<XDtEjbCmp:forAllCmpFields>
- <cmp-field>
+ <cmp-field <XDtId:prefixedId prefix="CMPAttribute"/>>
<description><![CDATA[<XDtMethod:firstSentenceDescriptionOfCurrentMethod/>]]></description>
<field-name><XDtMethod:propertyName/></field-name>
</cmp-field>
@@ -117,7 +117,7 @@
<XDtMerge:merge file="ejb-ejbrefs-{0}.xml">
<XDtEjbRef:forAllEjbRefs>
<XDtClass:ifDoesntHaveClassTag tagName="ejb:ejb-ref" paramName="view-type">
- <ejb-ref>
+ <ejb-ref <XDtId:prefixedId prefix="EJBRef"/>>
<ejb-ref-name><XDtEjb:ejbRefName/></ejb-ref-name>
<ejb-ref-type><XDtEjb:beanType/></ejb-ref-type>
<home><XDtEjbHome:homeInterface type="remote"/></home>
@@ -127,7 +127,7 @@
</XDtClass:ifDoesntHaveClassTag>
<XDtClass:ifHasClassTag tagName="ejb:ejb-ref" paramName="view-type">
<XDtClass:ifClassTagValueEquals tagName="ejb:ejb-ref" paramName="view-type"
value="remote">
- <ejb-ref>
+ <ejb-ref <XDtId:prefixedId prefix="EJBRef"/>>
<ejb-ref-name><XDtEjb:ejbRefName/></ejb-ref-name>
<ejb-ref-type><XDtEjb:beanType/></ejb-ref-type>
<home><XDtEjbHome:homeInterface type="remote"/></home>
@@ -140,7 +140,7 @@
<XDtClass:forAllClassTags tagName="ejb:ejb-external-ref">
<XDtClass:ifDoesntHaveClassTag tagName="ejb:ejb-external-ref"
paramName="view-type">
- <ejb-ref>
+ <ejb-ref <XDtId:prefixedId prefix="EJBRef"/>>
<ejb-ref-name><XDtEjb:ejbExternalRefName/></ejb-ref-name>
<ejb-ref-type><XDtClass:classTagValue tagName="ejb:ejb-external-ref"
paramName="type" values="Entity,Session"/></ejb-ref-type>
<home><XDtClass:classTagValue tagName="ejb:ejb-external-ref"
paramName="home"/></home>
@@ -149,7 +149,7 @@
</XDtClass:ifDoesntHaveClassTag>
<XDtClass:ifHasClassTag tagName="ejb:ejb-external-ref" paramName="view-type">
<XDtClass:ifClassTagValueEquals tagName="ejb:ejb-external-ref"
paramName="view-type" value="remote">
- <ejb-ref>
+ <ejb-ref <XDtId:prefixedId prefix="EJBRef"/>>
<ejb-ref-name><XDtEjb:ejbExternalRefName/></ejb-ref-name>
<ejb-ref-type><XDtClass:classTagValue tagName="ejb:ejb-external-ref"
paramName="type" values="Entity,Session"/></ejb-ref-type>
<home><XDtClass:classTagValue tagName="ejb:ejb-external-ref"
paramName="home"/></home>
@@ -157,7 +157,7 @@
</ejb-ref>
</XDtClass:ifClassTagValueEquals>
<XDtClass:ifClassTagValueEquals tagName="ejb:ejb-external-ref"
paramName="view-type" value="local">
- <ejb-local-ref>
+ <ejb-local-ref <XDtId:prefixedId prefix="EJBLocalRef"/>>
<ejb-ref-name><XDtEjb:ejbExternalRefName/></ejb-ref-name>
<ejb-ref-type><XDtClass:classTagValue tagName="ejb:ejb-external-ref"
paramName="type" values="Entity,Session"/></ejb-ref-type>
<local-home><XDtClass:classTagValue tagName="ejb:ejb-external-ref"
paramName="home"/></local-home>
@@ -173,7 +173,7 @@
<XDtEjbRef:forAllEjbRefs>
<XDtClass:ifHasClassTag tagName="ejb:ejb-ref" paramName="view-type">
<XDtClass:ifClassTagValueEquals tagName="ejb:ejb-ref" paramName="view-type"
value="local">
- <ejb-local-ref>
+ <ejb-local-ref <XDtId:prefixedId prefix="EJBLocalRef"/>>
<ejb-ref-name><XDtEjb:ejbRefName/></ejb-ref-name>
<ejb-ref-type><XDtEjb:beanType/></ejb-ref-type>
<local-home><XDtEjbHome:homeInterface type="local"/></local-home>
@@ -201,7 +201,7 @@
<description><XDtClass:classTagValue tagName="ejb:security-identity"
paramName="description"/></description>
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="ejb:security-identity"
paramName="use-caller-identity">
- <use-caller-identity><XDtClass:classTagValue
tagName="ejb:security-identity" paramName="use-caller-identity"/></use-caller-identity>
+ <use-caller-identity <XDtId:prefixedId
prefix="UseCallerIdentity"/>><XDtClass:classTagValue tagName="ejb:security-identity"
paramName="use-caller-identity"/></use-caller-identity>
</XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="ejb:security-identity"
paramName="run-as">
<run-as>
1.17 +9 -4 xdoclet/core/resources/xdoclet/ejb/ejb-jar_xml.j
Index: ejb-jar_xml.j
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/ejb-jar_xml.j,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- ejb-jar_xml.j 8 Feb 2002 23:28:15 -0000 1.16
+++ ejb-jar_xml.j 7 Mar 2002 19:57:09 -0000 1.17
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="<XDtConfig:configParameterValue
paramName='Xmlencoding'/>"?>
<!DOCTYPE ejb-jar PUBLIC "<XDtXml:publicId/>" "<XDtXml:systemId/>">
-<ejb-jar>
+<ejb-jar <XDtId:prefixedId prefix="ejb-jar"/>>
<XDtConfig:ifConfigParamNotEquals paramName="Description" value="">
<description><XDtConfig:configParameterValue
paramName="Description"/></description>
@@ -21,7 +21,7 @@
<!-- Session Beans -->
<XDtClass:forAllClasses type="javax.ejb.SessionBean">
<XDtEjb:ifIsAConcreteEJBean>
- <session id="<XDtEjb:id/>">
+ <session <XDtId:prefixedId prefix="Session"/>>
<XDtMerge:merge file="xdoclet/ejb/ejb-body.j">
</XDtMerge:merge>
</session>
@@ -40,7 +40,12 @@
<!-- Entity Beans -->
<XDtClass:forAllClasses type="javax.ejb.EntityBean">
<XDtEjb:ifIsAConcreteEJBean>
- <entity id="<XDtEjb:id/>">
+ <XDtEjbCmp:ifEntityIsCmp>
+ <entity <XDtId:prefixedId prefix="ContainerManagedEntity"/>>
+ </XDtEjbCmp:ifEntityIsCmp>
+ <XDtEjbBmp:ifEntityIsBmp>
+ <entity <XDtId:prefixedId prefix="BeanManagedEntity"/>>
+ </XDtEjbBmp:ifEntityIsBmp>
<XDtMerge:merge file="xdoclet/ejb/ejb-body.j">
</XDtMerge:merge>
</entity>
@@ -60,7 +65,7 @@
<!-- Message Driven Beans -->
<XDtClass:forAllClasses type="javax.ejb.MessageDrivenBean">
<XDtEjb:ifIsAConcreteEJBean>
- <message-driven id="<XDtEjb:id/>">
+ <message-driven <XDtId:prefixedId prefix="MessageDriven"/>>
<XDtMerge:merge file="xdoclet/ejb/ejb-body.j">
</XDtMerge:merge>
</message-driven>
1.24 +13 -13 xdoclet/core/resources/xdoclet/ejb/relationships.j
Index: relationships.j
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/relationships.j,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- relationships.j 7 Feb 2002 00:55:19 -0000 1.23
+++ relationships.j 7 Mar 2002 19:57:09 -0000 1.24
@@ -1,11 +1,11 @@
<XDtEjbRel:ifHasRelationships>
- <relationships>
+ <relationships <XDtId:prefixedId prefix="Relationships"/>>
<XDtEjbRel:forAllRelationships>
- <ejb-relation>
+ <ejb-relation <XDtId:prefixedId prefix="EJBRelation"/>>
<ejb-relation-name><XDtEjbRel:relationName/></ejb-relation-name>
<XDtEjbRel:ifIsUnidirectional>
<!-- unidirectional -->
- <ejb-relationship-role>
+ <ejb-relationship-role <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
<XDtEjbRel:ifHasLeftRoleName>
<ejb-relationship-role-name><XDtEjbRel:leftRoleName/></ejb-relationship-role-name>
</XDtEjbRel:ifHasLeftRoleName>
@@ -13,17 +13,17 @@
<XDtEjbRel:ifLeftCascadeDelete>
<cascade-delete/>
</XDtEjbRel:ifLeftCascadeDelete>
- <relationship-role-source>
+ <relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
<ejb-name><XDtEjbRel:leftEJBName/></ejb-name>
</relationship-role-source>
- <cmr-field>
+ <cmr-field <XDtId:prefixedId prefix="CMRField"/>>
<cmr-field-name><XDtEjbRel:leftFieldName/></cmr-field-name>
<XDtEjbRel:ifIsLeftMany>
<cmr-field-type><XDtEjbRel:leftFieldType/></cmr-field-type>
</XDtEjbRel:ifIsLeftMany>
</cmr-field>
</ejb-relationship-role>
- <ejb-relationship-role>
+ <ejb-relationship-role <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
<XDtEjbRel:ifHasRightRoleName>
<ejb-relationship-role-name><XDtEjbRel:rightRoleName/></ejb-relationship-role-name>
</XDtEjbRel:ifHasRightRoleName>
@@ -31,14 +31,14 @@
<XDtEjbRel:ifRightCascadeDelete>
<cascade-delete/>
</XDtEjbRel:ifRightCascadeDelete>
- <relationship-role-source>
+ <relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
<ejb-name><XDtEjbRel:rightEJBName/></ejb-name>
</relationship-role-source>
</ejb-relationship-role>
</XDtEjbRel:ifIsUnidirectional>
<XDtEjbRel:ifIsBidirectional>
<!-- bidirectional -->
- <ejb-relationship-role>
+ <ejb-relationship-role <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
<XDtEjbRel:ifHasLeftRoleName>
<ejb-relationship-role-name><XDtEjbRel:leftRoleName/></ejb-relationship-role-name>
</XDtEjbRel:ifHasLeftRoleName>
@@ -46,17 +46,17 @@
<XDtEjbRel:ifLeftCascadeDelete>
<cascade-delete/>
</XDtEjbRel:ifLeftCascadeDelete>
- <relationship-role-source>
+ <relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
<ejb-name><XDtEjbRel:leftEJBName/></ejb-name>
</relationship-role-source>
- <cmr-field>
+ <cmr-field <XDtId:prefixedId prefix="CMRField"/>>
<cmr-field-name><XDtEjbRel:leftFieldName/></cmr-field-name>
<XDtEjbRel:ifIsLeftMany>
<cmr-field-type><XDtMethod:methodType/></cmr-field-type>
</XDtEjbRel:ifIsLeftMany>
</cmr-field>
</ejb-relationship-role>
- <ejb-relationship-role>
+ <ejb-relationship-role <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
<XDtEjbRel:ifHasRightRoleName>
<ejb-relationship-role-name><XDtEjbRel:rightRoleName/></ejb-relationship-role-name>
</XDtEjbRel:ifHasRightRoleName>
@@ -64,10 +64,10 @@
<XDtEjbRel:ifRightCascadeDelete>
<cascade-delete/>
</XDtEjbRel:ifRightCascadeDelete>
- <relationship-role-source>
+ <relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
<ejb-name><XDtEjbRel:rightEJBName/></ejb-name>
</relationship-role-source>
- <cmr-field>
+ <cmr-field <XDtId:prefixedId prefix="CMRField"/>>
<cmr-field-name><XDtEjbRel:rightFieldName/></cmr-field-name>
<XDtEjbRel:ifIsRightMany>
<cmr-field-type><XDtEjbRel:rightFieldType/></cmr-field-type>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
