mcconnell 2003/04/12 19:35:25
Modified: merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
DefaultBlock.xinfo
Log:
Imporving terminology and making up changes that are needed to properly synchronize
with the appliance repository instead of duplicating references here.
Revision Changes Path
1.4 +9 -4
avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.xinfo
Index: DefaultBlock.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlock.xinfo 18 Mar 2003 05:04:16 -0000 1.3
+++ DefaultBlock.xinfo 13 Apr 2003 02:35:25 -0000 1.4
@@ -43,9 +43,14 @@
<entry
key="urn:assembly:threads.manager"
type="org.apache.excalibur.mpool.PoolManager"/>
+
+ <!--
+ The initial set of profiles to be installed within the block.
+ -->
<entry
- key="urn:merlin:container.descriptor"
- type="org.apache.avalon.merlin.container.ContainerDescriptor"/>
+ key="urn:merlin:container.profiles"
+ type="org.apache.avalon.meta.model.Profile[]"/>
+
<entry
key="urn:merlin:container.library"
type="org.apache.avalon.merlin.block.Library"/>
@@ -54,11 +59,11 @@
type="java.util.List"/>
<entry
key="urn:merlin:container.dependencies"
- type="org.apache.avalon.meta.DependencyDescriptor[]"
+ type="org.apache.avalon.meta.info.DependencyDescriptor[]"
optional="true"/>
<entry
key="urn:merlin:container.services"
- type="org.apache.avalon.meta.ServiceDescriptor[]"
+ type="org.apache.avalon.meta.info.ServiceDescriptor[]"
optional="true"/>
</context>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
