tomdz 2005/12/11 12:03:08
Modified: . Tag: OJB_1_0_RELEASE build.xml build.properties
Added: lib Tag: OJB_1_0_RELEASE commons-betwixt-0.8-dev.jar
DdlUtils-1.0-dev.jar commons-digester-1.7.jar
src/java/org/apache/ojb/broker/platforms Tag:
OJB_1_0_RELEASE PlatformDerbyImpl.java
profile Tag: OJB_1_0_RELEASE derby.profile
Log:
Added option to setup the database for the unit tests via DdlUtils
Added initial support for Derby
Revision Changes Path
No revision
No revision
1.1.2.1 +1214 -0 db-ojb/lib/Attic/commons-betwixt-0.8-dev.jar
<<Binary file>>
1.1.2.1 +897 -0 db-ojb/lib/Attic/DdlUtils-1.0-dev.jar
<<Binary file>>
1.1.2.1 +0 -0 db-ojb/lib/commons-digester-1.7.jar
<<Binary file>>
No revision
No revision
1.1.2.1 +163 -0
db-ojb/src/java/org/apache/ojb/broker/platforms/Attic/PlatformDerbyImpl.java
No revision
No revision
1.1.2.1 +151 -0 db-ojb/profile/Attic/derby.profile
No revision
No revision
1.144.2.28 +37 -7 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.144.2.27
retrieving revision 1.144.2.28
diff -u -r1.144.2.27 -r1.144.2.28
--- build.xml 12 Oct 2005 00:12:41 -0000 1.144.2.27
+++ build.xml 11 Dec 2005 20:03:08 -0000 1.144.2.28
@@ -352,14 +352,16 @@
<copy
file="${src.test}/org/apache/ojb/faraway-db/OJB_FarAway.properties"
tofile="${build.test}/OJB_FarAway.properties"/>
<copy file="${src.test}/org/apache/ojb/faraway-db/OJB_FarAway.script"
tofile="${build.test}/OJB_FarAway.script"/>
- </target>
+ </target>
- <!-- ==================================================================
-->
- <!-- prepare testdb using torque
-->
- <!-- ==================================================================
-->
<target name="prepare-testdb"
+ description="prepare testdb using torque or ddlutils"
+ depends="prepare-testdb-torque, prepare-testdb-ddlutils"/>
+
+ <target name="prepare-testdb-torque"
description="prepare testdb using torque"
- depends="prepare, prepare-repository">
+ depends="prepare, prepare-repository"
+ unless="use-ddlutils">
<copy todir="${build.test}">
<fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
@@ -368,7 +370,7 @@
</filterset>
</copy>
- <antcall target="getJSQLDriver"/>
+ <antcall target="getJSQLDriver"/>
<!-- create sql scripts -->
<ant dir="."
@@ -392,6 +394,34 @@
</target>
+ <target name="prepare-testdb-ddlutils"
+ description="prepare testdb using DdlUtils"
+ depends="prepare, prepare-repository"
+ if="use-ddlutils">
+ <taskdef name="ddl2Database"
+ classname="org.apache.ddlutils.task.DdlToDatabaseTask"
+ classpathref="runtime-classpath"/>
+
+ <copy todir="${build.test}">
+ <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
+ <filterset>
+ <filter token="DATABASE_DEFAULT" value="${project}" />
+ </filterset>
+ </copy>
+
+ <ddl2Database usedelimitedsqlidentifiers="false">
+ <database driverclassname="${torque.database.driver}"
+ url="${torque.database.createUrl}"
+ username="${torque.database.user}"
+ password="${torque.database.password}"/>
+ <fileset dir="${build.test}"
+ includes="*schema.xml"/>
+
+ <createdatabase failonerror="false"/>
+ <writeschematodatabase alterdatabase="false"/>
+ </ddl2Database>
+ </target>
+
<!-- ==================================================================
-->
<!-- dump testdb using torque -->
<!-- ==================================================================
-->
1.64.2.13 +3 -2 db-ojb/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/db-ojb/build.properties,v
retrieving revision 1.64.2.12
retrieving revision 1.64.2.13
diff -u -r1.64.2.12 -r1.64.2.13
--- build.properties 12 Oct 2005 00:12:41 -0000 1.64.2.12
+++ build.properties 11 Dec 2005 20:03:08 -0000 1.64.2.13
@@ -21,7 +21,7 @@
# With the 'profile' property you can choose the RDBMS platform OJB is using
# implemented profiles:
#
-profile=hsqldb
+#profile=hsqldb
# use the mssqldb-JSQLConnect profile for Microsoft SQL Server and
# you will automatically JSQLConnect driver, from http://www.j-netdirect.com/
# MBAIRD: This is my driver of preference for MS SQL Server, I find the OEM'd
@@ -40,6 +40,7 @@
#profile=sybase
#profile=sapdb
#profile=maxdb
+profile=derby
###
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
