gdamour 2004/12/09 21:02:50
Modified: modules/itests/src/ejb/META-INF ejb-jar.xml openejb-jar.xml
Log:
Move the finders to the standard ejb-jar.xml DD.
Revision Changes Path
1.3 +80 -0 openejb/modules/itests/src/ejb/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/src/ejb/META-INF/ejb-jar.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejb-jar.xml 13 Oct 2004 18:53:23 -0000 1.2
+++ ejb-jar.xml 10 Dec 2004 02:02:50 -0000 1.3
@@ -54,6 +54,26 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmpBean AS a WHERE
a.lastName = ?1]]>
+ </ejb-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmpBean AS a WHERE 1 =
0]]>
+ </ejb-ql>
+ </query>
</entity>
<!--
@@ -106,6 +126,26 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM AOBasicCmpBean AS a WHERE
a.lastName = ?1]]>
+ </ejb-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM AOBasicCmpBean AS a WHERE 1 =
0]]>
+ </ejb-ql>
+ </query>
</entity>
<!--
@@ -281,6 +321,26 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmp2Bean AS a WHERE
a.lastName = ?1]]>
+ </ejb-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmp2Bean AS a WHERE 1 =
0]]>
+ </ejb-ql>
+ </query>
</entity>
<!--
@@ -333,6 +393,26 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM AOBasicCmp2Bean AS a WHERE
a.lastName = ?1]]>
+ </ejb-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM AOBasicCmp2Bean AS a WHERE 1
= 0]]>
+ </ejb-ql>
+ </query>
</entity>
<!--
1.9 +0 -64 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openejb-jar.xml 8 Nov 2004 15:47:27 -0000 1.8
+++ openejb-jar.xml 10 Dec 2004 02:02:50 -0000 1.9
@@ -206,22 +206,6 @@
<generator-name>geronimo.server:role=CMPPKGenerator,name=Entity</generator-name>
<primary-key-class>java.lang.Integer</primary-key-class>
</automatic-key-generation>
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <sql>SELECT id FROM entity WHERE last_name = ?</sql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <sql>SELECT id FROM BasicCmp WHERE 1 = 0</sql>
- </query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
<application>null</application>
@@ -249,22 +233,6 @@
<generator-name>geronimo.server:role=CMPPKGenerator,name=Entity</generator-name>
<primary-key-class>java.lang.Integer</primary-key-class>
</automatic-key-generation>
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <sql>SELECT id FROM AOBasicCmp2 WHERE lastName = ?</sql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <sql>SELECT id FROM AOBasicCmp2 WHERE 1 = 0</sql>
- </query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
<application>null</application>
@@ -359,22 +327,6 @@
<generator-name>geronimo.server:role=CMPPKGenerator,name=Entity</generator-name>
<primary-key-class>java.lang.Integer</primary-key-class>
</automatic-key-generation>
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <sql>SELECT id FROM entity WHERE last_name = ?</sql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <sql>SELECT id FROM BasicCmpBean WHERE 1 = 0</sql>
- </query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
<application>null</application>
@@ -402,22 +354,6 @@
<generator-name>geronimo.server:role=CMPPKGenerator,name=Entity</generator-name>
<primary-key-class>java.lang.Integer</primary-key-class>
</automatic-key-generation>
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <sql>SELECT id FROM AOBasicCmpBean WHERE lastName = ?</sql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <sql>SELECT id FROM AOBasicCmpBean WHERE 1 = 0</sql>
- </query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
<application>null</application>