mcconnell 2002/12/20 19:30:24
Modified: merlin kernel.xml
merlin/src/java/org/apache/avalon/merlin/container
ContainerLoader.java DefaultContainer.java
Log:
Incorporation of appliance context implementation (as distinct from interface
and handling of write protection).
Revision Changes Path
1.8 +3 -18 avalon-sandbox/merlin/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kernel.xml 17 Dec 2002 04:48:51 -0000 1.7
+++ kernel.xml 21 Dec 2002 03:30:23 -0000 1.8
@@ -3,31 +3,16 @@
<logging target="default" priority="DEBUG">
<category name="/sys/logger" priority="WARN"/>
- <target name="kernel">
+ <!--
+ <target name="default">
<file location="kernel.log" />
</target>
+ -->
</logging>
<categories>
<category name="/sys" priority="INFO"/>
</categories>
-
- <engine>
-
- <!--
- <library dir=".">
- <include name="build/lib"/>
- </library>
- -->
- <!--
- <classpath>
- <fileset dir="build/lib">
- <include name="avalon-merlin-demo-1.0.jar"/>
- </fileset>
- </classpath>
- -->
-
- </engine>
<blocks>
<fileset dir="../assembly/build/lib">
1.7 +4 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerLoader.java
Index: ContainerLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContainerLoader.java 20 Dec 2002 11:58:00 -0000 1.6
+++ ContainerLoader.java 21 Dec 2002 03:30:24 -0000 1.7
@@ -90,6 +90,7 @@
import org.apache.avalon.merlin.service.Registry;
import org.apache.avalon.assembly.appliance.Appliance;
import org.apache.avalon.assembly.appliance.ApplianceContext;
+import org.apache.avalon.assembly.appliance.DefaultApplianceContext;
import org.apache.avalon.assembly.appliance.ApplianceManager;
import org.apache.avalon.assembly.logging.LoggingManager;
import org.apache.avalon.assembly.logging.LoggingDescriptor;
@@ -220,7 +221,7 @@
map.put("urn:avalon:partition.name", "" );
}
- ApplianceContext context = new ApplianceContext( descriptor );
+ DefaultApplianceContext context = new DefaultApplianceContext(
descriptor );
context.setName( name );
context.setDeploymentContext( map );
if( partition != null )
@@ -234,6 +235,7 @@
try
{
+ context.makeReadOnly();
return engine.createAppliance( context, false );
}
catch( Throwable e )
1.6 +4 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.java
Index: DefaultContainer.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultContainer.java 20 Dec 2002 11:58:00 -0000 1.5
+++ DefaultContainer.java 21 Dec 2002 03:30:24 -0000 1.6
@@ -64,6 +64,7 @@
import org.apache.avalon.assembly.engine.EngineClassLoader;
import org.apache.avalon.assembly.appliance.Appliance;
import org.apache.avalon.assembly.appliance.ApplianceContext;
+import org.apache.avalon.assembly.appliance.DefaultApplianceContext;
import org.apache.avalon.assembly.appliance.ApplianceException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Context;
@@ -189,8 +190,9 @@
{
Profile profile = profiles[i];
getLogger().debug( "creating appliance: " + profile );
- ApplianceContext context = new ApplianceContext( profile );
+ DefaultApplianceContext context = new DefaultApplianceContext(
profile );
context.setPartitionName( m_path );
+ context.makeReadOnly();
Appliance appliance = createAppliance( context, true );
m_components.add( appliance );
m_registry.bind( appliance );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
