avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 20914 - in avalon/trunk/runtime: . logging logkit/src/test/org/apache/log/output/test
Date Tue, 08 Jun 2004 17:36:43 GMT
Author: mcconnell
Date: Tue Jun  8 10:36:43 2004
New Revision: 20914

Added:
   avalon/trunk/runtime/build.properties   (contents, props changed)
   avalon/trunk/runtime/build.xml   (contents, props changed)
Modified:
   avalon/trunk/runtime/   (props changed)
   avalon/trunk/runtime/logging/   (props changed)
   avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/OutputTargetTestCase.java
   avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java
Log:
Add a top-level runtime build.xml and update logkit to do testing relative to the supplied
basedir.

Added: avalon/trunk/runtime/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/build.properties	Tue Jun  8 10:36:43 2004
@@ -0,0 +1 @@
+project.home = ../central/system

Added: avalon/trunk/runtime/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/build.xml	Tue Jun  8 10:36:43 2004
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="runtime" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+
+  <path id="targets">
+    <fileset dir="." includes="**/build.xml" excludes="build.xml,framework/build.xml,logging/build.xml,meta/build.xml,repository/build.xml,util/build.xml"/>
+  </path>
+
+  <target name="dist" depends="">
+    <x:home/>
+    <x:reactor>
+      <path refid="targets"/>
+    </x:reactor>
+  </target>
+
+  <target name="clean" depends="">
+    <subant inheritAll="false" 
+       genericantfile="${project.home}/build/standard.xml" target="clean"
+       buildpathref="targets"/>
+  </target>
+
+</project>

Modified: avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/OutputTargetTestCase.java
==============================================================================
--- avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/OutputTargetTestCase.java
(original)
+++ avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/OutputTargetTestCase.java
Tue Jun  8 10:36:43 2004
@@ -64,8 +64,9 @@
         throws IOException
     {
         super( name );
-
-        m_logFile = ( new File( "test/log/logfile.txt" ) ).getCanonicalFile();
+
+        File basedir = new File( System.getProperty( "basedir" ) );
+        m_logFile = ( new File( basedir, "test/log/logfile.txt" ) ).getCanonicalFile();
     }
 
     private String getResult( final ByteArrayOutputStream output )

Modified: avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java
==============================================================================
--- avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java
(original)
+++ avalon/trunk/runtime/logkit/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java
Tue Jun  8 10:36:43 2004
@@ -39,8 +39,9 @@
         throws IOException
     {
         super( name );
-
-        m_baseFile = ( new File( "build/testdata/log" ) ).getCanonicalFile();
+
+        File basedir = new File( System.getProperty( "basedir" ) );
+        m_baseFile = ( new File( basedir, "build/testdata/log" ) ).getCanonicalFile();
         m_baseFile.getParentFile().mkdirs();
     }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message