gdamour 2004/11/08 10:47:27
Modified: modules/assembly/src/plan default-database-plan.xml
Log:
GERONIMO-386: openejb cmp attempt to modify identity columns
o create a new PrimaryKeyGenerator which uses table auto-generated primary
key to generate the primary key of a CMP;
o reconfigure the itests CMP EJBs to use the above PrimaryKeyGenerator; and
o itests are now executed with Derby as the underlying database.
Revision Changes Path
1.7 +7 -6
openejb/modules/assembly/src/plan/default-database-plan.xml
Index: default-database-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/default-database-plan.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default-database-plan.xml 30 Sep 2004 08:34:00 -0000 1.6
+++ default-database-plan.xml 8 Nov 2004 15:47:27 -0000 1.7
@@ -6,7 +6,10 @@
parentId="org/apache/geronimo/Server">
<dependency>
- <uri>axion/jars/axion-${axion_version}.jar</uri>
+ <uri>derby/jars/derby-${derby_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>derby/jars/derbynet-${derby_version}.jar</uri>
</dependency>
<dependency>
@@ -29,10 +32,8 @@
<name>DefaultDatasource</name>
<config-property-setting
name="UserName"></config-property-setting>
<config-property-setting
name="Password"></config-property-setting>
- <config-property-setting
name="Driver">org.axiondb.jdbc.AxionDriver</config-property-setting>
- <config-property-setting
name="ConnectionURL">jdbc:axiondb:DefaultDatabase</config-property-setting>
- <config-property-setting
name="CommitBeforeAutocommit">true</config-property-setting>
- <config-property-setting
name="ExceptionSorterClass">org.tranql.connector.NoExceptionsAreFatalSorter</config-property-setting>
+ <config-property-setting
name="DatabaseName">DefaultDatasource</config-property-setting>
+ <config-property-setting
name="CreateDatabase">create</config-property-setting>
<connectionmanager>
<local-transaction/>
<single-pool>
@@ -41,7 +42,7 @@
<match-one/>
</single-pool>
</connectionmanager>
- <global-jndi-name>tranql/axion</global-jndi-name>
+ <global-jndi-name>tranql/derby</global-jndi-name>
<!--credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface-->
</connectiondefinition-instance>
</connection-definition>
