Author: pcl
Date: Sun Apr  8 11:11:21 2007
New Revision: 526588

URL: http://svn.apache.org/viewvc?view=rev&rev=526588
Log:
fixed some issues with our TCK-running framework to hopefully get it running on 
Windows

Added:
    
incubator/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
   (with props)
Modified:
    incubator/openjpa/trunk/openjpa-integration/tck/pom.xml

Modified: incubator/openjpa/trunk/openjpa-integration/tck/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-integration/tck/pom.xml?view=diff&rev=526588&r1=526587&r2=526588
==============================================================================
--- incubator/openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-integration/tck/pom.xml Sun Apr  8 11:11:21 
2007
@@ -83,6 +83,8 @@
                             value="${basedir}/target/tck"/>
                         <property name="tck.dir" value="${tck.base}/jpatck"/>
 
+                        <delete dir="${tck.dir}"/>
+
                         <unzip overwrite="false"
                             src="${tck.zip}" dest="${tck.base}"/>
 
@@ -134,7 +136,7 @@
                         <property name="jpatck.config"
                             value="${tck.dir}/bin/ts.jte"/>
 
-                        <echo append="true" file="${jpatck.config}">
+                        <echo append="false" file="${jpatck.config}.tmp">
 
 
 #########################################################################
@@ -145,7 +147,7 @@
 work.dir=${jpatck.work.dir}
 report.dir=${tck.dir}/../reports
 jpa.classes=${cp.property}
-database.classes=$${jpa.classes}
+database.classes=${jpa.classes}
 # Need to specify java.* classes, both in Windows/UNIX locations as well as Mac
 
sigTestClasspath=$${JAVA_HOME}/lib/rt.jar:$${JAVA_HOME}/../Classes/classes.jar:$${jpa.classes}
 persistence.unit.properties.file.full.path=${openjpa.properties}
@@ -156,12 +158,22 @@
 
                         </echo>
 
+                        <!-- convert backslashes and known paths with spaces
+                            to get around a problem with the TCK testrunner 
+                            on windows -->
+                        <replace summary="yes" file="${jpatck.config}.tmp" 
+                            
replacefilterfile="windows-replacefilter.properties"/>
+                        <concat append="true" destfile="${jpatck.config}">
+                            <fileset file="${jpatck.config}.tmp"/>
+                        </concat>
+
                         <path id="agent.path">
                             <fileset dir="../../openjpa-all/target">
                                 <include name="**/*.jar"/>
                             </fileset>
                         </path>
-                        <pathconvert property="agent" refid="agent.path"/>
+                        <pathconvert dirsep="/" property="agent" 
+                            refid="agent.path"/>
                         <echo>AGENT: ${agent}</echo>
 
                         <!--

Added: 
incubator/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties?view=auto&rev=526588
==============================================================================
--- 
incubator/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
 (added)
+++ 
incubator/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
 Sun Apr  8 11:11:21 2007
@@ -0,0 +1,3 @@
+\\: /
+Documents\ and\ Settings: Docume~1
+Program\ Files: Progra~1

Propchange: 
incubator/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
------------------------------------------------------------------------------
    svn:eol-style = native


Reply via email to