svn commit: r1444230 - in /openjpa/trunk/openjpa-integration/tck: pom.xml tck2-20110815.xml

[al...@apache.org]

Author: allee8285
Date: Fri Feb  8 20:47:00 2013
New Revision: 1444230

URL: http://svn.apache.org/r1444230
Log:
OPENJPA-2326: Update TCK build.xml to use the correct property name for the pluggability tests.

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

Modified: openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=1444230&r1=1444229&r2=1444230&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Fri Feb  8 20:47:00 2013
@@ -209,6 +209,13 @@
                   </goals>
                 </execution>
               </executions>
+              <dependencies>
+                  <dependency>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-nodeps</artifactId>
+                    <version>1.7.1</version>
+                  </dependency>
+              </dependencies>
             </plugin>
           </plugins>
         </build>

Modified: openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml?rev=1444230&r1=1444229&r2=1444230&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml Fri Feb  8 20:47:00 2013
@@ -344,6 +344,17 @@ create.cmp.tables=false
         <echo>Calling OpenJPA create.openjpa.sql.xml</echo>
         <ant antfile="${basedir}/sql/create.openjpa.sql.xml" inheritRefs="true" />
 
+        <!-- We are attempting to change TCK build.xml;s incorrect property name
+             for the pluggability test enablement...  -->
+        <replaceregexp file="${tck.dir}/bin/build.xml"
+                   match="persistence.properties.file"
+                   replace="persistence.unit.properties.file.full.path" 
+                   flags="g"/>
+        <replaceregexp file="${tck.dir}/bin/build.xml"
+                   match='replaceregexp file="(.*)/ts.jte"'
+                   replace='replaceregexp flags="g" file="\1/ts.jte"'
+                   />
+
         <property name="jpatck.run.tmo" value="7200000" />
         <!-- now run the TCK -->
         <if>