dain 2004/10/14 21:49:09
Modified: modules/itests/src/ejb/META-INF openejb-jar.xml
Log:
Committed Gianny's massive patch:
http://jira.codehaus.org/browse/OPENEJB-13
This adds support for the following:
* CMP sql mapping
* CMR support
* Compound primary key
* Unknown primary key
There are still a few weirdisms...
* Full sql mapping is now required
* SQL is now compiled against physical schema names instead of logical schema names
Revision Changes Path
1.5 +107 -3 openejb/modules/itests/src/ejb/META-INF/openejb-jar.xml
Index: openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/src/ejb/META-INF/openejb-jar.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openejb-jar.xml 14 Oct 2004 07:07:17 -0000 1.4
+++ openejb-jar.xml 15 Oct 2004 01:49:09 -0000 1.5
@@ -157,6 +157,19 @@
<entity>
<ejb-name>BasicCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp2/BasicCmpHome</jndi-name>
+ <table-name>BasicCmp</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
<query>
<query-method>
<method-name>findByLastName</method-name>
@@ -164,14 +177,14 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <sql>SELECT id FROM BasicCmp2 WHERE lastName = ?</sql>
+ <sql>SELECT id FROM BasicCmp WHERE lastName = ?</sql>
</query>
<query>
<query-method>
<method-name>findEmptyCollection</method-name>
<method-params/>
</query-method>
- <sql>SELECT id FROM BasicCmp2 WHERE 1 = 0</sql>
+ <sql>SELECT id FROM BasicCmp WHERE 1 = 0</sql>
</query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
@@ -181,6 +194,19 @@
<entity>
<ejb-name>AOBasicCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp2/allowed_operations/EntityHome</jndi-name>
+ <table-name>AOBasicCmp</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
<query>
<query-method>
<method-name>findByLastName</method-name>
@@ -209,6 +235,19 @@
<entity>
<ejb-name>EncCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp2/EncBean</jndi-name>
+ <table-name>EncCmp</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
<target-name>DefaultDatasource</target-name>
@@ -221,6 +260,19 @@
<entity>
<ejb-name>Cmp2RMIIIOPBean</ejb-name>
<jndi-name>client/tests/entity/cmp2/RMI-over-IIOP/EJBHome</jndi-name>
+ <table-name>CmpRmiIiop</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
</entity>
<!--
@@ -232,6 +284,19 @@
<entity>
<ejb-name>BasicCmpBean</ejb-name>
<jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
+ <table-name>BasicCmp</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
<query>
<query-method>
<method-name>findByLastName</method-name>
@@ -239,7 +304,7 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <sql>SELECT id FROM BasicCmpBean WHERE lastName = ?</sql>
+ <sql>SELECT id FROM BasicCmp WHERE lastName = ?</sql>
</query>
<query>
<query-method>
@@ -256,6 +321,19 @@
<entity>
<ejb-name>AOBasicCmpBean</ejb-name>
<jndi-name>client/tests/entity/cmp/allowed_operations/EntityHome</jndi-name>
+ <table-name>AOBasicCmp</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
<query>
<query-method>
<method-name>findByLastName</method-name>
@@ -284,6 +362,19 @@
<entity>
<ejb-name>EncCmpBean</ejb-name>
<jndi-name>client/tests/entity/cmp/EncBean</jndi-name>
+ <table-name>EncCmp</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
<target-name>DefaultDatasource</target-name>
@@ -296,6 +387,19 @@
<entity>
<ejb-name>CmpRMIIIOPBean</ejb-name>
<jndi-name>client/tests/entity/cmp/RMI-over-IIOP/EJBHome</jndi-name>
+ <table-name>CmpRmiIiop</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
</entity>
</enterprise-beans>
