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 2003/04/18 22:59:12 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/src/tutorial/002/src/config config.xml
mcconnell 2003/04/18 13:59:12
Modified: merlin/merlin-smp/src/tutorial/002 build.xml
merlin/merlin-smp/src/tutorial/002/src/config config.xml
Added: merlin/merlin-smp/src/tutorial/002 README.TXT
Log:
Update to support target override demonstration.
Revision Changes Path
1.2 +1 -1 avalon-sandbox/merlin/merlin-smp/src/tutorial/002/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/tutorial/002/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 4 Apr 2003 12:03:09 -0000 1.1
+++ build.xml 18 Apr 2003 20:59:12 -0000 1.2
@@ -34,7 +34,7 @@
<mkdir dir="${classes.dir}/BLOCK-INF" />
<copy toDir="${classes.dir}/BLOCK-INF">
<fileset dir="${config.dir}">
- <include name="*.xml"/>
+ <include name="block.xml"/>
</fileset>
</copy>
<mkdir dir="${classes.dir}" />
1.1 avalon-sandbox/merlin/merlin-smp/src/tutorial/002/README.TXT
Index: README.TXT
===================================================================
Configuration Management
------------------------
This tutorial covers the configuration series incljding usage of the Confiurable interface, creating default configurations, declarating a configuration directive, and overriding configurations.
1.2 +7 -2 avalon-sandbox/merlin/merlin-smp/src/tutorial/002/src/config/config.xml
Index: config.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/tutorial/002/src/config/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 4 Apr 2003 12:03:09 -0000 1.1
+++ config.xml 18 Apr 2003 20:59:12 -0000 1.2
@@ -1,3 +1,8 @@
-<configuration>
-</configuration>
\ No newline at end of file
+<targets>
+ <target name="/hello">
+ <configuration>
+ <source>External configuration target.</source>
+ </configuration>
+ </target>
+</targets>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org