mcconnell 2003/06/14 04:13:09
Modified: merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
StandardBlockLoader.java
Log:
Context reference enhancement.
Revision Changes Path
1.12 +12 -7
avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java
Index: StandardBlockLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardBlockLoader.java 12 Jun 2003 18:56:19 -0000 1.11
+++ StandardBlockLoader.java 14 Jun 2003 11:13:09 -0000 1.12
@@ -62,6 +62,7 @@
import java.util.zip.ZipEntry;
import org.apache.avalon.assembly.appliance.impl.DefaultApplianceContext;
+import org.apache.avalon.assembly.engine.Engine;
import org.apache.avalon.assembly.engine.EngineException;
import org.apache.avalon.assembly.engine.impl.DefaultClasspath;
import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
@@ -172,14 +173,14 @@
private PoolManager m_pool;
/**
- * The parent classloader.
+ * The common classloader.
*/
- private ClassLoader m_system;
+ private ClassLoader m_common;
/**
- * The common classloader.
+ * The parent classloader.
*/
- private ClassLoader m_common;
+ private ClassLoader m_system;
/**
* The domain
@@ -211,7 +212,7 @@
m_pool = (PoolManager) context.get( "urn:merlin:pool-manager" );
m_system = (ClassLoader) context.get( "urn:merlin:classloader.system" );
m_common = (ClassLoader) context.get( "urn:merlin:classloader.common" );
- m_domain = (String) context.get( "urn:merlin:domain" );
+ m_domain = (String) context.get( Engine.DOMAIN_KEY );
m_repository = (Repository) context.get( Repository.KEY );
if( context.hasEntry( KernelLoader.BASE_KEY ) )
{
@@ -223,6 +224,10 @@
// Initializable
//==============================================================
+ /**
+ * Initialization of the block loader.
+ * @exception if an initialization error occurs
+ */
public void initialize() throws Exception
{
if( m_repository == null )
@@ -422,7 +427,7 @@
context.put( LoggingManager.KEY, m_logging );
context.put( Repository.KEY, m_repository );
context.put( PoolManager.ROLE, m_pool );
- context.put( "urn:merlin:domain", m_domain );
+ context.put( Engine.DOMAIN_KEY, m_domain );
context.put( "urn:assembly:home", m_home );
context.put( "urn:assembly:system", m_root );
context.put( "urn:assembly:engine.bootstrap", "true" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
