mcconnell 2003/01/15 04:32:31
Modified: merlin/src/java/org/apache/avalon/merlin/container
DefaultContainer.xinfo
merlin/src/java/org/apache/avalon/merlin/kernel
DefaultKernel.java
merlin/src/test/config james.xml
Log:
Sync. with cornerstone build updates.
Revision Changes Path
1.8 +0 -9
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.xinfo
Index: DefaultContainer.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.xinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultContainer.xinfo 15 Jan 2003 09:14:51 -0000 1.7
+++ DefaultContainer.xinfo 15 Jan 2003 12:32:30 -0000 1.8
@@ -20,17 +20,8 @@
</info>
<context>
- <entry key="urn:assembly:engine.classloader"
- type="org.apache.avalon.assembly.engine.EngineClassLoader"/>
- <entry key="urn:merlin:container.containers"
- type="java.util.List"/>
<entry key="urn:merlin:container.descriptor"
type="org.apache.avalon.merlin.container.ContainerDescriptor"/>
- <entry key="urn:merlin:container.registry"
- type="org.apache.avalon.merlin.service.Registry"/>
- <entry key="urn:avalon:partition.name"/>
- <entry key="urn:merlin:container.configuration"
- type="org.apache.avalon.framework.configuration.Configuration"/>
<entry key="urn:merlin:container.listener"
type="org.apache.avalon.merlin.container.StateListener"/>
<entry key="urn:merlin:container.dependency-graph"
1.27 +10 -11
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/DefaultKernel.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultKernel.java 15 Jan 2003 09:14:51 -0000 1.26
+++ DefaultKernel.java 15 Jan 2003 12:32:31 -0000 1.27
@@ -871,27 +871,26 @@
Configuration target = getNamedConfiguration( custom, name );
//
- // create the appliance context for the container
+ // create the appliance context for the container - the map
+ // contains the context entries that will be provided to the
+ // container (supplimented by entries added by the block
+ // implementation) and the context object is the context
+ // to be applied to the block.
//
Map map = new Hashtable();
- map.put("urn:avalon:partition.name", partition );
- map.put("urn:assembly:engine.classloader", engine );
- map.put("urn:merlin:container.containers", containers );
map.put("urn:merlin:container.descriptor", descriptor );
- map.put("urn:merlin:container.registry", registry );
- map.put("urn:merlin:container.configuration", target );
DefaultApplianceContext context = new DefaultApplianceContext( descriptor );
- context.put("urn:merlin:container.descriptor", descriptor );
- context.put("urn:merlin:container.registry", registry );
- context.put("urn:merlin:container.configuration", target );
- context.put("urn:merlin:container.containers", containers );
context.setName( name );
context.setDeploymentContext( map );
context.setPartitionName( partition );
context.setApplianceClassname( DefaultBlock.class.getName() );
+ context.put("urn:merlin:container.descriptor", descriptor );
+ context.put("urn:merlin:container.registry", registry );
+ context.put("urn:merlin:container.configuration", target );
+ context.put("urn:merlin:container.containers", containers );
context.makeReadOnly();
//
1.2 +2 -2 avalon-sandbox/merlin/src/test/config/james.xml
Index: james.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/test/config/james.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- james.xml 15 Jan 2003 09:16:44 -0000 1.1
+++ james.xml 15 Jan 2003 12:32:31 -0000 1.2
@@ -32,7 +32,7 @@
<fileset dir="../../jakarta-avalon-cornerstone/build/lib">
<include name="cornerstone-threads-1.0.jar"/>
<include name="cornerstone-connection-1.0.jar"/>
- <include name="cornerstone-datasource-1.0.jar"/>
+ <include name="cornerstone-source-1.0.jar"/>
<include name="cornerstone-scheduler-1.0.jar"/>
<include name="cornerstone-sockets-1.0.jar"/>
<include name="cornerstone-store-1.0.jar"/>
@@ -220,7 +220,7 @@
activation="true"/>
<appliance name="source"
-
class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSelector"
+
class="org.apache.avalon.cornerstone.blocks.source.DefaultDataSourceSelector"
activation="true"/>
<appliance name="spool"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
