Return-Path: 
 <commons-dev-return-66992-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 24182 invoked from network); 31 Jan 2005 21:14:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 31 Jan 2005 21:14:35 -0000
Received: (qmail 52425 invoked by uid 500); 31 Jan 2005 21:14:33 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 52349 invoked by uid 500); 31 Jan 2005 21:14:32 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 52336 invoked by uid 500); 31 Jan 2005 21:14:32 -0000
Received: (qmail 52333 invoked by uid 99); 31 Jan 2005 21:14:32 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 31 Jan 2005 13:14:32 -0800
Received: (qmail 24103 invoked by uid 65534); 31 Jan 2005 21:14:31 -0000
Message-ID: <20050131211431.24099.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Mon, 31 Jan 2005 21:14:31 -0000
Subject: svn commit: r149301 -
 jakarta/commons/proper/configuration/trunk/build.xml
To: commons-cvs@jakarta.apache.org
From: oheger@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: oheger
Date: Mon Jan 31 13:14:28 2005
New Revision: 149301

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149301
Log:
Next trial to get the nightly builds running

Modified:
    jakarta/commons/proper/configuration/trunk/build.xml

Modified: jakarta/commons/proper/configuration/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/tru=
nk/build.xml?view=3Ddiff&r1=3D149300&r2=3D149301
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/proper/configuration/trunk/build.xml (original)
+++ jakarta/commons/proper/configuration/trunk/build.xml Mon Jan 31 13:14:2=
8 2005
@@ -20,6 +20,12 @@
   </property>
   <property name=3D"javadocdir" value=3D"dist/docs/api">
   </property>
+ =20
+  <!-- Manual changes for dealing with the conf directory -->
+  <property name=3D"confdir" value=3D"conf"/>
+  <property name=3D"targetconfdir" value=3D"${defaulttargetdir}/${confdir}=
"/>
+  <!-- Manual changes end -->
+ =20
   <property name=3D"final.name" value=3D"commons-configuration-1.1-dev">
   </property>
   <path id=3D"build.classpath">
@@ -101,6 +107,15 @@
         </pathelement>
         <pathelement path=3D"${classesdir}">
         </pathelement>
+        <!-- Manual changes for dealing with the conf directory -->
+        <pathelement path=3D"${targetconfdir}"/>
+        <path>
+          <fileset dir=3D"${targetconfdir}">
+            <include name=3D"resources.jar"/>
+          </fileset>
+        </path>
+        <!-- Manual changes end -->
+       =20
       </classpath>
       <batchtest todir=3D"${testreportdir}">
         <fileset dir=3D"src/test">
@@ -136,14 +151,16 @@
         </pathelement>
       </classpath>
     </javac>
-    <copy todir=3D"${testclassesdir}">
-      <fileset dir=3D"src/test">
+    <!-- Manual changes for dealing with the conf directory -->
+    <mkdir dir=3D"${targetconfdir}"/>
+    <copy todir=3D"${targetconfdir}">
+      <fileset dir=3D"${confdir}">
         <include name=3D"*.xml">
         </include>
       </fileset>
     </copy>
-    <copy todir=3D"${testclassesdir}">
-      <fileset dir=3D"src/test">
+    <copy todir=3D"${targetconfdir}">
+      <fileset dir=3D"${confdir}">
         <include name=3D"testClasspath.properties">
         </include>
         <include name=3D"testdb.script">
@@ -152,12 +169,13 @@
         </include>
         <include name=3D"*.dtd">
         </include>
+        <include name=3D"resources.jar"/>
       </fileset>
     </copy>
-    <mkdir dir=3D"${testclassesdir}/org/apache/commons/configuration">
+    <mkdir dir=3D"${targetconfdir}/org/apache/commons/configuration">
     </mkdir>
-    <copy todir=3D"${testclassesdir}/org/apache/commons/configuration">
-      <fileset dir=3D"src/test">
+    <copy todir=3D"${targetconfdir}/org/apache/commons/configuration">
+      <fileset dir=3D"${confdir}">
         <include name=3D"test.properties">
         </include>
         <include name=3D"include.properties">
@@ -167,11 +185,12 @@
     <mkdir dir=3D"${testclassesdir}/config">
     </mkdir>
     <copy todir=3D"${testclassesdir}/config">
-      <fileset dir=3D"src/test">
+      <fileset dir=3D"${confdir}">
         <include name=3D"**/*.properties">
         </include>
       </fileset>
     </copy>
+    <!-- Manual changes end -->
   </target>
   <target name=3D"javadoc" description=3D"o Generate javadoc" depends=3D"g=
et-deps">
     <mkdir dir=3D"${javadocdir}">



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org