svn commit: r998107 - /openjpa/trunk/openjpa-integration/tck/tck2.xml

[dw...@apache.org]

Author: dwoods
Date: Fri Sep 17 13:00:08 2010
New Revision: 998107

URL: http://svn.apache.org/viewvc?rev=998107&view=rev
Log:
OPENJPA-1786 temporary workaround until we hear back on our challenge from Oracle

Modified:
    openjpa/trunk/openjpa-integration/tck/tck2.xml

Modified: openjpa/trunk/openjpa-integration/tck/tck2.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/tck2.xml?rev=998107&r1=998106&r2=998107&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/tck2.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/tck2.xml Fri Sep 17 13:00:08 2010
@@ -24,9 +24,10 @@
 
         ${user.home}/.m2/privaterepos/jpatck-2.0_15-Jun-2010.zip
         ${user.home}/.m2/privaterepos/jpatck-2.0_15-Jun-2010_config.zip
+        ${user.home}/.m2/privaterepos/jpatck-2.0_15-Jun-2010_patches.zip
 
     If you have that file in a different location, it can be specified with
-    the "tck.zip" system property.
+    the "tck.zip" and "tck_patches.zip" system property.
 
     The TCK running process will do the following:
         1. Fine the TCK zip file and extract it
@@ -63,9 +64,14 @@
         <available property="tck_config.available" file="${tck_config.zip}" />
         <fail unless="tck_config.available">The TCK config file specified in the "tck_config.zip" system property (${tck_config.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA 2.0 TCK</fail>
 
+        <property name="tck_patches.zip" value="${LOCAL_M2_REPO}/../privaterepos/${tck.level}_patches.zip" />
+        <available property="tck_patches.available" file="${tck_patches.zip}" />
+        <fail unless="tck_patches.available">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</fail>
+
         <delete dir="${tck.dir}" />
         <unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" />
         <unzip overwrite="true" src="${tck_config.zip}" dest="${tck.base}" />
+        <unzip overwrite="true" src="${tck_patches.zip}" dest="${tck.base}" />
         <copy overwrite="true"
             file="${tck.dir}/bin/ts.jte" tofile="${tck.dir}/bin/ts.jte.orig" />
         <copy overwrite="true"
@@ -292,6 +298,11 @@ databaseName=${db.name}
         <copy overwrite="true"
             file="${tck.dir}/bin/ts.jte" tofile="${tck.base}/ts.jte.tck" />
 
+        <!-- HACK - rebuild jpatck/dist jars for persistence.xml fixes -->
+        <echo>Calling TCK build.all</echo>
+        <tsant buildfile="${tck.dir}/bin/build.xml" target="build.all" />
+        <echo>TCK build.all returned result=${tsant.result}</echo>
+
         <!-- first initialize the database -->
         <echo>Calling TCK initdb.xml</echo>
         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />