Author: mcconnell
Date: Thu Jul  1 06:43:36 2004
New Revision: 22412

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

Modified: avalon/trunk/planet/tutorials/configuration/block/README.TXT
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/block/README.TXT        (original)
+++ avalon/trunk/planet/tutorials/configuration/block/README.TXT        Thu Jul  1 
06:43:36 2004
@@ -7,7 +7,7 @@
 
 Build using:
 
-  $ maven jar
+  $ ant
 
 Execute the demo and note the message concerning configuration source.
 In the example the configuration is based on the directive included 

Added: avalon/trunk/planet/tutorials/configuration/block/etc/main/BLOCK-INF/block.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/block/etc/main/BLOCK-INF/block.xml     
 Thu Jul  1 06:43:36 2004
@@ -0,0 +1,16 @@
+
+<container name="tutorial">
+
+   <classloader>
+     <classpath>

+       <artifact>@FRAMEWORK-IMPL-SPEC@</artifact>
+     </classpath>
+   </classloader>
+
+   <component name="hello" class="tutorial.HelloComponent">
+     <configuration>
+       <source>explicit configuration within block</source>
+     </configuration>
+   </component>
+
+</container>

Modified: 
avalon/trunk/planet/tutorials/configuration/block/src/main/tutorial/HelloComponent.java
==============================================================================
--- 
avalon/trunk/planet/tutorials/configuration/block/src/java/tutorial/HelloComponent.java
     (original)
+++ 
avalon/trunk/planet/tutorials/configuration/block/src/main/tutorial/HelloComponent.java
     Thu Jul  1 06:43:36 2004
@@ -25,7 +25,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

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

Added: avalon/trunk/planet/tutorials/configuration/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/configuration/build.xml       Thu Jul  1 06:43:36 
2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>

+

+<project name="configuration-tutorial" default="default" basedir="." 
xmlns:x="antlib:org.apache.avalon.tools">

+

+  <property file="build.properties"/>

+  <import file="${project.system}/build/reactor.xml"/>

+

+</project>


Modified: avalon/trunk/planet/tutorials/index.xml
==============================================================================
--- avalon/trunk/planet/tutorials/index.xml     (original)
+++ avalon/trunk/planet/tutorials/index.xml     Thu Jul  1 06:43:36 2004
@@ -107,4 +107,22 @@
     </plugins>

   </project>

 

+  <!--

+  Configuration Tutorial.

+  -->

+

+  <project basedir="configuration/block">

+    <info>

+      <group>avalon/tutorial</group>

+      <name>avalon-tutorial-config-block</name>

+    </info>

+    <dependencies>

+      <include key="avalon-framework-impl"/>

+    </dependencies>

+    <plugins>

+      <include key="avalon-meta-tools"/>

+    </plugins>

+  </project>

+

+

 </system>


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to