Return-Path: 
 <commits-return-5710-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org>
Delivered-To: apmail-openjpa-commits-archive@www.apache.org
Received: (qmail 98299 invoked from network); 5 Jan 2010 02:22:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 5 Jan 2010 02:22:05 -0000
Received: (qmail 3923 invoked by uid 500); 5 Jan 2010 02:22:05 -0000
Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org
Received: (qmail 3864 invoked by uid 500); 5 Jan 2010 02:22:05 -0000
Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openjpa.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openjpa.apache.org>
List-Post: <mailto:commits@openjpa.apache.org>
List-Id: <commits.openjpa.apache.org>
Reply-To: dev@openjpa.apache.org
Delivered-To: mailing list commits@openjpa.apache.org
Received: (qmail 3854 invoked by uid 99); 5 Jan 2010 02:22:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 02:22:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 02:22:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 781072388A1A; Tue,  5 Jan 2010 02:21:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r895863 - /openjpa/trunk/openjpa-integration/tck/pom.xml
Date: Tue, 05 Jan 2010 02:21:42 -0000
To: commits@openjpa.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100105022144.781072388A1A@eris.apache.org>

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 -->