db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r208675 - in /incubator/jdo/trunk/tck20: maven.xml project.properties test/conf/iut.properties
Date Thu, 30 Jun 2005 20:15:21 GMT
Author: mcaisse
Date: Thu Jun 30 13:15:19 2005
New Revision: 208675

URL: http://svn.apache.org/viewcvs?rev=208675&view=rev
Log:
Build PMF properties file on the fly in maven.xml

Added:
    incubator/jdo/trunk/tck20/test/conf/iut.properties   (with props)
Modified:
    incubator/jdo/trunk/tck20/maven.xml
    incubator/jdo/trunk/tck20/project.properties

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=208675&r1=208674&r2=208675&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Thu Jun 30 13:15:19 2005
@@ -159,6 +159,9 @@
                     <j:new var="schemaname" className="java.lang.String"/>
                     <j:set var="id" value="${jdo.tck.identitytype}"/>
                     <j:set var="mapping" value="${jdo.tck.mapping}"/>
+                    <j:if test="${mapping == zeroval}">
+                       <j:set var="jdo.tck.mapping" value=""/>
+                    </j:if>
                     <j:set var="schemaname">
                         <j:expr value="${schemaname.concat(id)}"/>
                         <j:expr value="${schemaname.concat(mapping)}"/>
@@ -184,6 +187,9 @@
                     <j:new var="schemaname" className="java.lang.String"/>
                     <j:set var="id" value="${jdo.tck.identitytype}"/>
                     <j:set var="mapping" value="${jdo.tck.mapping}"/>
+                    <j:if test="${mapping == zeroval}">
+                       <j:set var="jdo.tck.mapping" value=""/>
+                    </j:if>
                     <j:set var="schemaname">
                         <j:expr value="${schemaname.concat(id)}"/>
                         <j:expr value="${schemaname.concat(mapping)}"/>
@@ -201,15 +207,26 @@
             <path refid="project.class.path"/>
         </path>
         <j:set var="jdo.tck.testrunnerclass"
-             value="org.apache.jdo.tck.util.BatchTestRunner"/>
+               value="org.apache.jdo.tck.util.BatchTestRunner"/>
+         <u:loadText file="${basedir}/test/conf/${iut.runtck.properties}"
+                    var="PMFProps"/>
+        <j:file name="${jdo.tck.testclasses.dir}/${iut.runtck.properties}"
+                omitXmlDeclaration="true">
+            ${PMFProps}
+            ### Properties below added by maven goal doRuntck.jdori
+            javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}
+            org.jpox.identifier.defaultSchemaName=${schemaname}
+        </j:file>
         <java fork="yes" dir="${jdo.tck.testdir}"
               classname="${jdo.tck.testrunnerclass}">
             <classpath refid="this.project.class.path"/>
             <sysproperty key="ResultPrinterClass"
                          value="${jdo.tck.resultprinterclass}"/>
             <sysproperty key="verbose" value="${verbose}"/>
-            <sysproperty key="PMFProperties" value="${iut.runtck.properties}"/>
-            <sysproperty key="PMF2Properties" value="${iut.runtck.properties}"/>
+            <sysproperty key="PMFProperties"
+                         value="${jdo.tck.testclasses.dir}/${iut.runtck.properties}"/>
+            <sysproperty key="PMF2Properties"
+                         value="${jdo.tck.testclasses.dir}/${iut.runtck.properties}"/>
             <sysproperty key="jdo.tck.testdata" value="${jdo.tck.testdata}"/>
             <sysproperty key="jdo.tck.standarddata"
                          value="${jdo.tck.standarddata}"/>
@@ -223,11 +240,7 @@
                          value="${jdo.tck.cfg}"/>
             <sysproperty key="jdo.tck.excludelist"
                          value="${jdo.tck.excludelist}"/>
-            <sysproperty key="javax.jdo.option.Mapping"
-                         value="${jdo.tck.mapping}"/>
-            <sysproperty key="org.jpox.identifier.defaultSchemaName"
-                         value="${schemaname}"/>
-            <jvmarg line="${iut.runtck.sysproperties}"/>
+            <jvmarg line="${database.runtck.sysproperties}"/>
             <jvmarg line="${iut.runtck.sysproperties}"/>
             <arg line="${jdo.tck.classes}"/>
         </java>
@@ -238,6 +251,15 @@
             <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
             <path refid="jdori.class.path"/>
         </path>
+        <u:loadText file="${basedir}/test/conf/${PMFProperties}"
+                    var="PMFProps"/>
+        <j:file name="${jdo.tck.testclasses.dir}/${PMFProperties}"
+                omitXmlDeclaration="true">
+            ${PMFProps}
+            ### Properties below added by maven goal doRuntck.jdori
+            javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}
+            org.jpox.identifier.defaultSchemaName=${schemaname}
+        </j:file>
         <j:set var="jdo.tck.testrunnerclass"
                value="org.apache.jdo.tck.util.BatchTestRunner"/>
         <java fork="yes" dir="${jdo.tck.testdir}"
@@ -247,9 +269,9 @@
                          value="${jdo.tck.resultprinterclass}"/>
             <sysproperty key="verbose" value="${verbose}"/>
             <sysproperty key="PMFProperties"
-                         value="${basedir}/test/conf/jdori.properties"/>
+                         value="${jdo.tck.testclasses.dir}/${PMFProperties}"/>
             <sysproperty key="PMF2Properties"
-                         value="${basedir}/test/conf/jdori.properties"/>
+                         value="${jdo.tck.testclasses.dir}/${PMFProperties}"/>
             <sysproperty key="jdo.tck.testdata" value="${jdo.tck.testdata}"/>
             <sysproperty key="jdo.tck.standarddata"
                          value="${jdo.tck.standarddata}"/>
@@ -263,10 +285,6 @@
                          value="${jdo.tck.cfg}"/>
             <sysproperty key="jdo.tck.excludelist"
                          value="${jdo.tck.excludelist}"/>
-            <sysproperty key="javax.jdo.option.Mapping"
-                         value="${jdo.tck.Mapping}"/>
-            <sysproperty key="org.jpox.identifier.defaultSchemaName"
-                         value="${schemaname}"/>
             <jvmarg line="${database.runtck.sysproperties}"/>
             <jvmarg line="${jdo.runtck.sysproperties}"/>
             <arg line="${jdo.tck.classes}"/>

Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?rev=208675&r1=208674&r2=208675&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Thu Jun 30 13:15:19 2005
@@ -17,7 +17,7 @@
 jdo.tck.excludelist = ${basedir}/test/conf/exclude.list
 
 # iut properties file
-iut.runtck.properties = ${basedir}/test/conf/jdori.properties
+iut.runtck.properties = iut.properties
 iut.runtck.sysproperties = -Dderby.system.home=${jdo.tck.testdir}/database/${jdo.tck.database}
-Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
 
 # Flags indicating whether IUT supports application/datastore identity 
@@ -38,7 +38,7 @@
 maven.junit.fork = yes
 maven.junit.dir = ${jdo.tck.testdir}
 maven.junit.sysproperties = PMFProperties
-PMFProperties = ${basedir}/test/conf/jdori.properties
+PMFProperties = jdori.properties
 
 # JDO TCK settings
 jdo.tck.dblist=derby

Added: incubator/jdo/trunk/tck20/test/conf/iut.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/iut.properties?rev=208675&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/iut.properties (added)
+++ incubator/jdo/trunk/tck20/test/conf/iut.properties Thu Jun 30 13:15:19 2005
@@ -0,0 +1,26 @@
+# -------------------------------------------------------------------
+# P R O J E C T  P R O P E R T I E S
+# -------------------------------------------------------------------
+#
+# IUT Properties
+# Edit these properties for the Implementation Under Test
+javax.jdo.PersistenceManagerFactoryClass=org.jpox.PersistenceManagerFactoryImpl
+javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver
+javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb
+javax.jdo.option.ConnectionUserName=tckuser
+javax.jdo.option.ConnectionPassword=tckuser
+javax.jdo.option.Optimistic=false
+javax.jdo.option.RetainValues=false
+javax.jdo.option.RestoreValues=false
+javax.jdo.option.Mapping=derby
+
+org.jpox.validateTables=false
+org.jpox.validateConstraints=false
+org.jpox.autoCreateSchema=false
+org.jpox.autoCreateTables=false
+org.jpox.autoCreateConstraints=false
+org.jpox.autoCreateColumns=false
+org.jpox.rdbms.CheckExistTablesOrViews=false
+org.jpox.autoStartMechanism=None
+#org.jpox.connectionPoolingType=DBCP
+org.jpox.connectionPoolingType=C3P0

Propchange: incubator/jdo/trunk/tck20/test/conf/iut.properties
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message