Return-Path: 
 <scm-return-17370-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 87961 invoked from network); 1 Feb 2007 03:35:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Feb 2007 03:35:33 -0000
Received: (qmail 10675 invoked by uid 500); 1 Feb 2007 03:35:39 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 10667 invoked by uid 500); 1 Feb 2007 03:35:39 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 10655 invoked by uid 99); 1 Feb 2007 03:35:39 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Jan 2007 19:35:39 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
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; Wed, 31 Jan 2007 19:35:32 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2B2741A981A; Wed, 31 Jan 2007 19:35:12 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r502102 - in
 /geronimo/sandbox/build-support/harness/trunk: bin/
 harness.xml lib/buildharness/ lib/commons-lang-2.2.jar
Date: Thu, 01 Feb 2007 03:35:12 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070201033512.2B2741A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Wed Jan 31 19:35:11 2007
New Revision: 502102

URL: http://svn.apache.org/viewvc?view=rev&rev=502102
Log:
Refactored harness to use dynamic library

Added:
    geronimo/sandbox/build-support/harness/trunk/lib/commons-lang-2.2.jar   (with props)
Removed:
    geronimo/sandbox/build-support/harness/trunk/bin/
    geronimo/sandbox/build-support/harness/trunk/lib/buildharness/
Modified:
    geronimo/sandbox/build-support/harness/trunk/harness.xml

Modified: geronimo/sandbox/build-support/harness/trunk/harness.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/harness/trunk/harness.xml?view=diff&rev=502102&r1=502101&r2=502102
==============================================================================
--- geronimo/sandbox/build-support/harness/trunk/harness.xml (original)
+++ geronimo/sandbox/build-support/harness/trunk/harness.xml Wed Jan 31 19:35:11 2007
@@ -22,50 +22,68 @@
 
 <project default="harness" basedir=".">
     
+    <property name="tools.dir" value="${basedir}/tools"/>
+    <property name="lib.dir" value="${basedir}/lib"/>
+    <property name="library.baseurl" value="https://svn.apache.org/repos/asf/geronimo/sandbox/build-support/libraries"/>
+    <property name="library.basedir" value="${basedir}/libraries"/>
+    <property name="library.system.version" value="1"/>
+    
+    <macrodef name="getlibrary">
+        <attribute name="name"/>
+        <attribute name="version"/>
+        <sequential>
+            <echo>Fetching library @{name} version @{version} ...</echo>
+            
+            <mkdir dir="${library.basedir}"/>
+            
+            <exec executable="svn" dir="${library.basedir}">
+                <arg value="export"/>
+                <arg value="--non-interactive"/>
+                <arg value="${library.baseurl}/@{name}/@{version}"/>
+                <arg value="@{name}"/>
+            </exec>
+        </sequential>
+    </macrodef>
+    
     <target name="init">
         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy">
             <classpath>
-                <fileset dir="${basedir}/lib">
+                <fileset dir="${lib.dir}">
                     <include name="*.jar"/>
                 </fileset>
             </classpath>
         </taskdef>
     </target>
     
-    <target name="setup" depends="init">
-        <!-- Download the script library -->
-        <exec executable="svn" dir="${basedir}">
-            <arg value="export"/>
-            <arg value="--non-interactive"/>
-            <arg value="https://svn.apache.org/repos/asf/geronimo/sandbox/build-support/library/trunk/"/>
-            <arg value="library"/>
-        </exec>
+    <target name="setup-libraries" depends="init">
+        <getlibrary name="system" version="${library.system.version}"/>
         
-        <!-- Force scripts to be executable -->
         <chmod perm="u+x">
-            <fileset dir="bin">
-                <include name="*"/>
+            <fileset dir="${library.basedir}">
+                <include name="*/bin/*"/>
             </fileset>
-            <fileset dir="tools">
+        </chmod>
+    </target>
+    
+    <target name="setup-tools" depends="init">
+        <chmod perm="u+x">
+            <fileset dir="${tools.dir}">
                 <include name="*/bin/*"/>
             </fileset>
         </chmod>
     </target>
     
+    <target name="setup" depends="setup-tools,setup-libraries"/>
+    
     <target name="harness" depends="init">
-        <!-- Capture all build harness output to a log file for local debugging -->
         <record name="harness.log" action="start" emacsmode="true" loglevel="info" append="false"/>
         
         <groovy>
             <classpath>
-                <!-- Include system scripts -->
-                <pathelement location="${basedir}/lib"/>
-                
-                <!-- Include library scripts -->
-                <pathelement location="${basedir}/library"/>
+                <pathelement location="${library.basedir}/system/groovy"/>
             </classpath>
             
-            buildharness.BuildHarness.bootstrap(this)
+            gbuild.system.BuildHarness.bootstrap(this)
         </groovy>
     </target>
     

Added: geronimo/sandbox/build-support/harness/trunk/lib/commons-lang-2.2.jar
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/harness/trunk/lib/commons-lang-2.2.jar?view=auto&rev=502102
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/build-support/harness/trunk/lib/commons-lang-2.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive