[openejb-scm] openejb/modules/itests/src/scenarios/001 openejb-jar.xml

[dain]

dain        2005/11/30 18:23:01

  Modified:    modules/itests/src/scenarios/001 openejb-jar.xml
  Log:

  Updated itests for new geronimo configuration ids
  
  Revision  Changes    Path
  1.15      +10 -7     openejb/modules/itests/src/scenarios/001/openejb-jar.xml
  
  Index: openejb-jar.xml
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/itests/src/scenarios/001/openejb-jar.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- openejb-jar.xml   27 Oct 2005 19:10:13 -0000      1.14
  +++ openejb-jar.xml   30 Nov 2005 23:23:01 -0000      1.15
  @@ -3,16 +3,19 @@
   <openejb-jar
       xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0";
       xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1";
  -    configId="org/openejb/scenario001"
  -    parentId="org/openejb/Security">
  +    configId="openejb/itests-security-scenario001/${openejb_version}/car"
  +    parentId="openejb/security/${openejb_version}/car"
  +    >
   
       <dependency>
  -        <uri>junit/jars/junit-3.8.1.jar</uri>
  +        <groupId>junit</groupId>
  +        <artifactId>junit</artifactId>
  +        <version>${junit_version}</version>
       </dependency>
   
       <cmp-connection-factory>
           <application>null</application>
  -        <module>org/apache/geronimo/DefaultDatabase</module>
  +        <module>geronimo/default-database/${geronimo_version}/car</module>
           <name>DefaultDatasource</name>
       </cmp-connection-factory>
   
  @@ -43,7 +46,7 @@
               <resource-ref>
                   <ref-name>jdbc/basic/entityDatabase</ref-name>
                   <application>null</application>
  -                <module>org/apache/geronimo/DefaultDatabase</module>
  +                
<module>geronimo/default-database/${geronimo_version}/car</module>
                   <name>DefaultDatasource</name>
               </resource-ref>
           </entity>
  @@ -73,7 +76,7 @@
               <resource-ref>
                   <ref-name>jdbc/basic/entityDatabase</ref-name>
                   <application>null</application>
  -                <module>org/apache/geronimo/DefaultDatabase</module>
  +                
<module>geronimo/default-database/${geronimo_version}/car</module>
                   <name>DefaultDatasource</name>
               </resource-ref>
           </entity>
  @@ -120,7 +123,7 @@
       </sec:security>
   
       <gbean 
gbeanName="geronimo.server:role=CMPPKGenerator,name=SecurityEntity" 
class="org.openejb.entity.cmp.pkgenerator.AutoIncrementTablePrimaryKeyGeneratorWrapper">
  -        <reference 
name="ManagedConnectionFactoryWrapper"><gbean-name>geronimo.server:J2EEServer=geronimo,J2EEApplication=null,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</gbean-name></reference>
  +        <reference 
name="ManagedConnectionFactoryWrapper"><gbean-name>geronimo.server:J2EEServer=geronimo,J2EEApplication=null,JCAResource=geronimo/default-database/${geronimo_version}/car,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</gbean-name></reference>
           <attribute name="sql">INSERT INTO entity (first_name) VALUES 
('AUTO_GENERATED')</attribute>
           <attribute name="returnType">java.lang.Integer</attribute>
       </gbean>