mcconnell 2003/02/08 00:51:52
Modified: merlin/src/java/org/apache/avalon/merlin/block/impl
DefaultBlockLoader.java
merlin/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernel.java KernelLoader.java
Log:
Correeected a bug that cause non-propergation of the assembly:home directory.
Revision Changes Path
1.8 +1 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java
Index: DefaultBlockLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/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 7 Feb 2003 15:39:33 -0000 1.7
+++ DefaultBlockLoader.java 8 Feb 2003 08:51:52 -0000 1.8
@@ -266,7 +266,6 @@
m_registry = null;
m_system = null;
m_home = null;
- //m_resolver = null;
}
//==============================================================
1.7 +2 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultKernel.java 7 Feb 2003 15:39:35 -0000 1.6
+++ DefaultKernel.java 8 Feb 2003 08:51:52 -0000 1.7
@@ -249,7 +249,6 @@
m_home = (File) context.get( "urn:merlin:home" );
m_common = (ClassLoader) context.get(
"urn:merlin:classloader.common" );
m_bootstrap = (ClassLoader) context.get(
"urn:merlin:classloader.system" );
- //m_profile = (File) context.get( "urn:merlin:profile" );
}
//==============================================================
@@ -644,6 +643,7 @@
context.put( "urn:assembly:engine.classpath", classpath );
context.put( "urn:assembly:logging.manager", logging );
context.put( "urn:assembly:threads.manager", pool );
+ context.put( "urn:assembly:home", m_home );
context.makeReadOnly();
engine.contextualize( context );
engine.initialize();
1.4 +1 -0
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/impl/KernelLoader.java
Index: KernelLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/impl/KernelLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KernelLoader.java 5 Feb 2003 04:07:36 -0000 1.3
+++ KernelLoader.java 8 Feb 2003 08:51:52 -0000 1.4
@@ -99,6 +99,7 @@
context.put( "urn:merlin:home", base );
context.put( "urn:merlin:classloader.common", common );
context.put( "urn:merlin:classloader.system", system );
+ context.put( "urn:merlin:kernel.profile", profile );
context.makeReadOnly();
Configuration config = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
