ammulder 2005/07/07 19:15:29
Modified: modules/openejb-builder/src/test-ejb-jar/META-INF
ejb-jar.xml openejb-jar.xml
Log:
Better tests
Revision Changes Path
1.4 +17 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejb-jar.xml 7 Jul 2005 21:37:08 -0000 1.3
+++ ejb-jar.xml 7 Jul 2005 23:15:29 -0000 1.4
@@ -90,6 +90,23 @@
<cmp-field><field-name>lastName</field-name></cmp-field>
<primkey-field>id</primkey-field>
</entity>
+ <entity>
+ <ejb-name>PKGenCMPEntity3</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>PKGenCMP3</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.3 +24 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openejb-jar.xml 7 Jul 2005 21:37:08 -0000 1.2
+++ openejb-jar.xml 7 Jul 2005 23:15:29 -0000 1.3
@@ -76,6 +76,29 @@
</custom-generator>
</key-generator>
</entity>
+ <entity>
+ <ejb-name>PKGenCMPEntity3</ejb-name>
+ <table-name>PKGenCMP3</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 xmlns="http://www.openejb.org/xml/ns/pkgen";>
+ <sequence-table>
+ <table-name>PKGENCMP_SEQ</table-name>
+ <sequence-name>PKGENCMP3</sequence-name>
+ <batch-size>1</batch-size>
+ </sequence-table>
+ </key-generator>
+ </entity>
<message-driven>
<ejb-name>SimpleMessageDriven</ejb-name>
<resource-adapter>
@@ -87,10 +110,6 @@
<gbean gbeanName="geronimo.server:name=CMPPKGenerator"
class="org.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapper">
<reference name="ManagedConnectionFactoryWrapper">
<gbean-name>test:J2EEApplication=null,J2EEServer=bar,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</gbean-name>
-<!-- <module-type>JCAResource</module-type>-->
-<!-- <module>org/apache/geronimo/DefaultDatabase</module>-->
-<!-- <type>JCAManagedConnectionFactory</type>-->
-<!-- <name>DefaultDatasource</name>-->
</reference>
<attribute name="tableName">PKGENCMP_SEQ</attribute>
<attribute name="sequenceName">PKGENCMP</attribute>
@@ -98,7 +117,7 @@
</gbean>
<gbean gbeanName="geronimo.server:name=CMPPKGenerator2"
class="org.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapper">
<reference name="ManagedConnectionFactoryWrapper">
-<!--
<gbean-name>test:J2EEApplication=null,J2EEServer=bar,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</gbean-name>-->
+ <application>null</application>
<moduleType>JCAResource</moduleType>
<module>org/apache/geronimo/DefaultDatabase</module>
<type>JCAManagedConnectionFactory</type>
