You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/13 05:20:32 UTC
cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl DefaultBlock.java DefaultBlock.xinfo DefaultBlockLoader.java
mcconnell 2003/04/12 20:20:32
Modified: merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
DefaultBlock.java DefaultBlock.xinfo
DefaultBlockLoader.java
Log:
Corrected a couple of context references.
Revision Changes Path
1.8 +8 -5 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultBlock.java 13 Apr 2003 02:36:05 -0000 1.7
+++ DefaultBlock.java 13 Apr 2003 03:20:32 -0000 1.8
@@ -177,9 +177,9 @@
private ServiceDescriptor[] m_services;
/**
- * The set of profiles declared for this block.
+ * The containment profile.
*/
- private Profile[] m_profiles;
+ private ContainmentProfile m_descriptor;
//=====================================================================
// Contextualizable
@@ -197,14 +197,16 @@
(ApplianceContext) context.get( "urn:assembly:appliance.context" );
m_engine =
(EngineClassLoader) context.get( "urn:assembly:engine" );
- m_profiles =
- (Profile[]) context.get( "urn:merlin:container.profiles" );
+ m_descriptor =
+ (ContainmentProfile) context.get( "urn:merlin:container.descriptor" );
m_library =
(Library) context.get( "urn:merlin:container.library" );
m_blocks =
(List) context.get( "urn:merlin:container.blocks" );
m_repository =
(ApplianceRepository) context.get( "urn:assembly:appliance.repository" );
+ m_descriptor =
+ (ContainmentProfile) context.get( "urn:merlin:container.descriptor" );
//
// if dependecies are declared then use the supplied dependencies
@@ -278,7 +280,7 @@
// construct the appliance instances managed by this block
//
- Profile[] profiles = m_profiles;
+ Profile[] profiles = m_descriptor.getComponents();
for( int i=0; i<profiles.length; i++ )
{
Profile profile = profiles[i];
@@ -408,6 +410,7 @@
Map context = m_applianceContext.getDeploymentContext();
context.put( "urn:merlin:container.dependency-graph", graph );
context.put( "urn:merlin:container.listener", this );
+ context.put( "urn:merlin:container.descriptor", m_descriptor );
//
// assemble the components handled by the block
1.5 +11 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultBlock.xinfo 13 Apr 2003 02:35:25 -0000 1.4
+++ DefaultBlock.xinfo 13 Apr 2003 03:20:32 -0000 1.5
@@ -45,18 +45,23 @@
type="org.apache.excalibur.mpool.PoolManager"/>
<!--
- The initial set of profiles to be installed within the block.
+ The containement profile holding the initial set of contained
+ profiles.
-->
<entry
- key="urn:merlin:container.profiles"
- type="org.apache.avalon.meta.model.Profile[]"/>
+ key="urn:merlin:container.descriptor"
+ type="org.apache.avalon.merlin.container.ContainmentProfile"/>
+
+ <!--
+ A list of subsidiary blocks.
+ -->
+ <entry
+ key="urn:merlin:container.blocks"
+ type="java.util.List"/>
<entry
key="urn:merlin:container.library"
type="org.apache.avalon.merlin.block.Library"/>
- <entry
- key="urn:merlin:container.containers"
- type="java.util.List"/>
<entry
key="urn:merlin:container.dependencies"
type="org.apache.avalon.meta.info.DependencyDescriptor[]"
1.8 +2 -3 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java
Index: DefaultBlockLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultBlockLoader.java 13 Apr 2003 02:36:05 -0000 1.7
+++ DefaultBlockLoader.java 13 Apr 2003 03:20:32 -0000 1.8
@@ -778,12 +778,11 @@
//
final DefaultApplianceContext context = new DefaultApplianceContext( descriptor );
- final Profile[] profiles = descriptor.getComponents();
context.setName( name );
context.setPartitionName( partition );
context.setApplianceClassname( DefaultBlock.class.getName() );
- context.put("urn:merlin:container.profiles", profiles );
+ context.put("urn:merlin:container.descriptor", descriptor );
context.put("urn:merlin:container.library", this );
context.put("urn:merlin:container.blocks", blocks );
if( dependencies != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org