Index: distrib/project.properties
===================================================================
--- distrib/project.properties	(Revision 0)
+++ distrib/project.properties	(Revision 0)
@@ -0,0 +1,397 @@
+#
+# 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.
+
+# Make sure the compiled class still work with J2SE 1.3
+maven.compile.source = 1.3
+maven.compile.target = 1.3
+
+# exclude list - tests listed here will not be executed
+jdo.tck.excludelist = ${basedir}/test/conf/exclude.list
+
+# Maven repository
+maven.repo.remote = http://www.ibiblio.org/maven, http://www.jpox.org/downloads/maven
+
+# 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
+
+# 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 =
+
+# JUnit settings
+jdo.tck.testrunnerclass = org.apache.jdo.tck.util.BatchTestRunner
+
+# Databasesettings
+database.runtck.sysproperties = -Dderby.system.home=${jdo.tck.testdir}/database/${jdo.tck.database}
+
+# JDO TCK settings
+# Setting this property to false will turn off cleanup of data from database to inspect database contents after test run
+jdo.tck.cleanupaftertest = true
+jdo.tck.dblist=derby
+jdo.tck.identitytypes=applicationidentity datastoreidentity
+jdo.tck.testclasses.dir = ${maven.build.dir}/classes
+jdo.tck.testdir = ${maven.build.dir}
+jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
+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.runtck.sysproperties = -Xmx512m
+
+# dependencies
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-api')}
+jpox.jdori.jarfile = ${pom.getDependencyPath('jpox:jpox')}
+jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
+bcel.jarfile = ${pom.getDependencyPath('bcel:bcel')}
+junit.jarfile = ${pom.getDependencyPath('junit:junit')}
+jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
+springcore.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
+springbeans.jarfile = ${pom.getDependencyPath('springframework:spring-beans')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+log4j.jarfile = ${pom.getDependencyPath('log4j')}
+derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
+derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
+core20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+enhancer20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
+xmlparser =
+
+# JDORI enhancer
+jdori.enhanced.dir = ${maven.build.dir}/enhanced/jdori
+jdori.enhancer.main = org.jpox.enhancer.JPOXEnhancer
+jdori.enhancer.options = -v -d "${enhanced.dir}"
+jdori.enhancer.args = ${jdo.tck.jdometadata.files}
+
+# connection pooling dependencies
+jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')}
+jpox.c3p0.jarfile = ${pom.getDependencyPath('jpox:jpox-c3p0')}
+c3p0.jarfile = ${pom.getDependencyPath('c3p0')}
+dbcp.jarfile = ${pom.getDependencyPath('commons-dbcp')}
+pool.jarfile = ${pom.getDependencyPath('commons-pool')}
+collections.jarfile = ${pom.getDependencyPath('commons-collections')}
+
+# jndi dependencies
+jndi = ${basedir}/lib/ext/fscontext.jar${path.separator}${basedir}/lib/ext/providerutil.jar
+
+# jpox dependencies
+
+jdo.tck.pcclasses.sources = \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java \
+    org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java \
+    org/apache/jdo/tck/pc/company/Address.java \
+    org/apache/jdo/tck/pc/company/Company.java \
+    org/apache/jdo/tck/pc/company/Department.java \
+    org/apache/jdo/tck/pc/company/Person.java \
+    org/apache/jdo/tck/pc/company/Employee.java \
+    org/apache/jdo/tck/pc/company/FullTimeEmployee.java \
+    org/apache/jdo/tck/pc/company/Insurance.java \
+    org/apache/jdo/tck/pc/company/DentalInsurance.java \
+    org/apache/jdo/tck/pc/company/MedicalInsurance.java \
+    org/apache/jdo/tck/pc/company/PartTimeEmployee.java \
+    org/apache/jdo/tck/pc/company/Project.java \
+    org/apache/jdo/tck/pc/fieldtypes/AllTypes.java \
+    org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java \
+    org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/ListCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/SetCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java \
+    org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java \
+    org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java \
+    org/apache/jdo/tck/pc/inheritance/AllPersist.java \
+    org/apache/jdo/tck/pc/inheritance/AllPersist2.java \
+    org/apache/jdo/tck/pc/inheritance/AllPersist3.java \
+    org/apache/jdo/tck/pc/inheritance/AllPersist4.java \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName.java \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName2.java \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName3.java \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName4.java \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistB.java \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistE.java \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistF.java \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistH.java \
+    org/apache/jdo/tck/pc/inheritance/TopPersist.java \
+    org/apache/jdo/tck/pc/inheritance/TopPersistE.java \
+    org/apache/jdo/tck/pc/inheritance/TopPersistF.java \
+    org/apache/jdo/tck/pc/inheritance/TopPersistH.java \
+    org/apache/jdo/tck/pc/mylib/PCClass.java \
+    org/apache/jdo/tck/pc/mylib/PCPoint.java \
+    org/apache/jdo/tck/pc/mylib/VersionedPCPoint.java \
+    org/apache/jdo/tck/pc/mylib/PCPoint2.java \
+    org/apache/jdo/tck/pc/mylib/PCRect.java \
+    org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java \
+    org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java \
+    org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.java \
+    org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.java \
+    org/apache/jdo/tck/pc/query/NoExtent.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java \
+    org/apache/jdo/tck/pc/shoppingcart/Undetachable.java \
+    org/apache/jdo/tck/pc/shoppingcart/Cart.java \
+    org/apache/jdo/tck/pc/shoppingcart/Product.java \
+    org/apache/jdo/tck/pc/shoppingcart/CartEntry.java
+
+jdo.tck.pcclasses.files = \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach$PC.class \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear$PC.class \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete$PC.class \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach$PC.class \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad$PC.class \
+    org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore$PC.class \
+    org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.class \
+    org/apache/jdo/tck/pc/company/Address.class \
+    org/apache/jdo/tck/pc/company/Company.class \
+    org/apache/jdo/tck/pc/company/Department.class \
+    org/apache/jdo/tck/pc/company/Person.class \
+    org/apache/jdo/tck/pc/company/Employee.class \
+    org/apache/jdo/tck/pc/company/FullTimeEmployee.class \
+    org/apache/jdo/tck/pc/company/Insurance.class \
+    org/apache/jdo/tck/pc/company/DentalInsurance.class \
+    org/apache/jdo/tck/pc/company/MedicalInsurance.class \
+    org/apache/jdo/tck/pc/company/PartTimeEmployee.class \
+    org/apache/jdo/tck/pc/company/Project.class \
+    org/apache/jdo/tck/pc/fieldtypes/AllTypes.class \
+    org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.class \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.class \
+    org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/ListCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/SetCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/SimpleClass.class \
+    org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.class \
+    org/apache/jdo/tck/pc/fieldtypes/VectorCollections.class \
+    org/apache/jdo/tck/pc/inheritance/AllPersist.class \
+    org/apache/jdo/tck/pc/inheritance/AllPersist2.class \
+    org/apache/jdo/tck/pc/inheritance/AllPersist3.class \
+    org/apache/jdo/tck/pc/inheritance/AllPersist4.class \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName.class \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName2.class \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName3.class \
+    org/apache/jdo/tck/pc/inheritance/FieldSameName4.class \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistB.class \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistE.class \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistF.class \
+    org/apache/jdo/tck/pc/inheritance/TopNonPersistH.class \
+    org/apache/jdo/tck/pc/inheritance/TopPersist.class \
+    org/apache/jdo/tck/pc/inheritance/TopPersistE.class \
+    org/apache/jdo/tck/pc/inheritance/TopPersistF.class \
+    org/apache/jdo/tck/pc/inheritance/TopPersistH.class \
+    org/apache/jdo/tck/pc/mylib/PCClass.class \
+    org/apache/jdo/tck/pc/mylib/PCPoint.class \
+    org/apache/jdo/tck/pc/mylib/VersionedPCPoint.class \
+    org/apache/jdo/tck/pc/mylib/PCPoint2.class \
+    org/apache/jdo/tck/pc/mylib/PCRect.class \
+    org/apache/jdo/tck/pc/mylib/PrimitiveTypes.class \
+    org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.class \
+    org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackNonPersistFdsClass.class \
+    org/apache/jdo/tck/pc/query/JDOQLKeywordsAsFieldNames.class \
+    org/apache/jdo/tck/pc/query/NoExtent.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.class \
+    org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.class\
+    org/apache/jdo/tck/pc/shoppingcart/Undetachable.class \
+    org/apache/jdo/tck/pc/shoppingcart/Cart.class \
+    org/apache/jdo/tck/pc/shoppingcart/Product.class \
+    org/apache/jdo/tck/pc/shoppingcart/CartEntry.class
+
+jdo.tck.paclasses.sources = \
+    org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java \
+    org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java \
+    org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java \
+    org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java \
+    org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java \
+    org/apache/jdo/tck/models/inheritance/TestParts.java \
+    org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java \
+    org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java \
+    org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java \
+    org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java \
+    org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java \
+    org/apache/jdo/tck/api/instancecallbacks/TestParts.java
+
+jdo.tck.paclasses.files = \
+    org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.class \
+    org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.class \
+    org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.class \
+    org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.class \
+    org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.class \
+    org/apache/jdo/tck/models/inheritance/TestParts.class \
+    org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.class \
+    org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.class \
+    org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.class \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.class \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.class \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.class \
+    org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.class \
+    org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.class \
+    org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.class \
+    org/apache/jdo/tck/api/instancecallbacks/TestParts.class
+
+jdo.tck.jdometadata.files = \
+    package.jdo \
+    org/apache/jdo/tck/api/instancecallbacks/package.jdo \
+    org/apache/jdo/tck/pc/company/package.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo \
+    org/apache/jdo/tck/pc/inheritance/package.jdo \
+    org/apache/jdo/tck/pc/instancecallbacks/package.jdo \
+    org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo \
+    org/apache/jdo/tck/pc/mylib/package.jdo \
+    org/apache/jdo/tck/pc/mylib/PCClass.jdo \
+    org/apache/jdo/tck/pc/query/package.jdo \
+    org/apache/jdo/tck/pc/singlefieldidentity/package.jdo \
+    org/apache/jdo/tck/pc/shoppingcart/package.jdo \
+    org/apache/jdo/tck/package.jdo
Index: distrib/maven.xml
===================================================================
--- distrib/maven.xml	(Revision 0)
+++ distrib/maven.xml	(Revision 0)
@@ -0,0 +1,695 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven"
+    xmlns:u="jelly:util"
+    >
+
+    <!-- ==================== -->
+    <!-- Default Global Goals -->
+    <!-- ==================== -->
+
+    <goal name="default">
+        <attainGoal name="jar"/>
+    </goal>
+
+    <goal name="help">
+        <echo>Custom goals for this project are:</echo>
+        <echo>  installSchema - installs the database schema</echo>
+        <echo></echo>
+        <echo>  enhance.iut - enhances persistence capable classes with the implementation under test enhancer if enhancement is not up to date</echo>
+        <echo>  enhance.jdori - enhances persistence capable classes with the JDO Reference Implementation enhancer if enhancement is not up to date</echo>
+        <echo></echo>
+        <echo>  runtck.iut - runs the TCK on the implementation under test</echo>
+        <echo>  runtck.jdori - runs the TCK on the JDO Reference Implementation</echo>
+        <echo></echo>
+        <echo>  debugtck.jdori - waits for a debugger to attach and then runs the TCK on the JDO RI</echo>
+        <echo>  debugtck.iut - waits for a debugger to attach and then runs the TCK on the implementation under test</echo>
+        <echo></echo>
+        <echo></echo>
+        <echo>Options for this project are:</echo>
+        <echo>  -Djdo.tck.cfglist=xxx - a list of configuration files (must be in test/conf)</echo>
+        <echo>  -Djdo.tck.dblist=xxx - a list of databases</echo>
+        <echo>  -Djdo.tck.identitytypes=xxx - a list of identity types (applicationidentity, datastoreidentity)</echo>
+        <echo>  -Djdo.tck.cleanupaftertest=xxx - true/false. Setting it to false will retain data in database after test. This will allow inspection of data after test is run. Default is true</echo>
+        <echo>  -Djdo.tck.debug.port=##### - the port number the JVM should listen for a debugger on (default 8787)</echo>
+        <echo>  -Djdo.tck.debug.jvmargs=xxx - the "-Xdebug ..." arguments in the event you want to supply your own debug directives</echo>
+        <echo></echo>
+        <echo>Examples:</echo>
+        <echo>  maven -Djdo.tck.identitytypes=datastoreidentity installSchema</echo>
+        <echo>      Installs the database schema for datastore identity for all supported databases</echo>
+        <echo></echo>
+        <echo>  maven -Djdo.tck.cfglist="alltests.conf cfg1.conf" runtck.jdori</echo>
+        <echo>      Runs the test configurations specified in alltests.conf and cfg1.conf on the JDORI, using all supported identity types and databases. </echo>
+        <echo></echo>
+        <echo>  maven -Djdo.tck.cfglist=detach.conf debugtck.jdori</echo>
+        <echo>      Runs the test detach.conf configuration, waiting for a debugger to attach on the default port</echo>
+        <echo></echo>
+        <echo>  maven -Djdo.tck.cfglist=detach.conf -Djdo.tck.debug.port=9343 debugtck.jdori</echo>
+        <echo>      Runs the test detach.conf configuration, waiting for a debugger to attach on port 9343</echo>
+        <echo></echo>
+        <echo>Note:</echo>
+        <echo>  By default, the database schema is NOT installed when the custom goals runtck.iut and runtck.jdori are run.</echo>
+        <echo>  maven build installs the database schema and runs the TCK on the JDO Reference Implementation.</echo>
+        <echo>  Enhancement is always done before running the TCK when the enhanced classes are not up to date.</echo>
+    </goal>
+
+    <goal name="build">
+        <attainGoal name="default"/>
+        <attainGoal name="setProps"/>
+        <attainGoal name="privateInstallSchema"/>
+    </goal>
+
+    <goal name="rebuild">
+        <attainGoal name="clean"/>
+        <attainGoal name="build"/>
+    </goal>
+
+    <goal name="clobber" prereqs="clean">
+        <delete>
+            <fileset dir="." defaultexcludes="no" includes="**/*~"/>
+        </delete>
+    </goal>
+
+    <!-- ================== -->
+    <!-- Set properties     -->
+    <!-- ================== -->
+
+    <goal name="setProps">
+        <echo>setProps:</echo>
+
+        <j:set var="zeroval" value="0"/>
+        <j:set var="spaceval" value=" "/>
+        <j:set var="nullval" value=""/>
+
+        <j:set var="cfglist" value="${jdo.tck.cfglist}"/>
+        <j:if test="${cfglist == null}">
+            <u:properties file="${basedir}/test/conf/configurations.list"/>
+        </j:if>
+
+        <echo>Configurations for this run are "${jdo.tck.cfglist}". To override this, use -Djdo.tck.cfglist=xxx on the maven command line.</echo>
+        <u:tokenize var="jdo.tck.cfglist" delim=" ">
+            ${jdo.tck.cfglist}
+        </u:tokenize>
+
+        <echo>Databases for this run are "${jdo.tck.dblist}". To override this, use -Djdo.tck.dblist=xxx on the maven command line.</echo>
+        <u:tokenize var="jdo.tck.dblist" delim=" ">
+            ${jdo.tck.dblist}
+        </u:tokenize>
+
+        <echo>Identity types for this run are "${jdo.tck.identitytypes}". To override this, use -Djdo.tck.identitytypes=xxx on the maven command line.</echo>
+        <u:tokenize var="jdo.tck.identitytypes" delim=" ">
+            ${jdo.tck.identitytypes}
+        </u:tokenize>
+
+    </goal>
+
+    <goal name="exclude">
+
+        <j:new var="testclasses" className="java.util.Vector"/>
+        <u:tokenize var="jdo.tck.classes" delim=" ">
+            ${jdo.tck.classes}
+        </u:tokenize>
+        <j:forEach var="class" items="${jdo.tck.classes}">
+            <j:set var="foo" value="${testclasses.add(class)}"/>
+        </j:forEach>
+
+        <u:properties file="${jdo.tck.excludelist}"/>
+        <u:tokenize var="jdo.tck.exclude" delim=" ">
+            ${jdo.tck.exclude}
+        </u:tokenize>
+        <j:forEach var="excludedclass" items="${jdo.tck.exclude}">
+            <j:set var="foo" value="${testclasses.remove(excludedclass)}"/>
+        </j:forEach>
+
+        <j:new var="strbuf" className="java.lang.StringBuffer"/>
+        <j:forEach var="class" items="${testclasses}">
+            <j:set var="foo" value="${strbuf.append(class)}"/>
+            <j:set var="foo" value="${strbuf.append(spaceval)}"/>
+        </j:forEach>
+        <j:set var="jdo.tck.classes" value="${strbuf}"/>
+
+    </goal>
+
+    <goal name="setDebugProps">
+        <j:set var="debugJvmargs" value="${jdo.tck.debug.jvmargs}" defaultValue=""/>
+        <j:if test="${empty debugJvmargs}">
+            <j:set var="debugPort" value="${jdo.tck.debug.port}" defaultValue=""/>
+            <j:if test="${empty debugPort}">
+                <property name="jdo.tck.debug.port" value="8787"/>
+            </j:if>
+
+            <property name="jdo.tck.debug.jvmargs"
+                value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${jdo.tck.debug.port}"
+            />
+        </j:if>
+
+        <echo>Using debug arguments:</echo>
+        <echo>${jdo.tck.debug.jvmargs}</echo>
+    </goal>
+
+    <!-- ================== -->
+    <!-- Install schema     -->
+    <!-- ================== -->
+
+    <goal name="installSchema" prereqs="setProps">
+        <attainGoal name="privateInstallSchema"/>
+    </goal>
+
+    <goal name="privateInstallSchema">
+        <mkdir dir="${jdo.tck.log.directory.database}"/>
+        <!-- load mappings into a HashSet to unique them -->
+        <j:new var="uniqueMappings" className="java.util.HashSet"/>
+        <j:forEach var="cfg" items="${jdo.tck.cfglist}">
+            <u:properties file="${basedir}/test/conf/${cfg}"/>
+            <j:set var="mapping" value="${jdo.tck.mapping}"/>
+            <j:set var="foo">
+                <j:expr value="${uniqueMappings.add(mapping)}"/>
+            </j:set>
+        </j:forEach>
+
+        <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
+            <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+                <j:forEach var="nextMapping"
+                           items="${uniqueMappings.iterator()}">
+                    <attainGoal name="doInstallSchema"/>
+                </j:forEach>
+            </j:forEach>
+        </j:forEach>
+    </goal>
+
+    <goal name="doInstallSchema">
+        <!-- Set schema name from mapping designator -->
+        <j:choose>
+            <j:when test="${nextMapping == zeroval}">
+                <j:set var="jdo.tck.schema" value="schema.sql"/>
+            </j:when>
+            <j:otherwise>
+                <j:set var="jdo.tck.schema" value="schema${nextMapping}.sql"/>
+            </j:otherwise>
+        </j:choose>
+
+        <mkdir dir="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
+        <copy todir="${jdo.tck.testdir}/database/${jdo.tck.database}">
+            <fileset dir="${basedir}/test/conf">
+               <include name="${jdo.tck.database}.properties"/>
+            </fileset>
+        </copy>
+
+        <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}"/>
+                  <pathelement location="${derby.jarfile}"/>
+              </classpath>
+              <arg value="${basedir}/test/sql/${jdo.tck.database}/${jdo.tck.identitytype}/${jdo.tck.schema}"/>
+              <sysproperty key="derby.system.home"
+                      value="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
+        </java>
+    </goal>
+
+    <!-- ================== -->
+    <!-- Run test cases     -->
+    <!-- ================== -->
+
+    <goal name="debugtck.iut">
+        <attainGoal name="setDebugProps"/>
+        <attainGoal name="runtck.iut"/>
+    </goal>
+
+    <goal name="runtck.iut" prereqs="setProps">
+        <mkdir dir="${jdo.tck.log.directory.database}"/>
+        <attainGoal name="privateRuntck.iut"/>
+        <attainGoal name="result"/>
+    </goal>
+
+    <goal name="privateRuntck.iut"
+          prereqs="java:compile, copyprops, doEnhance.iut">
+        <!-- Run tests for all databases, identity types, and configurations -->
+        <tstamp>
+            <format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
+        </tstamp>
+        <mkdir dir="${jdo.tck.log.directory}/${timestamp}"/>
+        <echo>Run all configurations on iut</echo>
+        <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
+            <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+                <j:forEach var="jdo.tck.cfg" items="${jdo.tck.cfglist}">
+                    <!-- get jdo.tck.classes (list of testclasses),
+                         jdo.tck.testdata, jdo.tck.mapping -->
+                    <u:properties file="${basedir}/test/conf/${jdo.tck.cfg}"/>
+                    <attainGoal name="exclude"/>
+                    <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)}"/>
+                    </j:set>
+                    <attainGoal name="doRuntck.iut"/>
+                </j:forEach>
+            </j:forEach>
+        </j:forEach>
+    </goal>
+
+    <goal name="debugtck.jdori">
+        <attainGoal name="setDebugProps"/>
+        <attainGoal name="runtck.jdori"/>
+    </goal>
+
+    <goal name="runtck.jdori" prereqs="setProps">
+        <mkdir dir="${jdo.tck.log.directory.database}"/>
+        <attainGoal name="privateRuntck.jdori"/>
+        <attainGoal name="result"/>
+    </goal>
+
+    <goal name="privateRuntck.jdori"
+          prereqs="java:compile, copyprops, doEnhance.jdori">
+        <!-- Run tests for all databases, identity types, and configurations -->
+        <tstamp>
+            <format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
+        </tstamp>
+        <mkdir dir="${jdo.tck.log.directory}/${timestamp}"/>
+        <echo>Run all configurations on jdori</echo>
+        <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
+            <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+                <j:forEach var="jdo.tck.cfg" items="${jdo.tck.cfglist}">
+                    <u:properties file="${basedir}/test/conf/${jdo.tck.cfg}"/>
+                    <attainGoal name="exclude"/>
+                    <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)}"/>
+                    </j:set>
+                    <attainGoal name="doRuntck.jdori"/>
+                </j:forEach>
+            </j:forEach>
+        </j:forEach>
+    </goal>
+
+    <goal name="doRuntck.iut">
+        <echo>Run JDO TCK on the IUT </echo>
+        <path id="this.iut.classpath">
+            <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+            <path refid="iut.classpath"/>
+        </path>
+         <u:loadText file="${basedir}/test/conf/${iut.pmf.properties}"
+                    var="PMFProps"/>
+        <j:file name="${jdo.tck.testclasses.dir}/${iut.pmf.properties}"
+                omitXmlDeclaration="true">
+            ${PMFProps}
+            ### Properties below added by maven goal doRuntck.jdori
+            javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}
+            javax.jdo.mapping.Schema=${schemaname}
+        </j:file>
+        
+
+        <j:set var="debugJvmargs" value="${jdo.tck.debug.jvmargs}"/>
+        <j:if test="${not empty debugJvmargs}">
+            <echo>JVM will wait until debugger attaches on port ${jdo.tck.debug.port}...</echo>
+        </j:if>
+        
+        <java fork="yes" dir="${jdo.tck.testdir}"
+              classname="${jdo.tck.testrunnerclass}">
+            <classpath refid="this.iut.classpath"/>
+            <sysproperty key="ResultPrinterClass"
+                         value="${jdo.tck.resultprinterclass}"/>
+            <sysproperty key="verbose" value="${verbose}"/>
+            <sysproperty key="PMFProperties"
+                         value="${jdo.tck.testclasses.dir}/${iut.pmf.properties}"/>
+            <sysproperty key="PMF2Properties"
+                         value="${jdo.tck.testclasses.dir}/${iut.pmf.properties}"/>
+            <sysproperty key="jdo.tck.testdata" value="${jdo.tck.testdata}"/>
+            <sysproperty key="jdo.tck.standarddata"
+                         value="${jdo.tck.standarddata}"/>
+            <sysproperty key="jdo.tck.description"
+                         value="${jdo.tck.description}"/>
+            <sysproperty key="jdo.tck.identitytype"
+                         value="${jdo.tck.identitytype}"/>
+            <sysproperty key="jdo.tck.database"
+                         value="${jdo.tck.database}"/>
+            <sysproperty key="jdo.tck.cfg"
+                         value="${jdo.tck.cfg}"/>
+            <sysproperty key="jdo.tck.exclude"
+                         value="${jdo.tck.exclude}"/>
+            <sysproperty key="jdo.tck.log.directory"
+                         value="${jdo.tck.log.directory}/${timestamp}"/>
+            <sysproperty key="jdo.tck.cleanupaftertest"
+                         value="${jdo.tck.cleanupaftertest}"/>             
+            <sysproperty key="jdo.tck.requiredOptions"
+                         value="${jdo.tck.requiredOptions}"/>
+                         
+            <jvmarg line="${database.runtck.sysproperties}"/>
+            <jvmarg line="${iut.runtck.sysproperties}"/>
+            <jvmarg line="${jdo.tck.debug.jvmargs}"/>
+            
+            <arg line="${jdo.tck.classes}"/>
+        </java>
+    </goal>
+
+    <goal name="doRuntck.jdori">
+        <path id="this.jdori.classpath">
+            <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+            <path refid="jdori.classpath"/>
+        </path>
+        <u:loadText file="${basedir}/test/conf/${jdori.pmf.properties}"
+                    var="PMFProps"/>
+        <j:file name="${jdo.tck.testclasses.dir}/${jdori.pmf.properties}"
+                omitXmlDeclaration="true">
+            ${PMFProps}
+            ### Properties below added by maven goal doRuntck.jdori
+            javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}
+            javax.jdo.mapping.Schema=${schemaname}
+        </j:file>
+        
+        <j:set var="debugJvmargs" value="${jdo.tck.debug.jvmargs}"/>
+        <j:if test="${not empty debugJvmargs}">
+            <echo>JVM will wait until debugger attaches on port ${jdo.tck.debug.port}...</echo>
+        </j:if>
+        
+        <java fork="yes" dir="${jdo.tck.testdir}"
+               classname="${jdo.tck.testrunnerclass}">
+            <classpath refid="this.jdori.classpath"/>
+            <sysproperty key="ResultPrinterClass"
+                         value="${jdo.tck.resultprinterclass}"/>
+            <sysproperty key="verbose" value="${verbose}"/>
+            <sysproperty key="PMFProperties"
+                         value="${jdo.tck.testclasses.dir}/${jdori.pmf.properties}"/>
+            <sysproperty key="PMF2Properties"
+                         value="${jdo.tck.testclasses.dir}/${jdori.pmf.properties}"/>
+            <sysproperty key="jdo.tck.testdata" value="${jdo.tck.testdata}"/>
+            <sysproperty key="jdo.tck.standarddata"
+                         value="${jdo.tck.standarddata}"/>
+            <sysproperty key="jdo.tck.description"
+                         value="${jdo.tck.description}"/>
+            <sysproperty key="jdo.tck.identitytype"
+                         value="${jdo.tck.identitytype}"/>
+            <sysproperty key="jdo.tck.database"
+                         value="${jdo.tck.database}"/>
+            <sysproperty key="jdo.tck.cfg"
+                         value="${jdo.tck.cfg}"/>
+            <sysproperty key="jdo.tck.exclude"
+                         value="${jdo.tck.exclude}"/>
+            <sysproperty key="jdo.tck.log.directory"
+                         value="${jdo.tck.log.directory}/${timestamp}"/>
+            <sysproperty key="jdo.tck.cleanupaftertest"
+                         value="${jdo.tck.cleanupaftertest}"/>
+            <sysproperty key="jdo.tck.requiredOptions"
+                         value="${jdo.tck.requiredOptions}"/>
+                         
+            <jvmarg line="${database.runtck.sysproperties}"/>
+            <jvmarg line="${jdori.runtck.sysproperties}"/>
+            <jvmarg line="${jdo.tck.debug.jvmargs}"/>
+            
+            <arg line="${jdo.tck.classes}"/>
+        </java>
+        <echo>Finished run with database="${jdo.tck.database}" identitytype="${jdo.tck.identitytype}" mapping="${jdo.tck.mapping}".</echo>
+    </goal>
+
+    <goal name="result">
+        <java fork="yes" dir="${jdo.tck.testdir}"
+               classname="org.apache.jdo.tck.util.ResultSummary">
+            <classpath refid="jdori.classpath"/>
+            <arg line="${jdo.tck.log.directory}/${timestamp}"/>
+        </java>
+    </goal>
+
+    <!-- ================== -->
+    <!-- Enhance PC classes -->
+    <!-- ================== -->
+
+    <goal name="enhance.jdori" prereqs="setProps">
+        <attainGoal name="doEnhance.jdori"/>
+    </goal>
+
+    <goal name="enhance.iut" prereqs="setProps">
+        <attainGoal name="doEnhance.iut"/>
+    </goal>
+
+    <goal name="enhance.check">
+        <condition property="enhancement.required">
+            <not>
+                <uptodate targetfile="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar">
+                    <srcfiles dir="${basedir}/test/jdo/${jdo.tck.identitytype}"
+                          includes="**/*.jdo, **/*.jdoquery, **/*.jdoTest.properties"/>
+                    <srcfiles dir="${basedir}/test/java"
+                          includes="${jdo.tck.pcclasses.sources},
+                                    ${jdo.tck.paclasses.sources}"/>
+                </uptodate>
+            </not>
+        </condition>
+    </goal>
+
+    <goal name="enhance.prepare" prereqs="java:compile, copyprops">
+        <!-- create enhancer log dir -->
+        <mkdir dir="${jdo.tck.log.directory.enhancer}"/>
+        <!-- copy metadata -->
+        <mkdir dir="${enhanced.dir}" />
+        <copy todir="${enhanced.dir}">
+            <fileset dir="${basedir}/test/jdo/${jdo.tck.identitytype}"
+                     includes="**/*.jdo, **/*.jdoquery, **/jdoTest.properties"/>
+        </copy>
+        <!-- compile pc and pa classes -->
+        <javac srcdir="${basedir}/test/java"
+           includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
+           destdir="${enhanced.dir}"
+           debug="on"
+           classpathref="jdo.tck.enhancer.classpath">
+        </javac>
+    </goal>
+
+    <goal name="doEnhance.iut">
+        <j:set var="jdo.tck.enhanced.dir" value="${iut.enhanced.dir}"/>
+        <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+            <j:set var="enhanced.dir"
+                   value="${iut.enhanced.dir}/${jdo.tck.identitytype}"/>
+            <attainGoal name="enhance.check"/>
+            <j:if test="${enhancement.required}">
+                <echo>Run IUT enhancer for ${jdo.tck.identitytype}</echo>
+                <attainGoal name="enhance.prepare"/>
+                <path id="enhance.classpath">
+                    <path refid="iut.enhancer.classpath"/>
+                    <pathelement location="${enhanced.dir}"/>
+                </path>
+                <java fork="yes" failonerror="yes" 
+                      dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
+                      classname="${iut.enhancer.main}"
+                      classpathref="enhance.classpath">
+                     <sysproperty key="jdo.tck.identitytype"
+                                  value="${jdo.tck.identitytype}"/>
+                     <sysproperty key="jdo.tck.log.directory"
+                                  value="${jdo.tck.log.directory.enhancer}"/>
+                     <jvmarg line="${iut.enhancer.sysproperties}"/>
+                     <arg line="${iut.enhancer.options}"/>
+                     <arg line="${iut.enhancer.args}"/>
+                </java>
+            </j:if>
+            <attainGoal name="package.iut"/>
+        </j:forEach>
+    </goal>
+
+    <goal name="doEnhance.jdori">
+        <j:set var="jdo.tck.enhanced.dir" value="${jdori.enhanced.dir}"/>
+        <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+            <j:set var="enhanced.dir"
+                   value="${jdori.enhanced.dir}/${jdo.tck.identitytype}"/>
+            <attainGoal name="enhance.check"/>
+            <j:if test="${enhancement.required}">
+                <echo>Run JDORI enhancer for ${jdo.tck.identitytype}</echo>
+                <attainGoal name="enhance.prepare"/>
+                <path id="enhance.classpath">
+                    <path refid="jdori.enhancer.classpath"/>
+                    <pathelement location="${enhanced.dir}"/>
+                </path>
+                <java fork="yes" failonerror="yes" 
+                      dir="${enhanced.dir}"
+                      classname="${jdori.enhancer.main}"
+                      classpathref="enhance.classpath">
+                     <sysproperty key="jdo.tck.identitytype"
+                                  value="${jdo.tck.identitytype}"/>
+                     <sysproperty key="jdo.tck.log.directory"
+                                  value="${jdo.tck.log.directory.enhancer}"/>
+                     <jvmarg line="${jdori.enhancer.sysproperties}"/>
+                     <arg line="${jdori.enhancer.options}"/>
+                     <arg line="${jdori.enhancer.args}"/>
+                </java>
+            </j:if>
+            <attainGoal name="package.jdori"/>
+        </j:forEach>
+    </goal>
+
+    <!-- ========= -->
+    <!-- Package   -->
+    <!-- ========= -->
+
+    <goal name="package.iut">
+        <attainGoal name="package"/>
+    </goal>
+
+    <goal name="package.jdori">
+        <attainGoal name="package"/>
+    </goal>
+
+    <goal name="package">
+        <copy todir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}">
+            <fileset dir="${basedir}/test/orm/${jdo.tck.identitytype}"
+                     includes="**/*.orm"/>
+            <fileset dir="${basedir}/test/testdata"
+                     includes="**/*.xml"/>
+        </copy>
+        <delete file="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+        <jar jarfile="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar">
+            <fileset dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}" 
+                 includes="**/*.class, **/*.jdo, **/*.jdoquery **/*.orm, **/*.xml, **/jdoTest.properties"/>
+        </jar>
+    </goal>
+
+    <!-- ========= -->
+    <!-- Classpath -->
+    <!-- ========= -->
+
+    <ant:property file="${basedir}/test/conf/alltests.list"/>
+
+    <!-- Jar files for the Implementation Under Test -->
+    <path id="test_iut_jars" >
+        <fileset dir="${basedir}/iut_jars" includes="*.jar"/>
+    </path>
+
+    <!-- Jar files for the Reference Implementation -->
+    <path id="jdo.jdori.classpath">
+        <pathelement location="${jpox.jdori.jarfile}" />
+        <pathelement location="${jpox.enhancer.jarfile}" />
+        <pathelement location="${jta.jarfile}" />
+        <pathelement location="${xmlparser}" />
+        <pathelement location="${bcel.jarfile}" />
+        <pathelement location="${log4j.jarfile}" />
+        <pathelement location="${jpox.dbcp.jarfile}" />
+        <pathelement location="${jpox.c3p0.jarfile}" />
+    </path>
+
+    <!-- Jar files for connection pooling -->
+    <path id="jdo.connectionpooling.classpath">
+        <pathelement location="${c3p0.jarfile}"/>
+        <pathelement location="${dbcp.jarfile}"/>
+        <pathelement location="${pool.jarfile}"/>
+        <pathelement location="${collections.jarfile}"/>
+    </path>
+
+    <!-- Jar files for the Spring framework -->
+    <path id="jdo.spring.classpath">
+        <pathelement location="${springcore.jarfile}"/>
+        <pathelement location="${springbeans.jarfile}"/>
+    </path>
+
+    <!-- Common enhancer classpath -->
+    <path id="jdo.tck.enhancer.classpath">
+        <!-- Directory where JDOTCK class files are located  -->
+        <pathelement location="${jdo.tck.testclasses.dir}"/>
+        <!-- JDO jar file  -->
+        <pathelement location="${jdo.jdoapi.jarfile}"/>
+        <!-- JUnit jar file -->
+        <pathelement location="${junit.jarfile}"/>
+        <!-- Commons-logging jar file (for compiling pa/pc classes) -->
+        <pathelement location="${logging.jarfile}"/>
+    </path>
+
+    <!-- Common TCK execution classpath -->
+    <path id="jdo.tck.execution.classpath">
+       <!-- Directory where JDOTCK class files are located  -->
+        <pathelement location="${jdo.tck.testclasses.dir}"/>
+        <!-- JDO jar file  -->
+        <pathelement location="${jdo.jdoapi.jarfile}"/>
+        <!-- Commons logging jar file  -->
+        <pathelement location="${logging.jarfile}"/>
+        <pathelement location="${jta.jarfile}" />
+        <!-- JUnit jar file -->
+        <pathelement location="${junit.jarfile}"/>
+        <!-- Spring jar files -->
+        <path refid="jdo.spring.classpath" />
+        <!-- Jar files for connection pooling -->
+        <path refid="jdo.connectionpooling.classpath" />
+        <!-- Jar files for jndi -->
+        <pathelement path="${jndi}"/>
+        <!-- Jar files for database -->
+        <pathelement location="${derby.jarfile}" />
+    </path>
+
+    <!-- Paths needed for enhancement by JDORI enhancer. -->
+    <path id="jdori.enhancer.classpath">
+        <!-- Common enhancer classpath -->
+        <path refid="jdo.tck.enhancer.classpath"/>
+        <!-- Jar files for the Reference Implementation -->
+        <path refid="jdo.jdori.classpath" />
+    </path>
+
+    <!-- Paths needed for enhancement by IUT enhancer. -->
+    <path id="iut.enhancer.classpath">
+        <!-- Common enhancer classpath -->
+        <path refid="jdo.tck.enhancer.classpath"/>
+        <!-- Jar files for the Implementation Under Test -->
+        <path refid="test_iut_jars" />
+    </path>
+
+    <!-- Paths needed to run the TCK on the JDO Reference Implementation. -->
+    <path id="jdori.classpath">
+        <!-- Common TCK execution classpath -->
+        <path refid="jdo.tck.execution.classpath" />
+        <!-- Jar files for the Reference Implementation -->
+        <path refid="jdo.jdori.classpath" />
+    </path>
+
+    <!-- Paths needed to run the TCK on the Implementation Under Test. -->
+    <path id="iut.classpath">
+        <!-- Common TCK execution classpath -->
+        <path refid="jdo.tck.execution.classpath" />
+        <!-- Jar files for the implementation under test -->
+        <path refid="test_iut_jars" />
+    </path>
+
+    <!-- ==== -->
+    <!-- Misc -->
+    <!-- ==== -->
+
+    <goal name="copyprops">
+       <echo>copyprops:</echo>
+        <copy todir="${jdo.tck.testclasses.dir}" >
+            <fileset dir="${basedir}/test/conf">
+               <include name="commons-logging.properties"/>
+               <include name="simplelog.properties"/>
+               <include name="logging.properties"/>
+               <include name="log4j.properties"/>
+               <include name="jndi.properties"/>
+            </fileset>
+            <fileset dir="${basedir}/test/java">
+                <include name="**/*.xml"/>
+            </fileset>
+        </copy>
+    </goal>
+
+</project>
Index: distrib/project.xml
===================================================================
--- distrib/project.xml	(Revision 0)
+++ distrib/project.xml	(Revision 0)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<project>
+    <pomVersion>3</pomVersion>
+    <!-- ============== -->
+    <!-- Identification -->
+    <!-- ============== -->
+    <name>JDO2 Technology Compatibility Kit</name>
+    <groupId>org.apache.jdo</groupId>
+    <artifactId>jdo2-tck</artifactId>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+    <inceptionYear>2005</inceptionYear>
+    <currentVersion>beta</currentVersion>
+    <package>org.apache.jdo.tck</package>
+    <shortDescription>Java Data Object 2.0 (JDO) TCK</shortDescription>
+    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process.
+
+The JDO TCK is a test suite designed to test implementations of the Java Data Objects specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
+
+NOTE!! This project has a nonstandard structure. The source files are located in the test directory.  However the build treats this directory as the source directory.  There are no unit tests in this project.</description>
+    <repository />
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-api</artifactId>
+            <version>beta</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-enhancer</artifactId>
+            <version>beta</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-core</artifactId>
+            <version>beta</version>
+        </dependency>
+        <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox-enhancer</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>10.1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>bcel</groupId>
+            <artifactId>bcel</artifactId>
+            <version>5.1</version>
+            <url>http://jakarta.apache.org/bcel/</url>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jta</artifactId>
+            <version>1.0.1B-rc2</version>
+        </dependency>
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+        <!-- dependencies for connection pooling -->
+        <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox-c3p0</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox-dbcp</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>c3p0</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.0</version>
+            <url>http://prdownloads.sourceforge.net/c3p0/c3p0-0.9.0.bin.zip?use_mirror=unc</url>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.1</version>
+        </dependency>
+    </dependencies>
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+    <build>
+        <sourceDirectory>test/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/test/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+        <resources>
+            <resource>
+                <directory>${basedir}/test/conf</directory>
+                <includes>
+                    <include>enhancement-test.properties</include>
+                    <include>commons-logging.properties</include>
+                    <include>simplelog.properties</include>
+                    <include>logging.properties</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+</project>
+
Index: project.properties
===================================================================
--- project.properties	(Revision 369231)
+++ project.properties	(Arbeitskopie)
@@ -33,8 +33,6 @@
 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
Index: maven.xml
===================================================================
--- maven.xml	(Revision 369231)
+++ maven.xml	(Arbeitskopie)
@@ -674,6 +674,29 @@
         <path refid="test_iut_jars" />
     </path>
 
+    <!-- ============ -->
+    <!-- Distribution -->
+    <!-- ============ -->
+
+    <goal name="distrib">
+        <jar destfile="distrib/${pom.artifactId}-beta-distrib.jar">
+             <fileset dir=".">
+                 <include name="LICENSE.txt"/>
+                 <include name="test/**"/>
+                 <include name="iut_jars"/>
+                 <exclude name="**/.svn/**"/>
+             </fileset>
+             <fileset dir="distrib">
+                 <include name="project.xml"/>
+                 <include name="project.properties"/>
+                 <include name="maven.xml"/>
+             </fileset>
+             <fileset dir="..">
+                 <include name="lib/ext"/>
+             </fileset>
+        </jar>
+    </goal>
+
     <!-- ==== -->
     <!-- Misc -->
     <!-- ==== -->