Return-Path: 
 <cvs-return-24682-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 25036 invoked from network); 1 Jul 2004 13:57:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 1 Jul 2004 13:57:30 -0000
Received: (qmail 26496 invoked by uid 500); 1 Jul 2004 13:57:31 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 26369 invoked by uid 500); 1 Jul 2004 13:57:29 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 26318 invoked by uid 99); 1 Jul 2004 13:57:29 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Thu, 01 Jul 2004 06:57:28 -0700
Received: (qmail 24881 invoked by uid 65534); 1 Jul 2004 13:57:22 -0000
Date: 1 Jul 2004 13:57:22 -0000
Message-ID: <20040701135722.24875.qmail@minotaur.apache.org>
From: mcconnell@apache.org
To: cvs@avalon.apache.org
Subject: 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
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org