Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 61711 invoked from network); 25 Apr 2006 15:05:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Apr 2006 15:05:38 -0000 Received: (qmail 69670 invoked by uid 500); 25 Apr 2006 15:03:35 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 67986 invoked by uid 500); 25 Apr 2006 15:03:27 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 66009 invoked by uid 99); 25 Apr 2006 15:03:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 08:03:17 -0700 X-ASF-Spam-Status: No, hits=1.3 required=10.0 tests=RCVD_IN_BL_SPAMCOP_NET,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of goyathlay.geronimo@gmail.com designates 64.233.166.176 as permitted sender) Received: from [64.233.166.176] (HELO pproxy.gmail.com) (64.233.166.176) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 08:03:14 -0700 Received: by pproxy.gmail.com with SMTP id t32so1313587pyc for ; Tue, 25 Apr 2006 08:02:53 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:mime-version:content-type; b=iom6syqlElDqBuo5u5Qzdjb9LbmocqW9WfmS4B42DebDQRD51pmPTlrTaBJ+8aaM+sgz4X6UtXgQYoBBJrLNB24aysvuKY/afo/6jZQAVneGRYwmzUiUoekLRmtrPGic7JrTaEDZvKPXUb8XtD8CH5VpjUJhluzmqRdsWmv/DO0= Received: by 10.35.91.10 with SMTP id t10mr2746419pyl; Tue, 25 Apr 2006 08:02:53 -0700 (PDT) Received: by 10.35.34.5 with HTTP; Tue, 25 Apr 2006 08:02:53 -0700 (PDT) Message-ID: Date: Tue, 25 Apr 2006 11:02:53 -0400 From: "Prasad Kashyap" To: dev@geronimo.apache.org Subject: OpenEJB Itests in G1.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_160_27555970.1145977373500" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N ------=_Part_160_27555970.1145977373500 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I tried to get the openejb itests up n' running again in G1.1 but with partial success. The plans were migrated to conform to the new config changes. I was able to deploy all of the 9 jars successfully. I was unable to start only one configuration (security-plan.xml) because it depends on the j2ee-corba plan. There is an error starting corba (http://www.mail-archive.com/dev@geronimo.apache.org/msg21109.html ) and that is a known problem (http://issues.apache.org/jira/browse/GERONIMO-1893). Since there are quite a few changes, I believe we should atleast go ahead and apply these for now. We could revisit this once the Geronimo-1893 block is lifted. The itests-for-g1.1.patch should be applied in the openejb directory. The for-itests.patch should be applied in the plugins/geronimo-deployment-plugin directory. http://jira.codehaus.org/browse/OPENEJB-141 Cheers Prasad ------=_Part_160_27555970.1145977373500 Content-Type: application/octet-stream; name=itests-for-g1.1.patch Content-Transfer-Encoding: 7bit X-Attachment-Id: f_emgd4k5n Content-Disposition: attachment; filename="itests-for-g1.1.patch" Index: etc/project.properties =================================================================== --- etc/project.properties (revision 2622) +++ etc/project.properties (working copy) @@ -59,7 +59,7 @@ geronimo_packaging_plugin_version=1.1.0-5 geronimo_assembly_plugin_version=1.1.0-10 -geronimo_deployment_plugin_version=1.1.0-1 +geronimo_deployment_plugin_version=1.1.0-2 geronimo_dependency_plugin_version=1.1.0-2 geronimo_spec_activation_version=1.0 Index: modules/itests/maven.xml =================================================================== --- modules/itests/maven.xml (revision 2622) +++ modules/itests/maven.xml (working copy) @@ -223,6 +223,9 @@ + + + @@ -239,8 +242,8 @@ username="system" password="manager" maxtries="125" - id="geronimo/jetty-runtime-deployer/${geronimo_version}/car"/> - + id="geronimo/jetty-deployer/${geronimo_version}/car"/> + + module="${maven.build.dir}/openejb-itests-${pom.currentVersion}.jar" + plan="${maven.build.dir}/ejb/META-INF/openejb-jar.xml" /> + + + + + + + + + + + + + + id="openejb/itests-security-scenario003/${openejb_version}/car"/> + + id="openejb/itests-security-scenario002/${openejb_version}/car"/> + id="openejb/itests-security-scenario002/${openejb_version}/car"/> + id="openejb/itests-security-scenario001/${openejb_version}/car"/> + + id="openejb/itests/${openejb_version}/car"/> + id="openejb/itests/${openejb_version}/car"/> - + Index: modules/itests/src/cmp2/cmrmapping/openejb-jar.xml =================================================================== --- modules/itests/src/cmp2/cmrmapping/openejb-jar.xml (revision 2622) +++ modules/itests/src/cmp2/cmrmapping/openejb-jar.xml (working copy) @@ -1,22 +1,35 @@ - + - + + + openejb + cmp2-cmrmapping + ${openejb_version} + car + + + + + + geronimo + system-database + ${geronimo_version} + car + + junit junit ${junit_version} - + + + + - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - + SystemDatasource + Index: modules/itests/src/cmp2/petstore/openejb-jar.xml =================================================================== --- modules/itests/src/cmp2/petstore/openejb-jar.xml (revision 2622) +++ modules/itests/src/cmp2/petstore/openejb-jar.xml (working copy) @@ -48,22 +48,35 @@ ==================================================================== --> - + - - junit - junit - ${junit_version} - + + + openejb + cmp2-petstore + ${openejb_version} + car + + + + geronimo + system-database + ${geronimo_version} + car + + + junit + junit + ${junit_version} + + + + - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource + SystemDatasource + AddressEJB Index: modules/itests/src/cmp2/prefetch/openejb-jar.xml =================================================================== --- modules/itests/src/cmp2/prefetch/openejb-jar.xml (revision 2622) +++ modules/itests/src/cmp2/prefetch/openejb-jar.xml (working copy) @@ -1,210 +1,224 @@ + - + + + openejb + cmp2-prefetch + ${openejb_version} + car + - + + + geronimo + system-database + ${geronimo_version} + car + + junit junit ${junit_version} - + + - - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - + - - - AddressBean - address - - id - id - - - street - street - - - city - city - - - - prefetchAll - street - city - - - - - LineItemBean - line_item - - id - id - - - quantity - quantity - - - - prefetchAll - quantity - - product - - - - prefetchAll - - - - - OrderBean - order_table - - id - id - - - reference - reference - - - - prefetchAll - reference - - shippingAddress - - - billingAddress - - - lineItems - - - - - - findPrefetchAll - - java.lang.Integer - - - prefetchAll - - - - ProductBean - product - - id - id - - - name - name - - - productType - product_type - - - - prefetchAll - name - productType - - - + + SystemDatasource + - - PrefetchFacadeBean - cmp2/Prefetch/PrefetchFacade - - jdbc/CMPDatasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - + + + AddressBean + address + + id + id + + + street + street + + + city + city + + + + prefetchAll + street + city + + + + + LineItemBean + line_item + + id + id + + + quantity + quantity + + + + prefetchAll + quantity + + product + + + + prefetchAll + + + + + OrderBean + order_table + + id + id + + + reference + reference + + + + prefetchAll + reference + + shippingAddress + + + billingAddress + + + lineItems + + + + + + findPrefetchAll + + java.lang.Integer + + + prefetchAll + + + + ProductBean + product + + id + id + + + name + name + + + productType + product_type + + + + prefetchAll + name + productType + + + - - - - - OrderBean - - - shippingAddress - - - - - id - fk_shipping_address - - - - - - - - OrderBean - - - billingAddress - - - - - id - fk_billing_address - - - - - - - - OrderBean - - - lineItems - - - - id - fk_order - - - - - - - - ProductBean - - - lineItems - - - - id - fk_product - - - - - + + PrefetchFacadeBean + cmp2/Prefetch/PrefetchFacade + + jdbc/CMPDatasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + + + + + OrderBean + + + shippingAddress + + + + + id + fk_shipping_address + + + + + + + + OrderBean + + + billingAddress + + + + + id + fk_billing_address + + + + + + + + OrderBean + + + lineItems + + + + id + fk_order + + + + + + + + ProductBean + + + lineItems + + + + id + fk_product + + + + + + Index: modules/itests/src/cmp2/storage/openejb-jar.xml =================================================================== --- modules/itests/src/cmp2/storage/openejb-jar.xml (revision 2622) +++ modules/itests/src/cmp2/storage/openejb-jar.xml (working copy) @@ -1,48 +1,62 @@ + - + + + openejb + cmp2-storage + ${openejb_version} + car + - + + + geronimo + system-database + ${geronimo_version} + car + + junit junit ${junit_version} - + + - - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - + - - - StorageBean - cmp2/Storage - storage - - id - id - - - blob - blob_column - - - char - char_column - CHAR - - - jdbc/DefaultDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - + + SystemDatasource + + + + StorageBean + cmp2/Storage + storage + + id + id + + + blob + blob_column + + + char + char_column + CHAR + + + jdbc/DefaultDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + Index: modules/itests/src/ejb/META-INF/openejb-jar.xml =================================================================== --- modules/itests/src/ejb/META-INF/openejb-jar.xml (revision 2622) +++ modules/itests/src/ejb/META-INF/openejb-jar.xml (working copy) @@ -1,542 +1,637 @@ - + - + + + openejb + itests + ${openejb_version} + car + + + + + geronimo + system-database + ${geronimo_version} + car + + junit junit ${junit_version} - + + - - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - + - - - - BasicStatelessBean - client/tests/stateless/BasicStatelessHome - - stateless/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - BasicBMTStatelessBean - client/tests/stateless/BeanManagedBasicStatelessHome - - stateless/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - DatabaseBean - client/tools/DatabaseHome - - database - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - BMTStatelessBean - client/tests/stateless/BeanManagedTransactionTests/EJBHome - - database - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - EncStatelessBean - client/tests/stateless/EncBean - - datasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - StatelessRMIIIOPBean - client/tests/stateless/RMI-over-IIOP/EJBHome - - - BasicStatelessBean - client/tests/stateless/BasicStatelessHome - - stateless/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - SessionFacadeBean - client/tests/entity/cmp/SessionFacadeBean - + + SystemDatasource + + - - - BasicStatefulBean - client/tests/stateful/BasicStatefulHome - - stateful/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - BasicBMTStatefulBean - client/tests/stateful/BeanManagedBasicStatefulHome - - stateful/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - BMTStatefulBean - client/tests/stateful/BeanManagedTransactionTests/EJBHome - - datasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - EncStatefulBean - client/tests/stateful/EncBean - - datasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - StatefulRMIIIOPBean - client/tests/stateful/RMI-over-IIOP/EJBHome - + + + + BasicStatelessBean + client/tests/stateless/BasicStatelessHome + + stateless/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + BasicBMTStatelessBean + client/tests/stateless/BeanManagedBasicStatelessHome + + stateless/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + DatabaseBean + client/tools/DatabaseHome + + database + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + BMTStatelessBean + client/tests/stateless/BeanManagedTransactionTests/EJBHome + + database + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + EncStatelessBean + client/tests/stateless/EncBean + + datasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + StatelessRMIIIOPBean + client/tests/stateless/RMI-over-IIOP/EJBHome + + + BasicStatelessBean + client/tests/stateless/BasicStatelessHome + + stateless/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + SessionFacadeBean + client/tests/entity/cmp/SessionFacadeBean + - - - BasicBmpBean - client/tests/entity/bmp/BasicBmpHome - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - AOBasicBmpBean - client/tests/entity/bmp/allowed_operations/EntityHome - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - entity/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - EncBmpBean - client/tests/entity/bmp/EncBean - - datasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - BmpRMIIIOPBean - client/tests/entity/bmp/RMI-over-IIOP/EJBHome - + + + BasicStatefulBean + client/tests/stateful/BasicStatefulHome + + stateful/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + BasicBMTStatefulBean + client/tests/stateful/BeanManagedBasicStatefulHome + + stateful/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + BMTStatefulBean + client/tests/stateful/BeanManagedTransactionTests/EJBHome + + datasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + EncStatefulBean + client/tests/stateful/EncBean + + datasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + StatefulRMIIIOPBean + client/tests/stateful/RMI-over-IIOP/EJBHome + - + + + BasicBmpBean + client/tests/entity/bmp/BasicBmpHome + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + AOBasicBmpBean + client/tests/entity/bmp/allowed_operations/EntityHome + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + entity/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + EncBmpBean + client/tests/entity/bmp/EncBean + + datasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + BmpRMIIIOPBean + client/tests/entity/bmp/RMI-over-IIOP/EJBHome + - - BasicCmp2Bean - client/tests/entity/cmp2/BasicCmpHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - AOBasicCmp2Bean - client/tests/entity/cmp2/allowed_operations/EntityHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - entity/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - EncCmp2Bean - client/tests/entity/cmp2/EncBean - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - datasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - Cmp2RMIIIOPBean - client/tests/entity/cmp2/RMI-over-IIOP/EJBHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - + - + + BasicCmp2Bean + client/tests/entity/cmp2/BasicCmpHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + AOBasicCmp2Bean + client/tests/entity/cmp2/allowed_operations/EntityHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + entity/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + EncCmp2Bean + client/tests/entity/cmp2/EncBean + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + datasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + Cmp2RMIIIOPBean + client/tests/entity/cmp2/RMI-over-IIOP/EJBHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + - - BasicCmpBean - client/tests/entity/cmp/BasicCmpHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - findByLastName - - java.lang.String - - - - - - - - - findEmptyCollection - - - - - - - - - BasicCmpBeanExplicitPK - entity_explicit_pk - - id - id - - - firstName - first_name - - - lastName - last_name - - - - findByPrimaryKey - - java.lang.Integer - - - - - - - - - - findByLastName - - java.lang.String - - - - - - - - - AOBasicCmpBean - client/tests/entity/cmp/allowed_operations/EntityHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - entity/references/Resource_manager_access - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - findByLastName - - java.lang.String - - - - - - - - - findEmptyCollection - - - - - - - - - EncCmpBean - client/tests/entity/cmp/EncBean - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - datasource - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - - - CmpRMIIIOPBean - client/tests/entity/cmp/RMI-over-IIOP/EJBHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=Entity - java.lang.Integer - - - - + - - *:J2EEApplication=null,JCAResource=geronimo/default-database/${geronimo_version}/car,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource,* - INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') - java.lang.Integer - + + BasicCmpBean + client/tests/entity/cmp/BasicCmpHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + findByLastName + + java.lang.String + + + + + + + + + findEmptyCollection + + + + + + + + + BasicCmpBeanExplicitPK + entity_explicit_pk + + id + id + + + firstName + first_name + + + lastName + last_name + + + + findByPrimaryKey + + java.lang.Integer + + + + + + + + + + findByLastName + + java.lang.String + + + + + + + + + AOBasicCmpBean + client/tests/entity/cmp/allowed_operations/EntityHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + entity/references/Resource_manager_access + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + findByLastName + + java.lang.String + + + + + + + + + findEmptyCollection + + + + + + + + + EncCmpBean + client/tests/entity/cmp/EncBean + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + datasource + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + + + CmpRMIIIOPBean + client/tests/entity/cmp/RMI-over-IIOP/EJBHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + + + Index: modules/itests/src/plan/security-plan.xml =================================================================== --- modules/itests/src/plan/security-plan.xml (revision 2622) +++ modules/itests/src/plan/security-plan.xml (working copy) @@ -20,122 +20,162 @@ - + - + + + openejb + security + ${openejb_version} + car + + + + + geronimo + system-database + ${geronimo_version} + car + + activeio activeio ${activeio_version} - - + + geronimo geronimo-security ${geronimo_version} - + + + geronimo + j2ee-security + ${geronimo_version} + car + + + geronimo + j2ee-corba + ${geronimo_version} + car + + - + - + - + + - public-properties-realm - org/apache/geronimo/SystemServerInfo - org/apache/geronimo/SecurityJaasLoginService - - - - public-login - org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule - var/security/public_users.properties - var/security/public_groups.properties - - - - + public-properties-realm + + ServerInfo + + + JaasLoginService + + + + + public-login + org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule + var/security/public_users.properties + var/security/public_groups.properties + + + + - - public - public-properties-realm - org/apache/geronimo/SecurityJaasLoginService - + public + public-properties-realm + + JaasLoginService + + - - - org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule - true - - usersURI=var/security/black_users.properties - groupsURI=var/security/black_groups.properties - - black-properties-realm - + + - - black-properties-realm - org/apache/geronimo/SystemServerInfo - org/apache/geronimo/SecurityJaasLoginService - - - - black-login - - - - + black-properties-realm + + ServerInfo + + + JaasLoginService + + + + + black-login + org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule + var/security/black_users.properties + var/security/black_groups.properties + + + + - - black - black-properties-realm - org/apache/geronimo/SecurityJaasLoginService - + black + black-properties-realm + + JaasLoginService + + - - org/openejb/POA - - Server - - - - - + + org/openejb/POA + + Server + + + + + - - - DefaultThreadPool - - - TransactionContextManager - - org.openejb.corba.sunorb.SunORBConfigAdapter - IOR7 - - + + + DefaultThreadPool + + + TransactionContextManager + + org.openejb.corba.sunorb.SunORBConfigAdapter + IOR7 + + + + + + + + + Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient + Integrity Confidentiality EstablishTrustInTarget + + + + + + - - - - - - - - Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient - Integrity Confidentiality EstablishTrustInTarget - - - - - - Index: modules/itests/src/scenarios/001/openejb-jar.xml =================================================================== --- modules/itests/src/scenarios/001/openejb-jar.xml (revision 2622) +++ modules/itests/src/scenarios/001/openejb-jar.xml (working copy) @@ -1,131 +1,157 @@ - + - + + + + openejb + itests-security-scenario001 + ${openejb_version} + car + + + + + openejb + security + ${openejb_version} + car + + junit junit ${junit_version} - + + + geronimo + system-database + ${geronimo_version} + car + + - - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - + - + + SystemDatasource + - - BasicCmpBean - security/001/cmp/BasicCmpHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=SecurityEntity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - + - - BasicCmp2Bean - security/001/cmp2/BasicCmpHome - entity - - id - id - - - firstName - first_name - - - lastName - last_name - - - - geronimo.server:role=CMPPKGenerator,name=SecurityEntity - java.lang.Integer - - - - jdbc/basic/entityDatabase - null - geronimo/default-database/${geronimo_version}/car - DefaultDatasource - - + + BasicCmpBean + security/001/cmp/BasicCmpHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + - - BasicStatelessBean - security/001/BasicStatelessHome - org/openejb/Itests - + + BasicCmp2Bean + security/001/cmp2/BasicCmpHome + entity + + id + id + + + firstName + first_name + + + lastName + last_name + + + + INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') + java.lang.Integer + + + + jdbc/basic/entityDatabase + + geronimo + system-database + ${geronimo_version} + SystemDatasource + + + - - BasicStatefulBean - security/001/BasicStatefulHome - + + BasicStatelessBean + security/001/BasicStatelessHome + openejb/itests + - + + BasicStatefulBean + security/001/BasicStatefulHome + - - - - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + - - geronimo.server:J2EEServer=geronimo,J2EEApplication=null,JCAResource=geronimo/default-database/${geronimo_version}/car,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource - INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED') - java.lang.Integer - + + + + + + + + + \ No newline at end of file Index: modules/itests/src/scenarios/002/openejb-jar.xml =================================================================== --- modules/itests/src/scenarios/002/openejb-jar.xml (revision 2622) +++ modules/itests/src/scenarios/002/openejb-jar.xml (working copy) @@ -1,18 +1,34 @@ - + - + + + + openejb + itests-security-scenario002 + ${openejb_version} + car + + + + + openejb + security + ${openejb_version} + car + + junit junit ${junit_version} - + + + +