Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1453 Fix setting javaagent 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@895863 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-01-05 02:21:40 +00:00
parent c4fe0957ee
commit 8cf03bdab7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openjpa-integration/tck/pom.xml
View File

@ -123,6 +123,7 @@
<unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" /> <unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" />
<!-- FIXME - Make sure we're using the Geronimo Spec -->
<path id="cp"> <path id="cp">
<path refid="maven.compile.classpath" /> <path refid="maven.compile.classpath" />
@ -198,6 +199,7 @@ databaseName=${db.name}
<!-- convert backslashes and known paths with spaces <!-- convert backslashes and known paths with spaces
to get around a problem with the TCK testrunner to get around a problem with the TCK testrunner
on windows --> on windows -->
<echo>Update directory paths if running on Windows</echo>
<replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" /> <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
<concat append="true" destfile="${jpatck.config}"> <concat append="true" destfile="${jpatck.config}">
<fileset file="${jpatck.config}.tmp" /> <fileset file="${jpatck.config}.tmp" />
@ -223,7 +225,7 @@ databaseName=${db.name}
persistent classes to work (like the SignatureTest) persistent classes to work (like the SignatureTest)
--> -->
<replace file="${jpatck.config}"> <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> </replace>
<!-- make a macro for the TCK harness launcher --> <!-- make a macro for the TCK harness launcher -->
@ -265,10 +267,12 @@ databaseName=${db.name}
<echo>Logging JPA 2.0 TCK output to ${tck.log}</echo> <echo>Logging JPA 2.0 TCK output to ${tck.log}</echo>
<!-- first initialize the database --> <!-- first initialize the database -->
<echo>Calling TCK initdb.xml</echo>
<tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" /> <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
<echo>TCK initdb.xml returned result=${tsant.result}</echo> <echo>TCK initdb.xml returned result=${tsant.result}</echo>
<!-- now run the TCK --> <!-- now run the TCK -->
<echo>Calling TCK build.xml</echo>
<tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" /> <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
<echo>TCK build.xml returned result=${tsant.result}</echo> <echo>TCK build.xml returned result=${tsant.result}</echo>
@ -465,6 +469,7 @@ databaseName=${db.name}
<!-- convert backslashes and known paths with spaces <!-- convert backslashes and known paths with spaces
to get around a problem with the TCK testrunner to get around a problem with the TCK testrunner
on windows --> on windows -->
<echo>Update directory paths if running on Windows</echo>
<replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" /> <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
<concat append="true" destfile="${jpatck.config}"> <concat append="true" destfile="${jpatck.config}">
<fileset file="${jpatck.config}.tmp" /> <fileset file="${jpatck.config}.tmp" />
@ -533,9 +538,11 @@ databaseName=${db.name}
<echo>Logging JPA TCK output to ${tck.log}</echo> <echo>Logging JPA TCK output to ${tck.log}</echo>
<!-- first initialize the database --> <!-- first initialize the database -->
<echo>Calling TCK initdb.xml</echo>
<tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" /> <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
<!-- now run the TCK --> <!-- now run the TCK -->
<echo>Calling TCK build.xml</echo>
<tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" /> <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
<!-- archive the results --> <!-- archive the results -->