svn commit: rev 22418 - in avalon/trunk/planet/tutorials/configuration/defaults: . conf etc etc/main etc/main/BLOCK-INF src/java src/main src/main/tutorial

Author: mcconnell
Date: Thu Jul  1 06:57:21 2004
New Revision: 22418

Added:
   avalon/trunk/planet/tutorials/configuration/defaults/build.properties   (contents, props changed)
   avalon/trunk/planet/tutorials/configuration/defaults/build.xml
   avalon/trunk/planet/tutorials/configuration/defaults/etc/
   avalon/trunk/planet/tutorials/configuration/defaults/etc/main/
   avalon/trunk/planet/tutorials/configuration/defaults/etc/main/BLOCK-INF/
   avalon/trunk/planet/tutorials/configuration/defaults/etc/main/BLOCK-INF/block.xml
   avalon/trunk/planet/tutorials/configuration/defaults/src/main/
      - copied from rev 22276, avalon/trunk/planet/tutorials/configuration/defaults/src/java/
Removed:
   avalon/trunk/planet/tutorials/configuration/defaults/conf/
   avalon/trunk/planet/tutorials/configuration/defaults/project.xml
   avalon/trunk/planet/tutorials/configuration/defaults/src/java/
Modified:
   avalon/trunk/planet/tutorials/configuration/defaults/README.TXT
   avalon/trunk/planet/tutorials/configuration/defaults/src/main/tutorial/HelloComponent.java
Log:
migrate configuration/defaults

Modified: avalon/trunk/planet/tutorials/configuration/defaults/README.TXT
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/defaults/README.TXT	(original)
+++ avalon/trunk/planet/tutorials/configuration/defaults/README.TXT	Thu Jul  1 06:57:21 2004
@@ -4,7 +4,7 @@
 
 This tutorial covers default configuration using the <classname>.xconfig resource.
 
-$ maven
+$ ant
 $ merlin target\classes -execute
 [INFO   ] (tutorial.hello): configuration stage
 [INFO   ] (tutorial.hello): initialization stage

Added: avalon/trunk/planet/tutorials/configuration/defaults/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/defaults/build.properties	Thu Jul  1 06:57:21 2004
@@ -0,0 +1,2 @@
+project.system = ../../../../central/system
+project.home = ../..

Added: avalon/trunk/planet/tutorials/configuration/defaults/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/defaults/build.xml	Thu Jul  1 06:57:21 2004
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-config-defaults" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/standard.xml"/>
+
+  <target name="init" depends="standard.init">
+    <x:filter key="avalon-framework-impl" feature="spec" 
+       token="FRAMEWORK-IMPL-SPEC"/>
+  </target>
+
+</project>
+

Added: avalon/trunk/planet/tutorials/configuration/defaults/etc/main/BLOCK-INF/block.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/defaults/etc/main/BLOCK-INF/block.xml	Thu Jul  1 06:57:21 2004
@@ -0,0 +1,12 @@
+
+<container name="tutorial">
+
+   <classloader>
+     <classpath>
+       <artifact>@FRAMEWORK-IMPL-SPEC@</artifact>
+     </classpath>
+   </classloader>
+
+   <component name="hello" class="tutorial.HelloComponent"/>
+
+</container>

Modified: avalon/trunk/planet/tutorials/configuration/defaults/src/main/tutorial/HelloComponent.java
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.java	(original)
+++ avalon/trunk/planet/tutorials/configuration/defaults/src/main/tutorial/HelloComponent.java	Thu Jul  1 06:57:21 2004
@@ -26,7 +26,7 @@
 /**
  * A configurable component.
  *
- * @avalon.component version="1.0" name="simple"
+ * @avalon.component version="1.0" name="simple" lifestyle="singleton"
  */
 public class HelloComponent extends AbstractLogEnabled 
   implements Configurable, Initializable