You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/11 14:30:32 UTC

svn commit: rev 21091 - in avalon/trunk/runtime/merlin/unit: . etc/main etc/test src/test/org/apache/avalon/merlin/unit/test

Author: mcconnell
Date: Fri Jun 11 05:30:31 2004
New Revision: 21091

Added:
   avalon/trunk/runtime/merlin/unit/build.properties   (contents, props changed)
   avalon/trunk/runtime/merlin/unit/build.xml   (contents, props changed)
   avalon/trunk/runtime/merlin/unit/etc/main/merlin.properties
      - copied unchanged from rev 21090, avalon/trunk/runtime/merlin/unit/etc/test/merlin.properties
   avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCase.java
      - copied, changed from rev 21086, avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java
Removed:
   avalon/trunk/runtime/merlin/unit/etc/test/merlin.properties
   avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java
Log:
housekeeping

Added: avalon/trunk/runtime/merlin/unit/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/unit/build.properties	Fri Jun 11 05:30:31 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-merlin-unit
+project.src.main = java
+project.home = ../../../central/system

Added: avalon/trunk/runtime/merlin/unit/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/unit/build.xml	Fri Jun 11 05:30:31 2004
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-merlin-unit" default="dist" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.home}/build/standard.xml"/>
+
+  <target name="init" depends="standard.init">
+    <x:filter key="avalon-logging-logkit-impl" feature="uri" 
+       token="LOGGING_IMPLEMENTATION"/>
+    <x:filter key="avalon-merlin-impl" feature="uri" 
+       token="MERLIN_IMPLEMENTATION"/>
+    <x:filter key="avalon-activation-impl" feature="uri" 
+       token="STANDARD_RUNTIME"/>
+  </target>
+
+</project>

Copied: avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCase.java (from rev 21086, avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java)
==============================================================================
--- avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java	(original)
+++ avalon/trunk/runtime/merlin/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCase.java	Fri Jun 11 05:30:31 2004
@@ -26,17 +26,17 @@
  * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
  * @version $Revision: 1.5 $
  */
-public class MerlinTestCaseTest extends AbstractMerlinTestCase
+public class MerlinTestCase extends AbstractMerlinTestCase
 {
     //----------------------------------------------------------
     // constructor
     //----------------------------------------------------------
 
     /**
-     * Constructor for MerlinEmbeddedTest.
+     * Constructor for MerlinTestCase.
      * @param name the name of the testcase
      */
-    public MerlinTestCaseTest( String name )
+    public MerlinTestCase( String name )
     {
         super( name );
     }

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