mcconnell 2003/08/16 04:16:34
Modified: merlin/merlin-platform project.xml
merlin/merlin-platform/examples/afs/simple/conf block.xml
merlin/merlin-platform/src/repository/james/xmls block.xml
config.xml
merlin/merlin-platform/src/repository/merlin/xmls
kernel-3.0.xml kernel-service-3.0.xml
merlin/merlin-platform/tutorials/composition/src/config
block.xml block2.xml
merlin/merlin-platform/tutorials/composition/src/config/application
block.xml
merlin/merlin-platform/tutorials/composition/src/config/location
block.xml
merlin/merlin-platform/tutorials/composition/src/config/publisher
block.xml
merlin/merlin-platform/tutorials/configuration/block/conf
block.xml
merlin/merlin-platform/tutorials/configuration/defaults/conf
block.xml
merlin/merlin-platform/tutorials/configuration/override/conf
block.xml
merlin/merlin-platform/tutorials/configuration/simple/conf
block.xml
merlin/merlin-platform/tutorials/context_casting/src/config
block.xml
merlin/merlin-platform/tutorials/context_custom/src/config
block.xml
merlin/merlin-platform/tutorials/context_standard/src/config
block.xml
merlin/merlin-platform/tutorials/contextualization/src/config
block.xml
merlin/merlin-platform/tutorials/dependencies/conf block.xml
merlin/merlin-platform/tutorials/dependencies/src/config
block.xml
merlin/merlin-platform/tutorials/hello/conf block.xml
merlin/merlin-platform/tutorials/includes/src/config
block.xml composite.xml include.xml
merlin/merlin-platform/tutorials/mixed/src/config block.xml
merlin/merlin-platform/tutorials/profile_selection/src/config
block.xml
merlin/merlin-platform/tutorials/profiles/src/config
block.xml
merlin/merlin-platform/xdocs/merlin/block index.xml
merlin/merlin-platform/xdocs/meta/model/block index.xml
merlin/merlin-platform/xdocs/meta/model/block/container
components.xml includes.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components
configuration.xml index.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository
resource.xml
merlin/merlin-platform/xdocs/meta/model/block/container/include
index.xml resource.xml source.xml
merlin/merlin-platform/xdocs/starting/advanced composite.xml
includes.xml
Added: merlin/merlin-platform/tutorials/context_casting .cvsignore
Log:
Synchronization of documentation with 3.0 (in progress).
Revision Changes Path
1.16 +9 -6 avalon-sandbox/merlin/merlin-platform/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 11 Aug 2003 22:58:51 -0000 1.15
+++ project.xml 16 Aug 2003 11:16:32 -0000 1.16
@@ -165,16 +165,12 @@
</dependencies>
<packageGroups>
+
<packageGroup>
<title>Merlin Service Management Platform</title>
<packages>org.apache.avalon.merlin.*</packages>
</packageGroup>
- <!--
- <packageGroup>
- <title>Assembly</title>
- <packages>org.apache.avalon.assembly.*</packages>
- </packageGroup>
- -->
+
<packageGroup>
<title>Activation</title>
<packages>org.apache.avalon.activation.*</packages>
@@ -184,10 +180,17 @@
<title>Composition</title>
<packages>org.apache.avalon.composition.*</packages>
</packageGroup>
+
<packageGroup>
<title>Extension</title>
<packages>org.apache.avalon.extension,org.apache.avalon.extension.*</packages>
</packageGroup>
+
+ <packageGroup>
+ <title>Repository</title>
+
<packages>org.apache.avalon.repository,org.apache.avalon.repository.*</packages>
+ </packageGroup>
+
</packageGroups>
<reports>
1.2 +4 -11
avalon-sandbox/merlin/merlin-platform/examples/afs/simple/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:09:39 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:32 -0000 1.2
@@ -1,11 +1,5 @@
-<block>
-
- <info>
- <name>simple</name>
- </info>
-
- <implementation>
+<container name="simple">
<container name="banking">
@@ -15,10 +9,9 @@
</configuration>
</component>
- <component name="simulator" class="org.apache.bank.impl.ActionSimulator"
activation="startup"/>
+ <component name="simulator"
+ class="org.apache.bank.impl.ActionSimulator" activation="startup"/>
</container>
- </implementation>
-
-</block>
+</container>
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/src/repository/james/xmls/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/james/xmls/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 12 Aug 2003 05:32:19 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:32 -0000 1.2
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
<container name="james">
<!--
1.2 +3 -3
avalon-sandbox/merlin/merlin-platform/src/repository/james/xmls/config.xml
Index: config.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/james/xmls/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 12 Aug 2003 05:32:19 -0000 1.1
+++ config.xml 16 Aug 2003 11:16:32 -0000 1.2
@@ -6,7 +6,7 @@
<targets>
- <target name="james/james">
+ <target path="james/james">
<configuration>
<postmaster>[EMAIL PROTECTED]</postmaster>
<servernames autodetect="true" autodetectIP="true">
@@ -21,7 +21,7 @@
</configuration>
</target>
- <target name="james/remote">
+ <target path="james/remote">
<configuration>
<port>4555</port>
<handler>
@@ -35,7 +35,7 @@
</configuration>
</target>
- <target name="james/store/manager">
+ <target path="james/store/manager">
<configuration>
<repositories>
<repository
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel-3.0.xml
Index: kernel-3.0.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel-3.0.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel-3.0.xml 11 Aug 2003 22:58:51 -0000 1.1
+++ kernel-3.0.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
kernel.xml
@@ -15,8 +16,6 @@
-->
<kernel>
-
- <system host="localhost"/>
<!-- logging system parameters -->
1.2 +1 -0
avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel-service-3.0.xml
Index: kernel-service-3.0.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel-service-3.0.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel-service-3.0.xml 11 Aug 2003 22:58:51 -0000 1.1
+++ kernel-service-3.0.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
kernel-service.xml
1.3 +2 -9
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 22 Jun 2003 13:57:57 -0000 1.2
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.3
@@ -1,11 +1,5 @@
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -19,6 +13,5 @@
<include id="tutorial:composition-application" version="1.0"/>
<include id="tutorial:composition-location" version="1.0"/>
- </implementation>
-</block>
+</container>
1.3 +4 -11
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/block2.xml
Index: block2.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/block2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block2.xml 22 Jun 2003 13:57:57 -0000 1.2
+++ block2.xml 16 Aug 2003 11:16:33 -0000 1.3
@@ -1,11 +1,5 @@
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -18,8 +12,7 @@
</classpath>
</classloader>
- <component name="application" class="tutorial.application.Application"
activation="startup"/>
-
- </implementation>
+ <component name="application"
+ class="tutorial.application.Application" activation="startup"/>
-</block>
+</container>
1.3 +2 -15
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/application/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/application/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 22 Jun 2003 13:57:57 -0000 1.2
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.3
@@ -1,16 +1,5 @@
-<block>
-
- <info>
- <name>application-block</name>
- </info>
-
- <dependencies>
- <dependency key="locator" type="tutorial.LocationService"/>
- <dependency key="publisher" type="tutorial.PublisherService"/>
- </dependencies>
-
- <implementation>
+<container name="application-block">
<classloader>
<classpath>
@@ -24,6 +13,4 @@
class="tutorial.application.Application" activation="startup">
</component>
- </implementation>
-
-</block>
+</container>
1.2 +4 -11
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/location/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/location/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:19 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,9 +1,5 @@
-<block>
-
- <info>
- <name>location-block</name>
- </info>
+<container name="location-block">
<services>
<service type="tutorial.LocationService">
@@ -11,15 +7,12 @@
</service>
</services>
- <implementation>
- <component name="location"
+ <component name="location"
class="tutorial.location.LocationComponent" activation="startup">
<configuration>
<source>Paris</source>
</configuration>
- </component>
-
- </implementation>
+ </component>
-</block>
+</container>
1.2 +3 -11
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/publisher/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/config/publisher/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:19 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,9 +1,5 @@
-<block>
-
- <info>
- <name>publisher-block</name>
- </info>
+<container name="publisher-block">
<services>
<service type="tutorial.PublisherService">
@@ -11,11 +7,7 @@
</service>
</services>
- <implementation>
-
- <component name="publisher"
+ <component name="publisher"
class="tutorial.publisher.PublisherComponent" activation="startup"/>
- </implementation>
-
-</block>
+</container>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 14 Jun 2003 08:45:58 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,16 +1,10 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<configuration>
<source>explicit configuration within block</source>
</configuration>
</component>
- </implementation>
-</block>
+</container>
1.2 +3 -9
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 14 Jun 2003 08:45:58 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
+ <component name="hello" class="tutorial.HelloComponent" activation="startup" />
- <implementation>
- <component name="hello" class="tutorial.HelloComponent" activation="startup" />
- </implementation>
-
-</block>
+</container>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 14 Jun 2003 08:45:59 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,16 +1,10 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<configuration>
<source>explicit configuration within block</source>
</configuration>
</component>
- </implementation>
-</block>
+</container>
1.2 +2 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 14 Jun 2003 08:46:38 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup" />
- </implementation>
-</block>
+</container>
1.1
avalon-sandbox/merlin/merlin-platform/tutorials/context_casting/.cvsignore
Index: .cvsignore
===================================================================
maven.log
velocity.log
build
target
tutorial.jar
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/context_casting/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_casting/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:22 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,14 +1,8 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<context class="tutorial.DemoContextProvider"/>
</component>
- </implementation>
-</block>
+</container>
1.3 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/context_custom/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_custom/src/config/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 9 Jul 2003 11:39:26 -0000 1.2
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.3
@@ -1,11 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<context>
<entry key="cruncher">
@@ -16,6 +11,5 @@
</entry>
</context>
</component>
- </implementation>
-</block>
+</container>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/context_standard/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_standard/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:24 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-</block>
+</container>
1.2 +2 -10
avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:20 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -3,17 +3,9 @@
Demonstration of an component providing a custom contextualization phase.
-->
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
-
- <component name="standard"
+ <component name="standard"
class="tutorial.StandardComponent" activation="startup"/>
-
- </implementation>
</block>
1.2 +1 -7
avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 18 Jun 2003 11:21:33 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
</block>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:24 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-</block>
+</container>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 27 Jun 2003 23:13:55 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:33 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-</block>
+</container>
1.4 +3 -37
avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/config/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 22 Jun 2003 13:57:57 -0000 1.3
+++ block.xml 16 Aug 2003 11:16:34 -0000 1.4
@@ -1,11 +1,5 @@
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -19,44 +13,18 @@
<!--
Deomonstration of an include the establishes a subsidiary block named
"my-block"
- based on the block defintion "include.xml". The directives in the included
- block are qualified by the configuration targets embedded in the targets
- element.
+ based on the block defintion "include.xml".
-->
<include name="my-block">
<source path="include.xml"/>
- <targets>
-
- <!--
- A target itentifies a component relative to the containing block.
- For example, the following target is referencing a component
- named "test3" contained with the block "my-block". The target
- contains a different configuration and an overriding logging
- category default priority for the component.
- -->
-
- <target path="/test3">
- <configuration>
- <source>embedded target configuration</source>
- </configuration>
- <categories priority="DEBUG"/>
- </target>
- </targets>
</include>
<container name="subcontainer">
<component name="test2" class="tutorial.TestComponent" activation="startup"/>
- <!--
- The following include demonstrates the importing of a target override file
- from an external source into a container. The imported block will be
establish
- as a child of the containing block.
- -->
-
<include name="include">
<source path="include.xml"/>
- <targets path="include-config.xml"/>
</include>
<include name="composite">
@@ -65,6 +33,4 @@
</container>
- </implementation>
-
-</block>
+</container>
1.3 +3 -18
avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/config/composite.xml
Index: composite.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/config/composite.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- composite.xml 15 Jun 2003 17:45:32 -0000 1.2
+++ composite.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -1,27 +1,12 @@
-<block>
+<container name="composite">
- <info>
- <name>composite</name>
- </info>
-
- <implementation>
-
- <container name="test">
+ <container name="test">
<include name="nested">
<source path="include.xml"/>
- <targets>
- <target path="/test3">
- <configuration>
- <source>embedded target in a nested include</source>
- </configuration>
- </target>
- </targets>
</include>
- </container>
-
- </implementation>
+ </container>
</block>
1.3 +2 -10
avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/config/include.xml
Index: include.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/config/include.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- include.xml 22 Jun 2003 13:57:57 -0000 1.2
+++ include.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -1,11 +1,5 @@
-<block>
-
- <info>
- <name>inclusion</name>
- </info>
-
- <implementation>
+<container name="inclusion">
<classloader>
<classpath>
@@ -18,6 +12,4 @@
<component name="test3" class="tutorial.TestComponent"
activation="startup"/>
- </implementation>
-
-</block>
+</container>
1.3 +2 -10
avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/config/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 9 Jul 2003 11:39:26 -0000 1.2
+++ block.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -1,11 +1,5 @@
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<container name="root">
<component name="hello" class="tutorial.HelloComponent" activation="startup">
@@ -23,6 +17,4 @@
</component>
</container>
- </implementation>
-
-</block>
+</container>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/profile_selection/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/profile_selection/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:31 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:34 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-</block>
+</container>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/tutorials/profiles/src/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/profiles/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:12:26 -0000 1.1
+++ block.xml 16 Aug 2003 11:16:34 -0000 1.2
@@ -1,12 +1,6 @@
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-</block>
+</container>
1.2 +5 -11
avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:12 -0000 1.1
+++ index.xml 16 Aug 2003 11:16:34 -0000 1.2
@@ -39,17 +39,11 @@
<p><em>Minimilist block definition:</em></p>
<source><![CDATA[
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
+ <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- <implementation>
- <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-
-</block>
+</container>
]]></source>
</subsection>
@@ -59,7 +53,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.4 +2 -10
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 24 Jun 2003 07:31:04 -0000 1.3
+++ index.xml 16 Aug 2003 11:16:34 -0000 1.4
@@ -45,13 +45,7 @@
<subsection name="Example XML">
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -69,9 +63,7 @@
</configuration>
</component>
- </implementation>
-
-</block>
+</container>
]]></source>
</subsection>
</section>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components.xml
Index: components.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- components.xml 10 Jun 2003 02:14:19 -0000 1.1
+++ components.xml 16 Aug 2003 11:16:34 -0000 1.2
@@ -46,21 +46,15 @@
<p><strong>Sample XML</strong></p>
<source><![CDATA[
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<!-- optional categories element -->
<!-- optional configuration or parameters element -->
<!-- optional context element -->
</component>
- </implementation>
-</block>
+</container>
]]></source>
</subsection>
1.3 +2 -10
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/includes.xml
Index: includes.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/includes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- includes.xml 22 Jun 2003 13:57:57 -0000 1.2
+++ includes.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -63,13 +63,7 @@
</p>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -83,9 +77,7 @@
<include id="tutorial:composition-application" version="1.0"/>
<include id="tutorial:composition-location" version="1.0"/>
- </implementation>
-
-</block>
+</container>
]]></source>
</subsection>
1.3 +2 -4
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/configuration.xml
Index: configuration.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/configuration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configuration.xml 17 Jun 2003 20:29:32 -0000 1.2
+++ configuration.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -18,9 +18,7 @@
<p><strong>Sample XML</strong></p>
<source><![CDATA[
-<block>
- <!-- ... -->
- <implementation>
+ <container name="container">
<!-- ... -->
<container name="subcontainer">
<!-- ... -->
@@ -31,7 +29,7 @@
</configuration>
</component>
</container>
- </implementation>
+ </container>
]]></source>
</subsection>
1.2 +1 -7
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:20 -0000 1.1
+++ index.xml 16 Aug 2003 11:16:34 -0000 1.2
@@ -71,19 +71,13 @@
<subsection name="Sample XML">
<source><![CDATA[
-<block>
+<container name="tutorial">
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<!-- optional categories element -->
<!-- optional configuration or parameters element -->
<!-- optional context element -->
</component>
- </implementation>
</block>
]]></source>
1.3 +9 -7
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository/resource.xml
Index: resource.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository/resource.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resource.xml 24 Jun 2003 07:31:04 -0000 1.2
+++ resource.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -30,6 +30,12 @@
Used in conjuction with the id attribute to qualify the artifact
version.
</td>
</tr>
+ <tr>
+ <td>type</td><td>no</td>
+ <td>
+ Default to 'jar'. Used to declare the type of resource.
+ </td>
+ </tr>
</table>
</subsection>
@@ -45,8 +51,7 @@
</p>
<source><![CDATA[
-<block>
- <implementation>
+<container name="test">
<classloader>
<classpath>
@@ -60,12 +65,9 @@
<!-- include blocks here -->
- <include name="james">
- <source path="james.xml"/>
- </include>
+ <include name="james" id="james:block" type="xml"/>
- </implementation>
-</block>
+</container>
]]></source>
1.4 +5 -16
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 22 Jun 2003 13:57:58 -0000 1.3
+++ index.xml 16 Aug 2003 11:16:34 -0000 1.4
@@ -67,13 +67,7 @@
</p>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -84,20 +78,15 @@
</classloader>
<include name="publisher">
- <resource id="tutorial:composition-publisher" version="1.0"/>
- </include>
+ id="tutorial:composition-publisher" version="1.0"/>
<include name="application">
- <resource id="tutorial:composition-application" version="1.0"/>
- </include>
+ id="tutorial:composition-application" version="1.0"/>
<include name="location">
- <resource id="tutorial:composition-location" version="1.0"/>
- </include>
-
- </implementation>
+ id="tutorial:composition-location" version="1.0"/>
-</block>
+</container>
]]></source>
</subsection>
1.2 +3 -12
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/resource.xml
Index: resource.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/resource.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resource.xml 15 Jun 2003 17:43:24 -0000 1.1
+++ resource.xml 16 Aug 2003 11:16:34 -0000 1.2
@@ -45,21 +45,12 @@
</p>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<include name="publisher">
- <resource id="tutorial:composition-publisher" version="1.0"/>
- </include>
-
- </implementation>
+ id="tutorial:composition-publisher" version="1.0"/>
-</block>
+</container>
]]></source>
</subsection>
1.3 +2 -10
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/source.xml
Index: source.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/source.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- source.xml 22 Jun 2003 13:57:58 -0000 1.2
+++ source.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -34,13 +34,7 @@
<subsection name="Sample XML">
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -54,9 +48,7 @@
<source path="conf/include.xml"/>
</include>
- </implementation>
-
-</block>
+</container>
]]></source>
</subsection>
1.3 +8 -42
avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/composite.xml
Index: composite.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/composite.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- composite.xml 22 Jun 2003 13:57:58 -0000 1.2
+++ composite.xml 16 Aug 2003 11:16:34 -0000 1.3
@@ -43,13 +43,7 @@
</p>
<p>The top level block declaration (block.xml):</p>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutotial">
<classloader>
<classpath>
@@ -63,9 +57,7 @@
<include id="tutorial:composition-application" version="1.0"/>
<include id="tutorial:composition-location" version="1.0"/>
- </implementation>
-
-</block>
+</container>
]]></source>
<p>
The common shared API (containing interfaces) is declared in
@@ -76,24 +68,8 @@
resolved from the block.xml files containing in the respective
jar files.
</p>
- <p>
- The application block.xml (shown below) includes the declaration
- of two dependencies (locator and publisher). It also includes
- the shared interface api jar file in its classpath definition.
- </p>
<source><![CDATA[
-<block>
-
- <info>
- <name>application-block</name>
- </info>
-
- <dependencies>
- <dependency key="locator" type="tutorial.LocationService"/>
- <dependency key="publisher" type="tutorial.PublisherService"/>
- </dependencies>
-
- <implementation>
+<container name="composition-block">
<classloader>
<classpath>
@@ -107,9 +83,7 @@
class="tutorial.application.Application" activation="startup">
</component>
- </implementation>
-
-</block>
+</container>
]]></source>
<p>
If we look at the locator block (as an example) we will see a
corresponding
@@ -119,11 +93,7 @@
block.
</p>
<source><![CDATA[
-<block>
-
- <info>
- <name>location-block</name>
- </info>
+<container name="location-block">
<services>
<service type="tutorial.LocationService">
@@ -131,18 +101,14 @@
</service>
</services>
- <implementation>
-
- <component name="location"
+ <component name="location"
class="tutorial.location.LocationComponent" activation="startup">
<configuration>
<source>Paris</source>
</configuration>
- </component>
-
- </implementation>
+ </component>
-</block>
+</container>
]]></source>
</subsection>
1.5 +2 -10
avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/includes.xml
Index: includes.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/includes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- includes.xml 22 Jun 2003 13:57:58 -0000 1.4
+++ includes.xml 16 Aug 2003 11:16:34 -0000 1.5
@@ -42,13 +42,7 @@
</li>
</ul>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+<container name="tutorial">
<classloader>
<classpath>
@@ -110,9 +104,7 @@
</container>
- </implementation>
-
-</block>
+</container>
]]></source>
<p>
The above block.xml will create a component hierachy
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
