mcconnell 2003/08/20 01:55:34
Modified: merlin/merlin-platform/tutorials/hello README.txt
project.xml
merlin/merlin-platform/tutorials/hello/conf block.xml
config.xml
Log:
Updating as part of 1.3.1 testing.
Revision Changes Path
1.3 +26 -3 avalon-sandbox/merlin/merlin-platform/tutorials/hello/README.txt
Index: README.txt
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.txt 19 Aug 2003 14:23:56 -0000 1.2
+++ README.txt 20 Aug 2003 08:55:34 -0000 1.3
@@ -1,13 +1,36 @@
-Build the project:
+Hello
+=====
+
+Hello is a demonstration component used as part of the
+Merlin Tutorial.
+
+Overview
+--------
+
+An example of a minimal componet, packaged under a container,
+deployable under Merlin. The project includes:
+
+ * HelloComponent.java - the component source
+ * block.xml - the container defintion
+
+Build
+-----
+
+Build the project using the following command:
$ maven
The above command triggers the default goal jar:jar which will
create a jar file under the target directory named
merlin-hello-tutorial-1.0.jar. The jar file contains a single
-component and a bundled block.xml deployment descriptor. To
-see Merlin in action, execute Merlin and give it either the
+component, generated .xinfo descriptor, and a bundled block.xml
+deployment descriptor.
+
+Runtime
+-------
+
+To see Merlin in action, execute Merlin and give it either the
jar file of the target/classes directory as the deployment
argument.
1.3 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 17 Aug 2003 16:31:25 -0000 1.2
+++ project.xml 20 Aug 2003 08:55:34 -0000 1.3
@@ -3,7 +3,7 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <groupId>merlin</groupId>
+ <groupId>merlin-tutorial</groupId>
<id>merlin-hello-tutorial</id>
<name>Merlin Hello Tutorials</name>
<package>tutorial</package>
1.3 +3 -1
avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 16 Aug 2003 11:16:33 -0000 1.2
+++ block.xml 20 Aug 2003 08:55:34 -0000 1.3
@@ -1,6 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
+ <component name="hello" class="tutorial.HelloComponent"/>
</container>
+
1.2 +1 -0
avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/config.xml
Index: config.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 19 Aug 2003 10:17:19 -0000 1.1
+++ config.xml 20 Aug 2003 08:55:34 -0000 1.2
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<targets>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
