mcconnell 2003/10/13 07:13:17
Modified: merlin/platform/tutorials/hello project.xml
merlin/platform/tutorials/hello/conf config.xml
merlin/platform/tutorials/hello/src/java/tutorial
HelloComponent.java
Added: merlin/platform/tutorials/hello/src/test/tutorial
StandardTestCase.java
Log:
Add merlin unit test for hello.
Revision Changes Path
1.2 +3 -3 avalon/merlin/platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 24 Sep 2003 09:34:01 -0000 1.1
+++ project.xml 13 Oct 2003 14:13:17 -0000 1.2
@@ -25,9 +25,9 @@
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <groupId>merlin</groupId>
+ <artifactId>merlin-unit</artifactId>
+ <version>3.1-SNAPSHOT</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon/merlin/platform/tutorials/hello/conf/config.xml
Index: config.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/conf/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 24 Sep 2003 09:34:01 -0000 1.1
+++ config.xml 13 Oct 2003 14:13:17 -0000 1.2
@@ -3,7 +3,7 @@
<targets>
<target path="/tutorial/hello">
- <categories priority="DEBUG"/>
+ <categories priority="INFO"/>
</target>
</targets>
1.2 +2 -2
avalon/merlin/platform/tutorials/hello/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/hello/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 24 Sep 2003 09:34:02 -0000 1.1
+++ HelloComponent.java 13 Oct 2003 14:13:17 -0000 1.2
@@ -63,10 +63,10 @@
* the component. The lifecycle stages demonstrated here include
* LogEnabled (association of a logging channel), Initializable
* (initialization of the component), Executable (component
- * execution), and Disposable (componet disposal). PLease note
+ * execution), and Disposable (componet disposal). Please note
* that all lifecycle stages are optional.
*
- * @avalon.component version="1.0" name="hello"
+ * @avalon.component version="1.0" name="hello" lifestyle="singleton"
*/
public class HelloComponent
implements LogEnabled, Initializable, Executable, Disposable
1.1
avalon/merlin/platform/tutorials/hello/src/test/tutorial/StandardTestCase.java
Index: StandardTestCase.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 2002-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact [EMAIL PROTECTED]
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
*/
package tutorial;
import java.net.URL;
import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
/**
* Abstract Merlin Test Case.
*
* @author [EMAIL PROTECTED]
*/
public class StandardTestCase extends AbstractMerlinTestCase
{
//--------------------------------------------------------
// constructors
//--------------------------------------------------------
/**
* @param name the name of the test case
* @param root the merlin system install directory
*/
public StandardTestCase( String name )
{
super(
MAVEN_TARGET_CLASSES_DIR,
MERLIN_DEFAULT_CONFIG_FILE,
MERLIN_DEBUG_OFF,
MERLIN_INFO_OFF,
name );
}
//--------------------------------------------------------
// testcase
//--------------------------------------------------------
public void testServiceResolution() throws Exception
{
Object hello = resolve( "hello" );
getLogger().info( "Hello established." );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
