ammulder 2005/07/09 14:46:36
Modified: modules/openejb-builder/src/test-ejb-jar/META-INF
ejb-jar.xml openejb-jar.xml
Log:
Overwrite namespace for PK generator elements, so they don't need to be
correct in the plan
Add tests (now one for each type of PK gen, though one doesn't work on
Axion)
Revision Changes Path
1.5 +34 -0
openejb/modules/openejb-builder/src/test-ejb-jar/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-ejb-jar/META-INF/ejb-jar.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejb-jar.xml 7 Jul 2005 23:15:29 -0000 1.4
+++ ejb-jar.xml 9 Jul 2005 18:46:36 -0000 1.5
@@ -107,6 +107,40 @@
<cmp-field><field-name>lastName</field-name></cmp-field>
<primkey-field>id</primkey-field>
</entity>
+ <entity>
+ <ejb-name>PKGenCMPEntity4</ejb-name>
+ <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+ <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+
<local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+ <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+
<ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>PKGenCMP4</abstract-schema-name>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
+ <primkey-field>id</primkey-field>
+ </entity>
+ <entity>
+ <ejb-name>PKGenCMPEntity5</ejb-name>
+ <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+ <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+
<local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+ <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+
<ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>PKGenCMP5</abstract-schema-name>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
+ <primkey-field>id</primkey-field>
+ </entity>
<!--
<entity>
<ejb-name>CompoundPKEntity</ejb-name>
1.4 +45 -1
openejb/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml
Index: openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openejb-jar.xml 7 Jul 2005 23:15:29 -0000 1.3
+++ openejb-jar.xml 9 Jul 2005 18:46:36 -0000 1.4
@@ -69,7 +69,7 @@
<cmp-field-name>lastName</cmp-field-name>
<table-column>lastName</table-column>
</cmp-field-mapping>
- <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen";>
+ <key-generator>
<custom-generator>
<generator-name>geronimo.server:name=CMPPKGenerator2</generator-name>
<primary-key-class>java.lang.Integer</primary-key-class>
@@ -97,6 +97,50 @@
<sequence-name>PKGENCMP3</sequence-name>
<batch-size>1</batch-size>
</sequence-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>PKGenCMPEntity4</ejb-name>
+ <table-name>PKGenCMP4</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>
+ <key-generator>
+ <auto-increment-table>
+ <sql>insert into PKGENCMP4 VALUES(null, null, null)</sql>
+ <return-type>java.lang.Integer</return-type>
+ </auto-increment-table>
+ </key-generator>
+ </entity>
+ <entity>
+ <ejb-name>PKGenCMPEntity5</ejb-name>
+ <table-name>PKGenCMP5</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>
+ <key-generator>
+ <sql-generator>
+ <sql>select pkgencmp5_seq.nextval</sql>
+ <return-type>java.lang.Integer</return-type>
+ </sql-generator>
</key-generator>
</entity>
<message-driven>
