Return-Path: 
 <jdo-commits-return-2311-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 80786 invoked from network); 14 Mar 2008 03:44:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Mar 2008 03:44:35 -0000
Received: (qmail 44082 invoked by uid 500); 14 Mar 2008 03:44:32 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 44070 invoked by uid 99); 14 Mar 2008 03:44:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 20:44:32 -0700
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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Mar 2008 03:43:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 766F41A983E; Thu, 13 Mar 2008 20:44:12 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r636984 - /db/jdo/trunk/tck2-legacy/maven.xml
Date: Fri, 14 Mar 2008 03:44:12 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080314034412.766F41A983E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcaisse
Date: Thu Mar 13 20:44:11 2008
New Revision: 636984

URL: http://svn.apache.org/viewvc?rev=636984&view=rev
Log:
Copy of jdoconfig.xml didn't work for target build.

Modified:
    db/jdo/trunk/tck2-legacy/maven.xml

Modified: db/jdo/trunk/tck2-legacy/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/maven.xml?rev=636984&r1=636983&r2=636984&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/maven.xml (original)
+++ db/jdo/trunk/tck2-legacy/maven.xml Thu Mar 13 20:44:11 2008
@@ -257,7 +257,6 @@
 
     <goal name="runtck.iut" prereqs="setProps">
         <mkdir dir="${jdo.tck.log.directory.database}"/>
-        <j:set var="jdo.tck.jdoconfig" value="iut-jdoconfig.xml"/>
         <attainGoal name="privateRuntck.iut"/>
     </goal>
 
@@ -268,6 +267,8 @@
             <format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
         </tstamp>
         <mkdir dir="${jdo.tck.log.directory}/${timestamp}/configuration"/>
+        <copy tofile="${jdo.tck.testclasses.dir}/META-INF/jdoconfig.xml"
+            file="${basedir}/src/conf/iut-jdoconfig.xml"/>
         <echo>Run all configurations on iut</echo>
         <j:set var="runOnceTestRanOnce" value="false"/>
         <j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
@@ -305,7 +306,6 @@
 
     <goal name="runtck.jdori" prereqs="setProps">
         <mkdir dir="${jdo.tck.log.directory.database}"/>
-        <j:set var="jdo.tck.jdoconfig" value="jdori-jdoconfig.xml"/>
         <attainGoal name="privateRuntck.jdori"/>
     </goal>
 
@@ -316,7 +316,8 @@
             <format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
         </tstamp>
         <mkdir dir="${jdo.tck.log.directory}/${timestamp}/configuration"/>
-
+        <copy tofile="${jdo.tck.testclasses.dir}/META-INF/jdoconfig.xml"
+            file="${basedir}/src/conf/jdori-jdoconfig.xml"/>
 
         <echo>Run all configurations on jdori</echo>
         <j:set var="runOnceTestRanOnce" value="false"/>
@@ -764,8 +765,6 @@
                <include name="jndi.properties"/>
             </fileset>
         </copy>
-        <copy tofile="${jdo.tck.testclasses.dir}/META-INF/jdoconfig.xml"
-            file="${basedir}/src/conf/${jdo.tck.jdoconfig}"/>
     </goal>
 
     <!-- ==================== -->