maguro 2005/01/18 16:50:39
Modified: modules/itests/src/scenarios/001 ejb-jar.xml openejb-jar.xml
Log:
A few CORBA fixes.
Revision Changes Path
1.3 +223 -1 openejb/modules/itests/src/scenarios/001/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file: /scm/openejb/openejb/modules/itests/src/scenarios/001/ejb-jar.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejb-jar.xml 12 Jan 2005 21:11:42 -0000 1.2
+++ ejb-jar.xml 18 Jan 2005 21:50:39 -0000 1.3
@@ -8,6 +8,99 @@
<enterprise-beans>
+ <entity>
+ <description>
+ A basic CMP v1.x bean.
+ </description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <home>org.openejb.test.security.cmp.BasicCmpHome</home>
+ <remote>org.openejb.test.security.cmp.BasicCmp</remote>
+ <ejb-class>org.openejb.test.security.cmp.BasicCmpBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>1.x</cmp-version>
+ <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>
+ <resource-ref>
+ <description>
+ This is a reference to a JDBC database.
+ </description>
+ <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
+ <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>
+
+ <entity>
+ <description>
+ A basic CMP v2.x bean.
+ </description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <home>org.openejb.test.security.cmp.BasicCmpHome</home>
+ <remote>org.openejb.test.security.cmp.BasicCmp</remote>
+
<ejb-class>org.openejb.test.security.cmp.BasicCmp2Bean</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>BasicCmp2</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>
+ <resource-ref>
+ <description>
+ This is a reference to a JDBC database.
+ </description>
+ <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
+ <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 BasicCmp2 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 BasicCmp2 AS a WHERE 1 = 0]]>
+ </ejb-ql>
+ </query>
+ </entity>
+
<session>
<description>
A basic stateless session bean with contianer-managed
transaction demarcation.
@@ -79,6 +172,16 @@
<ejb-name>BasicStatefulBean</ejb-name>
<method-name>lowSecurityMethod</method-name>
</method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>lowSecurityMethod</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>lowSecurityMethod</method-name>
+ </method>
</method-permission>
<method-permission>
@@ -95,6 +198,16 @@
<ejb-name>BasicStatefulBean</ejb-name>
<method-name>mediumSecurityMethod</method-name>
</method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>mediumSecurityMethod</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>mediumSecurityMethod</method-name>
+ </method>
</method-permission>
<method-permission>
@@ -107,7 +220,12 @@
</method>
<method>
<description>The description</description>
- <ejb-name>BasicStatefulBean</ejb-name>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>highSecurityMethod</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
<method-name>highSecurityMethod</method-name>
</method>
</method-permission>
@@ -155,6 +273,46 @@
<ejb-name>BasicStatefulBean</ejb-name>
<method-name>remove</method-name>
</method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>allAccessMethod</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>isInRole</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>create</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>remove</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>allAccessMethod</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>isInRole</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>create</method-name>
+ </method>
+ <method>
+ <description>The description</description>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>remove</method-name>
+ </method>
</method-permission>
<container-transaction>
@@ -166,6 +324,14 @@
<ejb-name>BasicStatefulBean</ejb-name>
<method-name>*</method-name>
</method>
+ <method>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>*</method-name>
+ </method>
<trans-attribute>Supports</trans-attribute>
</container-transaction>
@@ -220,6 +386,62 @@
</method>
<method>
<ejb-name>BasicStatefulBean</ejb-name>
+ <method-name>highSecurityMethod</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>noAccessMethod</method-name>
+ </method>
+ <method>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>lowSecurityMethod</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>mediumSecurityMethod</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>highSecurityMethod</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>noAccessMethod</method-name>
+ </method>
+ <method>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>lowSecurityMethod</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>mediumSecurityMethod</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>BasicCmp2Bean</ejb-name>
<method-name>highSecurityMethod</method-name>
<method-params>
<method-param>java.lang.String</method-param>
1.6 +63 -10 openejb/modules/itests/src/scenarios/001/openejb-jar.xml
Index: openejb-jar.xml
===================================================================
RCS file:
/scm/openejb/openejb/modules/itests/src/scenarios/001/openejb-jar.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openejb-jar.xml 12 Jan 2005 21:11:42 -0000 1.5
+++ openejb-jar.xml 18 Jan 2005 21:50:39 -0000 1.6
@@ -11,21 +11,68 @@
</dependency>
<enterprise-beans>
- <!--
- ########################################################
- Stateless
- ########################################################
- -->
+
+ <entity>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <jndi-name>security/001/cmp/BasicCmpHome</jndi-name>
+ <table-name>entity</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>first_name</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>last_name</table-column>
+ </cmp-field-mapping>
+ <automatic-key-generation>
+
<generator-name>geronimo.server:role=CMPPKGenerator,name=SecurityEntity</generator-name>
+ <primary-key-class>java.lang.Integer</primary-key-class>
+ </automatic-key-generation>
+ <resource-ref>
+ <ref-name>jdbc/basic/entityDatabase</ref-name>
+ <application>null</application>
+ <module>org/apache/geronimo/DefaultDatabase</module>
+ <name>DefaultDatasource</name>
+ </resource-ref>
+ </entity>
+
+ <entity>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <jndi-name>security/001/cmp2/BasicCmpHome</jndi-name>
+ <table-name>entity</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>first_name</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>last_name</table-column>
+ </cmp-field-mapping>
+ <automatic-key-generation>
+
<generator-name>geronimo.server:role=CMPPKGenerator,name=SecurityEntity</generator-name>
+ <primary-key-class>java.lang.Integer</primary-key-class>
+ </automatic-key-generation>
+ <resource-ref>
+ <ref-name>jdbc/basic/entityDatabase</ref-name>
+ <application>null</application>
+ <module>org/apache/geronimo/DefaultDatabase</module>
+ <name>DefaultDatasource</name>
+ </resource-ref>
+ </entity>
+
<session>
<ejb-name>BasicStatelessBean</ejb-name>
<jndi-name>security/001/BasicStatelessHome</jndi-name>
</session>
- <!--
- ########################################################
- Stateful
- ########################################################
- -->
<session>
<ejb-name>BasicStatefulBean</ejb-name>
<jndi-name>security/001/BasicStatefulHome</jndi-name>
@@ -69,5 +116,11 @@
</sec:role>
</sec:role-mappings>
</sec:security>
+
+ <gbean name="geronimo.server:role=CMPPKGenerator,name=SecurityEntity"
class="org.openejb.entity.cmp.pkgenerator.AutoIncrementTablePrimaryKeyGeneratorWrapper">
+ <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEServer=geronimo,J2EEApplication=null,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+ <attribute name="sql" type="java.lang.String">INSERT INTO entity
(first_name) VALUES ('AUTO_GENERATED')</attribute>
+ <attribute name="returnType"
type="java.lang.Class">java.lang.Integer</attribute>
+ </gbean>
</openejb-jar>
