mcconnell 2003/08/20 10:02:51
Modified: merlin/merlin-platform/tutorials/configuration/block
README.TXT project.xml
merlin/merlin-platform/tutorials/configuration/defaults
project.xml
merlin/merlin-platform/tutorials/configuration/override
project.xml
Added: merlin/merlin-platform/tutorials/configuration/block/conf
categories.xml
Removed: merlin/merlin-platform/tutorials/configuration/block
maven.xml
merlin/merlin-platform/tutorials/configuration/block/conf
config-2.xml
merlin/merlin-platform/tutorials/configuration/override
maven.xml
Log:
Housekeeping.
Revision Changes Path
1.3 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/README.TXT
Index: README.TXT
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/README.TXT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.TXT 18 Aug 2003 11:36:40 -0000 1.2
+++ README.TXT 20 Aug 2003 17:02:51 -0000 1.3
@@ -23,5 +23,5 @@
target declared in config.xml. Just for fun you can also see how
you can use targets to modify logging priorities:
- $ merlin target\classes -execute - config conf/config-2.xml
+ $ merlin target\classes -execute - config conf/categories.xml
1.6 +14 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 19 Aug 2003 14:12:32 -0000 1.5
+++ project.xml 20 Aug 2003 17:02:51 -0000 1.6
@@ -2,8 +2,21 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>merlin-block-configuration</id>
<name>Block Configuration Tutorial</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/categories.xml
Index: categories.xml
===================================================================
<targets>
<target path="/tutorial/hello">
<categories priority="DEBUG"/>
</target>
</targets>
1.6 +14 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 19 Aug 2003 14:12:32 -0000 1.5
+++ project.xml 20 Aug 2003 17:02:51 -0000 1.6
@@ -2,8 +2,21 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>merlin-defaults-configuration</id>
<name>Defaults Configuration Tutorial</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
1.6 +14 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 19 Aug 2003 14:12:32 -0000 1.5
+++ project.xml 20 Aug 2003 17:02:51 -0000 1.6
@@ -2,8 +2,21 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>merlin-override-configuration</id>
<name>Override Configuration Tutorial</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
