mcconnell 2003/08/18 04:54:32
Modified: merlin/merlin-platform/tutorials/configuration/block/conf
config.xml
merlin/merlin-platform/tutorials/configuration/defaults
README.TXT maven.xml project.xml
merlin/merlin-platform/tutorials/configuration/defaults/conf
block.xml
merlin/merlin-platform/tutorials/configuration/override
README.TXT maven.xml project.xml
merlin/merlin-platform/tutorials/configuration/override/conf
config.xml
merlin/merlin-platform/tutorials/configuration/simple
README.TXT project.xml
merlin/merlin-platform/tutorials/configuration/simple/conf
block.xml
Added: merlin/merlin-platform/tutorials/configuration/block/conf
config-2.xml
Log:
Housekeeping (bring tutorials uptodate with Maven 10)
Revision Changes Path
1.2 +3 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/config.xml
Index: config.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 18 Aug 2003 11:28:10 -0000 1.1
+++ config.xml 18 Aug 2003 11:54:32 -0000 1.2
@@ -2,7 +2,9 @@
<targets>
<target path="/tutorial/hello">
- <categories priority="DEBUG"/>
+ <configuration>
+ <source>Custom configuration from target in config.xml.</source>
+ </configuration>
</target>
</targets>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/config-2.xml
Index: config-2.xml
===================================================================
<targets>
<target path="/tutorial/hello">
<categories priority="DEBUG"/>
</target>
</targets>
1.2 +10 -0
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/README.TXT
Index: README.TXT
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 14 Jun 2003 08:45:58 -0000 1.1
+++ README.TXT 18 Aug 2003 11:54:32 -0000 1.2
@@ -3,3 +3,13 @@
------------------------
This tutorial covers default configuration using the <classname>.xconfig resource.
+
+$ maven
+$ merlin target\classes -execute
+[INFO ] (tutorial.hello): configuration stage
+[INFO ] (tutorial.hello): initialization stage
+[INFO ] (tutorial.hello): source: packaged default
+
+In the above example the configuration source is resolved from a
+configuration default packaged with the class (see <classname>.xconfig).
+
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 14 Jun 2003 08:45:58 -0000 1.1
+++ maven.xml 18 Aug 2003 11:54:32 -0000 1.2
@@ -1,7 +1,7 @@
-<project default="java:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="java:compile">
- <attainGoal name="merlin:meta"/>
+ <attainGoal name="avalon:meta"/>
</preGoal>
</project>
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 20 Jun 2003 05:25:26 -0000 1.3
+++ project.xml 18 Aug 2003 11:54:32 -0000 1.4
@@ -31,14 +31,14 @@
<resources>
<resource>
- <directory>${maven.conf.dir}</directory>
+ <directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
<includes>
<include>block.xml</include>
</includes>
</resource>
<resource>
- <directory>${maven.src.dir}/java</directory>
+ <directory>${basedir}/src/java</directory>
<includes>
<include>**/*.x*</include>
</includes>
1.3 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 16 Aug 2003 11:16:33 -0000 1.2
+++ block.xml 18 Aug 2003 11:54:32 -0000 1.3
@@ -1,6 +1,6 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent" activation="startup" />
+ <component name="hello" class="tutorial.HelloComponent"/>
</container>
1.2 +7 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/README.TXT
Index: README.TXT
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 14 Jun 2003 08:45:59 -0000 1.1
+++ README.TXT 18 Aug 2003 11:54:32 -0000 1.2
@@ -2,4 +2,10 @@
Configuration Management
------------------------
-This tutorial covers the declaration of an explicit configuration target that
overrides block configuration directives.
+This tutorial covers the declaration of an explicit configuration
+target that overrides block configuration directives.
+
+$ maven
+$ merlin target\classes -execute -config conf\config.xml
+
+
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 14 Jun 2003 08:45:59 -0000 1.1
+++ maven.xml 18 Aug 2003 11:54:32 -0000 1.2
@@ -1,7 +1,7 @@
-<project default="java:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="java:compile">
- <attainGoal name="merlin:meta"/>
+ <attainGoal name="avalon:meta"/>
</preGoal>
</project>
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 20 Jun 2003 05:25:27 -0000 1.3
+++ project.xml 18 Aug 2003 11:54:32 -0000 1.4
@@ -31,14 +31,14 @@
<resources>
<resource>
- <directory>${maven.conf.dir}</directory>
+ <directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
<includes>
<include>block.xml</include>
</includes>
</resource>
<resource>
- <directory>${maven.src.dir}/java</directory>
+ <directory>${basedir}/src/java</directory>
<includes>
<include>**/*.x*</include>
</includes>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/config.xml
Index: config.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 14 Jun 2003 08:45:59 -0000 1.1
+++ config.xml 18 Aug 2003 11:54:32 -0000 1.2
@@ -1,8 +1,8 @@
<targets>
- <target path="/hello">
+ <target path="/tutorial/hello">
<configuration>
- <source>External configuration target.</source>
+ <source>Custom configuration target.</source>
</configuration>
</target>
</targets>
1.2 +5 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/README.TXT
Index: README.TXT
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 14 Jun 2003 08:45:59 -0000 1.1
+++ README.TXT 18 Aug 2003 11:54:32 -0000 1.2
@@ -2,4 +2,8 @@
Configuration Management
------------------------
-This tutorial covers the configuration series including usage of the Confiurable
interface, creating default configurations, declarating a configuration directive, and
overriding configurations.
+This tutorial covers the configuration series including usage of the
+Configurable interface, creating default configurations, declarating a
+configuration directive, and overriding configurations.
+
+WARNING - THIS TUTORIAL NEEDS TO BE UPDATED
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 20 Jun 2003 05:25:27 -0000 1.3
+++ project.xml 18 Aug 2003 11:54:32 -0000 1.4
@@ -31,14 +31,14 @@
<resources>
<resource>
- <directory>${maven.conf.dir}</directory>
+ <directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
<includes>
<include>block.xml</include>
</includes>
</resource>
<resource>
- <directory>${maven.src.dir}/java</directory>
+ <directory>${basedir}/src/java</directory>
<includes>
<include>**/*.x*</include>
</includes>
1.3 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 16 Aug 2003 11:16:33 -0000 1.2
+++ block.xml 18 Aug 2003 11:54:32 -0000 1.3
@@ -1,6 +1,6 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent" activation="startup" />
+ <component name="hello" class="tutorial.HelloComponent"/>
</container>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
