User: rinkrank
Date: 02/03/24 09:44:13
Modified: core/resources/xdoclet/ejb asm-descriptor.j ejb-body.j
Messages.properties relationships.j
Log:
Merging changes from XJAVADOC_REFACTORING branch back to main branch
Revision Changes Path
1.28 +10 -4 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.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- asm-descriptor.j 14 Mar 2002 20:52:14 -0000 1.27
+++ asm-descriptor.j 24 Mar 2002 17:44:12 -0000 1.28
@@ -94,9 +94,12 @@
<role-name><XDtClass:currentToken/></role-name>
</XDtClass:forAllClassTagTokens>
<method <XDtId:prefixedId prefix="MethodElement"/>>
- <XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
+ <XDtType:ifIsOfType type="javax.ejb.SessionBean">
<ejb-name><XDtEjb:ejbName/></ejb-name>
- </XDtClass:ifHasClassTag>
+ </XDtType:ifIsOfType>
+ <XDtType:ifIsOfType type="javax.ejb.EntityBean">
+ <ejb-name><XDtEjb:ejbName/></ejb-name>
+ </XDtType:ifIsOfType>
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="method-intf">
<method-intf><XDtClass:classTagValue tagName="ejb:finder"
paramName="method-intf" values="Home,LocalHome"/></method-intf>
</XDtClass:ifHasClassTag>
@@ -116,9 +119,12 @@
<description><XDtI18n:getString bundle="xdoclet.ejb.Messages"
resource="description_not_supported"/></description>
<unchecked/>
<method <XDtId:prefixedId prefix="MethodElement"/>>
- <XDtClass:ifHasClassTag tagName="ejb:bean" paramName="name">
+ <XDtType:ifIsOfType type="javax.ejb.SessionBean">
<ejb-name><XDtEjb:ejbName/></ejb-name>
- </XDtClass:ifHasClassTag>
+ </XDtType:ifIsOfType>
+ <XDtType:ifIsOfType type="javax.ejb.EntityBean">
+ <ejb-name><XDtEjb:ejbName/></ejb-name>
+ </XDtType:ifIsOfType>
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="method-intf">
<method-intf><XDtClass:classTagValue tagName="ejb:finder"
paramName="method-intf" values="Home,LocalHome"/></method-intf>
</XDtClass:ifHasClassTag>
1.46 +5 -0 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.45
retrieving revision 1.46
diff -u -w -r1.45 -r1.46
--- ejb-body.j 17 Mar 2002 10:01:11 -0000 1.45
+++ ejb-body.j 24 Mar 2002 17:44:12 -0000 1.46
@@ -56,7 +56,12 @@
<XDtClass:ifDoesntHaveClassTag tagName="ejb:bean" paramName="type">
<persistence-type>Container</persistence-type>
</XDtClass:ifDoesntHaveClassTag>
+ <XDtEjbPk:ifDoesntHavePrimkeyField>
<prim-key-class><XDtEjbPk:pkClass/></prim-key-class>
+ </XDtEjbPk:ifDoesntHavePrimkeyField>
+ <XDtEjbPk:ifHasPrimkeyField>
+ <prim-key-class>todo</prim-key-class>
+ </XDtEjbPk:ifHasPrimkeyField>
<reentrant><XDtEjbEntity:reentrant/></reentrant>
<XDtConfig:ifConfigParamGreaterOrEquals paramName="EjbSpec" value="2.0">
<XDtEjbCmp:ifEntityIsCmp>
1.7 +2 -1 xdoclet/core/resources/xdoclet/ejb/Messages.properties
Index: Messages.properties
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/Messages.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- Messages.properties 4 Mar 2002 01:36:53 -0000 1.6
+++ Messages.properties 24 Mar 2002 17:44:12 -0000 1.7
@@ -52,3 +52,4 @@
class_not_abstract=Class ''{0}'' should be defined abstract if you want the ''{1}''
sub-task to generate the subclass properly.
method_only_takes_remote_or_local={0} can only take type=remote|local - received
type={1}
ask_for_bean_from_null_interface=You asked the bean class for a NULL interface name
\ No newline at end of file
+dataclass_not_found=Data class not found
\ No newline at end of file
1.25 +7 -36 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.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- relationships.j 7 Mar 2002 19:57:09 -0000 1.24
+++ relationships.j 24 Mar 2002 17:44:12 -0000 1.25
@@ -3,8 +3,7 @@
<XDtEjbRel:forAllRelationships>
<ejb-relation <XDtId:prefixedId prefix="EJBRelation"/>>
<ejb-relation-name><XDtEjbRel:relationName/></ejb-relation-name>
- <XDtEjbRel:ifIsUnidirectional>
- <!-- unidirectional -->
+
<ejb-relationship-role <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
<XDtEjbRel:ifHasLeftRoleName>
<ejb-relationship-role-name><XDtEjbRel:leftRoleName/></ejb-relationship-role-name>
@@ -16,13 +15,16 @@
<relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
<ejb-name><XDtEjbRel:leftEJBName/></ejb-name>
</relationship-role-source>
+ <XDtEjbRel:ifLeftNavigable>
<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>
+ </XDtEjbRel:ifLeftNavigable>
</ejb-relationship-role>
+
<ejb-relationship-role <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
<XDtEjbRel:ifHasRightRoleName>
<ejb-relationship-role-name><XDtEjbRel:rightRoleName/></ejb-relationship-role-name>
@@ -34,47 +36,16 @@
<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 <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
- <XDtEjbRel:ifHasLeftRoleName>
-
<ejb-relationship-role-name><XDtEjbRel:leftRoleName/></ejb-relationship-role-name>
- </XDtEjbRel:ifHasLeftRoleName>
- <multiplicity><XDtEjbRel:rightMultiplicity/></multiplicity>
- <XDtEjbRel:ifLeftCascadeDelete>
- <cascade-delete/>
- </XDtEjbRel:ifLeftCascadeDelete>
- <relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
- <ejb-name><XDtEjbRel:leftEJBName/></ejb-name>
- </relationship-role-source>
- <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 <XDtId:prefixedId prefix="EJBRelationshipRole"/>>
- <XDtEjbRel:ifHasRightRoleName>
-
<ejb-relationship-role-name><XDtEjbRel:rightRoleName/></ejb-relationship-role-name>
- </XDtEjbRel:ifHasRightRoleName>
- <multiplicity><XDtEjbRel:leftMultiplicity/></multiplicity>
- <XDtEjbRel:ifRightCascadeDelete>
- <cascade-delete/>
- </XDtEjbRel:ifRightCascadeDelete>
- <relationship-role-source <XDtId:prefixedId prefix="RoleSource"/>>
- <ejb-name><XDtEjbRel:rightEJBName/></ejb-name>
- </relationship-role-source>
+ <XDtEjbRel:ifRightNavigable>
<cmr-field <XDtId:prefixedId prefix="CMRField"/>>
<cmr-field-name><XDtEjbRel:rightFieldName/></cmr-field-name>
<XDtEjbRel:ifIsRightMany>
<cmr-field-type><XDtEjbRel:rightFieldType/></cmr-field-type>
</XDtEjbRel:ifIsRightMany>
</cmr-field>
+ </XDtEjbRel:ifRightNavigable>
</ejb-relationship-role>
- </XDtEjbRel:ifIsBidirectional>
+
</ejb-relation>
</XDtEjbRel:forAllRelationships>
</relationships>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
