svn commit: rev 22426 - in avalon/trunk/planet/tutorials/configuration/override: . conf src

Author: mcconnell
Date: Thu Jul  1 07:49:05 2004
New Revision: 22426

Added:
   avalon/trunk/planet/tutorials/configuration/override/build.properties   (contents, props changed)
   avalon/trunk/planet/tutorials/configuration/override/build.xml
Removed:
   avalon/trunk/planet/tutorials/configuration/override/conf/block.xml
   avalon/trunk/planet/tutorials/configuration/override/project.xml
   avalon/trunk/planet/tutorials/configuration/override/src/
Modified:
   avalon/trunk/planet/tutorials/configuration/override/README.TXT
Log:
cleanup tutorial by reusing content from prev. tutorial

Modified: avalon/trunk/planet/tutorials/configuration/override/README.TXT
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/override/README.TXT	(original)
+++ avalon/trunk/planet/tutorials/configuration/override/README.TXT	Thu Jul  1 07:49:05 2004
@@ -3,9 +3,9 @@
 ------------------------
 
 This tutorial covers the declaration of an explicit configuration 
-target that overrides block configuration directives.
+target that overrides block or packaged configuration directives.
 
-$ maven
-$ merlin target\classes -execute -config conf\config.xml
+$ ant
+$ merlin target\deliverables\blocks\*.* -execute -config conf\config.xml
 
 

Added: avalon/trunk/planet/tutorials/configuration/override/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/override/build.properties	Thu Jul  1 07:49:05 2004
@@ -0,0 +1,2 @@
+project.system = ../../../../central/system
+project.home = ../..

Added: avalon/trunk/planet/tutorials/configuration/override/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/override/build.xml	Thu Jul  1 07:49:05 2004
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-config-override" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/standard.xml"/>
+
+  <target name="build" depends="standard.build">
+    <x:block name="tutorial">
+      <x:component name="hello" class="tutorial.HelloComponent"/>
+    </x:block>
+  </target>
+
+</project>
+