openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r895863 - /openjpa/trunk/openjpa-integration/tck/pom.xml
Date Tue, 05 Jan 2010 02:21:42 GMT
Author: dwoods
Date: Tue Jan  5 02:21:40 2010
New Revision: 895863

URL: http://svn.apache.org/viewvc?rev=895863&view=rev
Log:
OPENJPA-1453 Fix setting javaagent

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

Modified: openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=895863&r1=895862&r2=895863&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Tue Jan  5 02:21:40 2010
@@ -123,6 +123,7 @@
 
                         <unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" />
 
+                        <!-- FIXME - Make sure we're using the Geronimo Spec -->
                         <path id="cp">
                             <path refid="maven.compile.classpath" />
 
@@ -198,6 +199,7 @@
                         <!-- convert backslashes and known paths with spaces
                             to get around a problem with the TCK testrunner 
                             on windows -->
+                        <echo>Update directory paths if running on Windows</echo>
                         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties"
/>
                         <concat append="true" destfile="${jpatck.config}">
                             <fileset file="${jpatck.config}.tmp" />
@@ -223,7 +225,7 @@
                             persistent classes to work (like the SignatureTest)
                         -->
                         <replace file="${jpatck.config}">
-                            <replacefilter token="${JAVA_HOME}/bin/java" value="${JAVA_HOME}/bin/java
-javaagent:${agent}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)"
/>
+                            <replacefilter token="-Ddeliverable.class=${deliverable.class}"
value="-Ddeliverable.class=${deliverable.class} -javaagent:${agent}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)"
/>
                         </replace>
 
                         <!-- make a macro for the TCK harness launcher -->
@@ -265,10 +267,12 @@
                         <echo>Logging JPA 2.0 TCK output to ${tck.log}</echo>
 
                         <!-- first initialize the database -->
+                        <echo>Calling TCK initdb.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database"
/>
                         <echo>TCK initdb.xml returned result=${tsant.result}</echo>
 
                         <!-- now run the TCK -->
+                        <echo>Calling TCK build.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient"
/>
                         <echo>TCK build.xml returned result=${tsant.result}</echo>
 
@@ -465,6 +469,7 @@
                         <!-- convert backslashes and known paths with spaces
                             to get around a problem with the TCK testrunner 
                             on windows -->
+                        <echo>Update directory paths if running on Windows</echo>
                         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties"
/>
                         <concat append="true" destfile="${jpatck.config}">
                             <fileset file="${jpatck.config}.tmp" />
@@ -533,9 +538,11 @@
                         <echo>Logging JPA TCK output to ${tck.log}</echo>
 
                         <!-- first initialize the database -->
+                        <echo>Calling TCK initdb.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database"
/>
 
                         <!-- now run the TCK -->
+                        <echo>Calling TCK build.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient"
/>
 
                         <!-- archive the results -->



Mime
View raw message