Index: test/conf/iut.properties
===================================================================
--- test/conf/iut.properties	(revision 370203)
+++ test/conf/iut.properties	(working copy)
@@ -1,26 +0,0 @@
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
-#
-# IUT PMF 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
Index: test/conf/jdori.properties
===================================================================
--- test/conf/jdori.properties	(revision 370203)
+++ test/conf/jdori.properties	(working copy)
@@ -1,25 +0,0 @@
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
-#
-# JDORI PMF Properties
-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
Index: project.properties
===================================================================
--- project.properties	(revision 370203)
+++ project.properties	(working copy)
@@ -20,22 +20,11 @@
 maven.repo.remote = http://www.ibiblio.org/maven, http://www.jpox.org/downloads/maven
 maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
 
-# Flags indicating whether IUT supports application/datastore identity 
-iut.applicationidentity.supported = yes
-iut.datastoreidentity.supported = yes
-
 # iut properties file
-iut.pmf.properties = iut.properties
-iut.runtck.sysproperties = -Xmx512m
+iut.pmf.properties = iut-pmf.properties
 
 # The IUT enhancer, defaults to JPOX enhancer
 iut.enhanced.dir = ${maven.build.dir}/enhanced/iut
-iut.enhancer.main = ${jdori.enhancer.main}
-iut.enhancer.options = -v -d "${enhanced.dir}"
-iut.enhancer.args = ${jdo.tck.jdometadata.files}
-iut.enhancer.sysproperties =
-iut.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
-iut.execution.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
 
 # JUnit settings
 jdo.tck.testrunnerclass = org.apache.jdo.tck.util.BatchTestRunner
@@ -54,7 +43,7 @@
 jdo.tck.log.directory = ${maven.build.dir}/logs
 jdo.tck.log.directory.database = ${jdo.tck.log.directory}/database
 jdo.tck.log.directory.enhancer = ${jdo.tck.log.directory}/enhancer
-jdori.pmf.properties = jdori.properties
+jdori.pmf.properties = jdori-pmf.properties
 jdori.runtck.sysproperties = -Xmx512m
 
 # dependencies
Index: maven.xml
===================================================================
--- maven.xml	(revision 370203)
+++ maven.xml	(working copy)
@@ -217,7 +217,6 @@
 
         <echo>Install schema: ${jdo.tck.schema}
               for db ${jdo.tck.database} id ${jdo.tck.identitytype}</echo>
-        <!-- todo: abstract the command line below for other databases -->
         <java classname="org.apache.derby.tools.ij" fork="true">
               <classpath>
                   <pathelement location="${derbytools.jarfile}"/>
@@ -654,6 +653,8 @@
     <path id="iut.enhancer.classpath">
         <!-- Common enhancer classpath -->
         <path refid="jdo.tck.enhancer.classpath"/>
+        <!-- IUT enhancement classpath from build.properties -->
+        <pathelement path="${iut.enhancer.cp}" />
         <!-- Jar files for the Implementation Under Test -->
         <path refid="test_iut_jars" />
     </path>
@@ -670,6 +671,8 @@
     <path id="iut.classpath">
         <!-- Common TCK execution classpath -->
         <path refid="jdo.tck.execution.classpath" />
+        <!-- IUT execution classpath from build.properties -->
+        <pathelement path="${iut.runtck.classpath}" />
         <!-- Jar files for the implementation under test -->
         <path refid="test_iut_jars" />
     </path>
Index: build.properties
===================================================================
--- build.properties	(revision 0)
+++ build.properties	(revision 0)
@@ -0,0 +1,56 @@
+#
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at 
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+#########################################################################
+
+# The Implementation Under Test may change properties listed in this file
+# You may add items to the classpath by placing jars in iut_jars
+#    or by setting properties iut.runtck.classpath and iut.enhancer.classpath
+#
+# ${path.separator} is the platform independent path separator character
+
+# Identity types to be tested. Modify if only one identity type is supported.
+#   If uncommented, this value overrides the value in project.properties.
+#jdo.tck.identitytypes = applicationidentity datastoreidentity
+
+##
+# Properties for the execution of the TCK
+#
+iut.runtck.sysproperties = -Xmx512m
+iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
+
+##
+# Properties for the execution of the IUT enhancer
+#
+# "${enhanced.dir}" is the output directory for the enhanced classes
+#
+# ${jdo.tck.jdometadata.files} contains the list of jdo metadata files
+#
+iut.enhancer.main = org.jpox.enhancer.JPOXEnhancer
+iut.enhancer.options = -v -d "${enhanced.dir}"
+iut.enhancer.args = ${jdo.tck.jdometadata.files}
+iut.enhancer.sysproperties =
+iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
+
+##
+# Properties for the datastore
+#
+# jdo.tck.dblist may list multiple databases, separated by spaces
+#   You must install the schema yourself for databases other than derby
+#   If uncommented, this value overrides the value in project.properties.
+#jdo.tck.dblist = 
+## fix maven.xml to handle this
+# Add system properties for each database in jdo.tck.dblist if needed
+#   If uncommented, this value overrides the value in project.properties.
+#database.runtck.sysproperties =