User: rinkrank
Date: 02/03/24 14:35:51
Modified: core/resources/xdoclet/ejb/vendor jbosscmp-jdbc_xml.j
weblogic-cmp-rdbms-jar-xml.j
Log:
Fixed some bugs in relations. At least on WLS it now supports all combinations of
cardinality and directionality. I'm afraid this has broken JBoss support for CMP, but
wasn't it broken anyway?
Revision Changes Path
1.17 +1 -1 xdoclet/core/resources/xdoclet/ejb/vendor/jbosscmp-jdbc_xml.j
Index: jbosscmp-jdbc_xml.j
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/vendor/jbosscmp-jdbc_xml.j,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- jbosscmp-jdbc_xml.j 12 Mar 2002 09:30:32 -0000 1.16
+++ jbosscmp-jdbc_xml.j 24 Mar 2002 22:35:51 -0000 1.17
@@ -155,7 +155,7 @@
<relationships>
<XDtEjbRel:forAllRelationships>
<ejb-relation>
- <ejb-relation-name><XDtMethod:methodTagValue tagName="ejb:relation"
paramName="name"/></ejb-relation-name>
+ <ejb-relation-name><XDtEjbRel:relationName/></ejb-relation-name>
<XDtEjbRel:ifIsMany2Many>
<relation-table-mapping>
<XDtMethod:ifHasMethodTag tagName="jboss:relation-table"
paramName="table-name">
1.17 +9 -22
xdoclet/core/resources/xdoclet/ejb/vendor/weblogic-cmp-rdbms-jar-xml.j
Index: weblogic-cmp-rdbms-jar-xml.j
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/resources/xdoclet/ejb/vendor/weblogic-cmp-rdbms-jar-xml.j,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- weblogic-cmp-rdbms-jar-xml.j 24 Mar 2002 17:44:19 -0000 1.16
+++ weblogic-cmp-rdbms-jar-xml.j 24 Mar 2002 22:35:51 -0000 1.17
@@ -42,11 +42,11 @@
<XDtClass:forAllClassTags tagName="ejb:finder">
<weblogic-query>
<query-method>
- <method-name><XDtClass:classTagValue tagName="ejb:finder"
paramName="signature" tokenNumber="1" delimiter=" ("/></method-name>
+ <method-name><XDtClass:classTagValue tagName="ejb:finder"
paramName="signature" delimiter=" (" tokenNumber="1"/></method-name>
<method-params>
- <XDtClass:forAllClassTagTokens tagName="ejb:finder"
paramName="signature" delimiter="( ,)" skip="2">
-
<method-param><XDtClass:currentToken/></method-param><XDtClass:skipToken/>
- </XDtClass:forAllClassTagTokens>
+ <XDtParameter:forAllParameterTypes paramName="signature">
+ <method-param><XDtParameter:currentToken/></method-param>
+ </XDtParameter:forAllParameterTypes>
</method-params>
</query-method>
<XDtClass:ifHasClassTag tagName="ejb:finder" paramName="query">
@@ -82,7 +82,10 @@
<table-name><XDtWlEjbRel:joinTableName/></table-name>
</XDtEjbRel:ifIsMany2Many>
<weblogic-relationship-role>
- <relationship-role-name><XDtEjbRel:leftRoleName/></relationship-role-name>
+<XDtComment:comment>
+In case of an 1:1 relationship we want to make sure the fk side is to the right
+</XDtComment:comment><XDtWlEjbRel:ensureColumnMapTagsRight/>
+
<relationship-role-name><XDtEjbRel:rightRoleName/></relationship-role-name>
<XDtWlEjbRel:ifHasRightGroupName>
<group-name><XDtWlEjbRel:rightGroupName/></group-name>
</XDtWlEjbRel:ifHasRightGroupName>
@@ -94,29 +97,13 @@
</XDtWlEjbRel:ifHasKeyColumn>
</column-map>
</XDtWlEjbRel:forAllLeftColumnMaps>
- <XDtWlEjbRel:forAllRightColumnMaps>
- <column-map>
- <foreign-key-column><XDtWlEjbRel:foreignKeyColumn/></foreign-key-column>
- <XDtWlEjbRel:ifHasKeyColumn>
- <key-column><XDtWlEjbRel:keyColumn/></key-column>
- </XDtWlEjbRel:ifHasKeyColumn>
- </column-map>
- </XDtWlEjbRel:forAllRightColumnMaps>
</weblogic-relationship-role>
<XDtEjbRel:ifIsMany2Many>
<weblogic-relationship-role>
- <relationship-role-name><XDtEjbRel:leftRoleName/></relationship-role-name>
+
<relationship-role-name><XDtEjbRel:lefttRoleName/></relationship-role-name>
<XDtWlEjbRel:ifHasLeftGroupName>
<group-name><XDtWlEjbRel:leftGroupName/></group-name>
</XDtWlEjbRel:ifHasLeftGroupName>
- <XDtWlEjbRel:forAllLeftColumnMaps>
- <column-map>
- <foreign-key-column><XDtWlEjbRel:foreignKeyColumn/></foreign-key-column>
- <XDtWlEjbRel:ifHasKeyColumn>
- <key-column><XDtWlEjbRel:keyColumn/></key-column>
- </XDtWlEjbRel:ifHasKeyColumn>
- </column-map>
- </XDtWlEjbRel:forAllLeftColumnMaps>
<XDtWlEjbRel:forAllRightColumnMaps>
<column-map>
<foreign-key-column><XDtWlEjbRel:foreignKeyColumn/></foreign-key-column>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
