diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index bcaa87626..bcf7b02e8 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -102,6 +102,24 @@
org.apache.maven.plugins
maven-antrun-plugin
+
+ tckinit
+ pre-integration-test
+
+
+ Running Sun JPA 2.0 TCK Init
+
+
+
+
+
+
+
+
+
+ run
+
+
run-tck
integration-test
@@ -109,229 +127,44 @@
Running Sun JPA 2.0 TCK
-
-
-
- The TCK file specified in the "tck.zip" system property (${tck.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA 2.0 TCK
-
-
-
- The TCK patches file specified in the "tck_patches.zip" system property (${tck_patches.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA 2.0 TCK
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
-openjpa.ConnectionDriverName: ${db.driver}
-openjpa.ConnectionURL: ${db.url}
-openjpa.ConnectionUserName: ${db.username}
-openjpa.ConnectionPassword: ${db.password}
-openjpa.FetchBatchSize: -1
-openjpa.Compatibility: StrictIdentityValues=true
-openjpa.Sequence: time
-openjpa.Log: DefaultLevel=${openjpa.log.level}
-openjpa.jdbc.DBDictionary: StoreCharsAsNumbers=true
-openjpa.jdbc.SchemaFactory: native(ForeignKeys=true)
-openjpa.jdbc.SynchronizeMappings: buildSchema(ForeignKeys=true)
-
-
-
-
-
-
-
-
-#########################################################################
-## OpenJPA specific properties follow
-#########################################################################
-
-jpa.home=${tck.dir}
-work.dir=${jpatck.work.dir}
-report.dir=${jpatck.reports.dir}
-jpa.classes=${cp.property}
-# jpa.classes includes Derby, so only set database.classes for other DBs
-database.classes=
-# Need to specify java.* classes, both in Windows/UNIX locations as well as Mac.
-# This includes a few different possible locations; only one of them needs to
-# actually work for a given environment.
-sigTestClasspath=${JAVA_HOME}/lib/rt.jar${path.separator}${JAVA_HOME}/jre/lib/rt.jar${path.separator}${JAVA_HOME}/../Classes/classes.jar${path.separator}$${jpa.classes}
-persistence.unit.properties.file.full.path=${openjpa.properties}
-database.user=${db.username}
-database.passwd=${db.password}
-database.url=${db.url}
-database.driver=${db.driver}
-databaseName=${db.name}
-
-
-
-
- Update directory paths if running on Windows
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AGENT: ${agent}${agent.properties}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Logging JPA 2.0 TCK output to ${tck.log}
-
-
- Calling TCK initdb.xml
-
- TCK initdb.xml returned result=${tsant.result}
-
-
- Calling TCK build.xml
-
- TCK build.xml returned result=${tsant.result}
-
-
-
-
-
-
-
- Results archive at: ${tck.results.archive}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- TCK Results - Passed: ${count.passed}, Failed: ${count.failed}
-
-
-
-
-
-
- ${count.failed} tests failed
-
- Passed JPA 2.0 TCK!
+
+
+
+
+
+
diff --git a/openjpa-integration/tck/tck2.xml b/openjpa-integration/tck/tck2.xml
new file mode 100644
index 000000000..02b077bb3
--- /dev/null
+++ b/openjpa-integration/tck/tck2.xml
@@ -0,0 +1,387 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The TCK file specified in the "tck.zip" system property (${tck.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA 2.0 TCK
+
+
+
+ The TCK patches file specified in the "tck_patches.zip" system property (${tck_patches.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA 2.0 TCK
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
+openjpa.ConnectionDriverName: ${db.driver}
+openjpa.ConnectionURL: ${db.url}
+openjpa.ConnectionUserName: ${db.username}
+openjpa.ConnectionPassword: ${db.password}
+openjpa.FetchBatchSize: -1
+openjpa.Compatibility: StrictIdentityValues=true
+openjpa.Sequence: time
+openjpa.Log: DefaultLevel=${openjpa.log.level}
+openjpa.jdbc.DBDictionary: StoreCharsAsNumbers=true
+openjpa.jdbc.SchemaFactory: native(ForeignKeys=true)
+openjpa.jdbc.SynchronizeMappings: buildSchema(ForeignKeys=true)
+
+
+
+
+
+
+
+
+#########################################################################
+## OpenJPA specific properties follow
+#########################################################################
+
+jpa.home=${tck.dir}
+work.dir=${tck.work}
+report.dir=${tck.reports}
+jpa.classes=${cp.property}
+# jpa.classes includes Derby, so only set database.classes for other DBs
+database.classes=
+# different properties needed for pluggability bucket
+openjpa.properties=${openjpa.properties}
+toplink.properties=${toplink.properties}
+# Need to specify java.* classes, both in Windows/UNIX locations as well as Mac.
+# This includes a few different possible locations; only one of them needs to
+# actually work for a given environment.
+sigTestClasspath=${JAVA_HOME}/lib/rt.jar${path.separator}${JAVA_HOME}/jre/lib/rt.jar${path.separator}${JAVA_HOME}/../Classes/classes.jar${path.separator}$${jpa.classes}
+persistence.unit.properties.file.full.path=${provider.properties}
+database.user=${db.username}
+database.passwd=${db.password}
+database.url=${db.url}
+database.driver=${db.driver}
+databaseName=${db.name}
+
+
+
+
+ Update directory paths if running on Windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AGENT: ${agent}${agent.properties}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Logging JPA 2.0 TCK output to ${tck.log}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TCK Results - Passed: ${count.passed}, Failed: ${count.failed}
+
+
+
+
+
+
+ Running Sun JPA 2.0 TCK - w/o Pluggability tests
+ Init must have been called before running this target!
+
+
+
+
+
+ The OPENJPA_CLASSPATH was not provided and needs to point to the required OpenJPA and Derby runtime jars.
+
+
+
+
+
+
+
+
+
+
+
+ Calling TCK initdb.xml
+
+ TCK initdb.xml returned result=${tsant.result}
+
+
+ Calling TCK build.xml
+
+ TCK build.xml returned result=${tsant.result}
+
+
+
+
+
+
+
+
+
+
+ Running Sun JPA 2.0 TCK - only Pluggability tests
+ Init must have been called before running this target!
+
+
+
+
+
+ The TOPLINK_CLASSPATH was not provided and needs to point to the required Toplink, OpenJPA and Derby runtime jars.
+
+
+
+
+
+
+
+
+ Calling TCK initdb.xml
+
+ TCK initdb.xml returned result=${tsant.result}
+
+
+ Calling TCK build.xml
+
+ TCK build.xml returned result=${tsant.result}
+
+
+
+
+
+
+
+
+
+
+ Gathering test artifacts for Sun JPA 2.0 TCK
+
+
+
+
+
+
+
+
+
+
+
+
+ Results archive at: ${tck.results.archive}
+
+
+
+
+
+
+ Test Results: FAILED ${count.failed} tests!
+
+ Test Results: PASSED!
+
+
+
+