mcconnell 2003/10/14 03:55:57
Modified: merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/unit/src/etc merlin.properties
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit
StandardTestCase.java
Log:
Housekeeping.
Revision Changes Path
1.4 +2 -2 avalon/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlin.properties 13 Oct 2003 22:51:09 -0000 1.3
+++ merlin.properties 14 Oct 2003 10:55:57 -0000 1.4
@@ -12,8 +12,8 @@
merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.0b1
merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.0b1
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
-merlin.spi.classpath.5=avalon-extension:avalon-extension-spi;1.0
-merlin.spi.classpath.6=merlin:merlin-kernel-spi;3.1b2
+merlin.api.classpath.5=avalon-extension:avalon-extension-spi;1.0
+merlin.api.classpath.6=merlin:merlin-kernel-spi;3.1b2
#
# the spi classpath
1.3 +1 -1 avalon/merlin/kernel/unit/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/etc/merlin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.properties 13 Oct 2003 22:43:19 -0000 1.2
+++ merlin.properties 14 Oct 2003 10:55:57 -0000 1.3
@@ -12,7 +12,7 @@
merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.0b1
merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.0b1
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
-merlin.spi.classpath.5=avalon-extension:avalon-extension-spi;1.0
+merlin.api.classpath.5=avalon-extension:avalon-extension-spi;1.0
merlin.api.classpath.6=merlin:merlin-kernel-spi;3.1b2
#
1.6 +1 -1
avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
Index: AbstractMerlinTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMerlinTestCase.java 13 Oct 2003 22:48:53 -0000 1.5
+++ AbstractMerlinTestCase.java 14 Oct 2003 10:55:57 -0000 1.6
@@ -92,7 +92,7 @@
// state
//-------------------------------------------------------------------
- private final DefaultRunnableKernel m_kernel;
+ private final DefaultEmbeddedKernel m_kernel;
private final ContainmentModel m_test;
1.3 +1 -1
avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/StandardTestCase.java
Index: StandardTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/StandardTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardTestCase.java 11 Oct 2003 22:13:07 -0000 1.2
+++ StandardTestCase.java 14 Oct 2003 10:55:57 -0000 1.3
@@ -52,7 +52,6 @@
import java.net.URL;
import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
-import org.apache.avalon.framework.logger.Logger;
/**
* Abstract Merlin Test Case.
@@ -87,6 +86,7 @@
public void testServiceResolution() throws Exception
{
Hello hello = (Hello) resolve( "hello" );
+ assertTrue( hello != null );
getLogger().info( "Message from hello service: " + hello.getMessage() );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
