donaldp 01/04/15 06:29:58
Modified: src/java/org/apache/phoenix/engine
DefaultServerApplication.java
src/java/org/apache/phoenix/engine/blocks
DefaultBlockContext.java
src/java/org/apache/phoenix/engine/phases ShutdownPhase.java
StartupPhase.java
Log:
Incorporated ClassLoader Facility into kernel/application
Revision Changes Path
1.15 +12 -10
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java
Index: DefaultServerApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultServerApplication.java 2001/04/15 12:12:38 1.14
+++ DefaultServerApplication.java 2001/04/15 13:29:57 1.15
@@ -7,7 +7,6 @@
*/
package org.apache.phoenix.engine;
-import java.security.Policy;
import java.util.HashMap;
import java.util.Iterator;
import org.apache.avalon.Component;
@@ -24,21 +23,21 @@
import org.apache.avalon.camelot.AbstractContainer;
import org.apache.avalon.camelot.ContainerException;
import org.apache.avalon.camelot.Entry;
-import org.apache.avalon.camelot.Factory;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.util.thread.ThreadManager;
import org.apache.phoenix.engine.blocks.BlockDAG;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.engine.blocks.BlockVisitor;
import org.apache.phoenix.engine.blocks.RoleEntry;
+import org.apache.phoenix.engine.facilities.ClassLoaderManager;
import org.apache.phoenix.engine.facilities.ConfigurationRepository;
import org.apache.phoenix.engine.facilities.DefaultConfigurationRepository;
import org.apache.phoenix.engine.facilities.DefaultLogManager;
import org.apache.phoenix.engine.facilities.DefaultThreadManager;
import org.apache.phoenix.engine.facilities.PolicyManager;
-import org.apache.phoenix.engine.facilities.classmanager.SarClassLoader;
+import org.apache.phoenix.engine.facilities.ThreadManager;
+import org.apache.phoenix.engine.facilities.classloader.DefaultClassLoaderManager;
import org.apache.phoenix.engine.facilities.policy.DefaultPolicyManager;
import org.apache.phoenix.engine.phases.ShutdownPhase;
import org.apache.phoenix.engine.phases.StartupPhase;
@@ -73,7 +72,7 @@
protected DefaultLogManager m_logManager;
protected PolicyManager m_policyManager;
protected ThreadManager m_threadManager;
- protected SarClassLoader m_classLoader;
+ protected ClassLoaderManager m_classLoaderManager;
//these are the facilities (internal components) of ServerApplication
protected ConfigurationRepository m_configurationRepository;
@@ -184,7 +183,7 @@
m_configurationRepository = new DefaultConfigurationRepository();
- m_classLoader = new SarClassLoader();
+ m_classLoaderManager = new DefaultClassLoaderManager();
m_threadManager = new DefaultThreadManager();
m_policyManager = new DefaultPolicyManager();
}
@@ -208,7 +207,7 @@
configuration = m_configuration.getChild( "policy" );
setupComponent( m_policyManager, "<policy>", configuration );
- setupComponent( m_classLoader );
+ setupComponent( m_classLoaderManager );
setupComponent( m_configurationRepository );
@@ -326,10 +325,13 @@
{
final DefaultComponentManager componentManager = new
DefaultComponentManager();
componentManager.put( "org.apache.avalon.camelot.Container", this );
- componentManager.put( "org.apache.phoenix.engine.facilities.PolicyManager",
m_policyManager );
- componentManager.put( "java.lang.ClassLoader", m_classLoader );
+ componentManager.put( "org.apache.phoenix.engine.facilities.PolicyManager",
+ m_policyManager );
+ componentManager.put(
"org.apache.phoenix.engine.facilities.ClassLoaderManager",
+ m_classLoaderManager );
componentManager.put( "NOT_DONE_YET", m_logManager );
- componentManager.put( "org.apache.avalon.util.thread.ThreadManager",
m_threadManager );
+ componentManager.put( "org.apache.phoenix.engine.facilities.ThreadManager",
+ m_threadManager );
componentManager.put(
"org.apache.phoenix.engine.facilities.ConfigurationRepository",
m_configurationRepository );
1.4 +11 -11
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlockContext.java 2001/04/11 10:06:59 1.3
+++ DefaultBlockContext.java 2001/04/15 13:29:57 1.4
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.phoenix.engine.blocks;
import java.io.File;
import org.apache.avalon.Context;
import org.apache.avalon.DefaultContext;
-import org.apache.avalon.util.thread.ThreadManager;
import org.apache.avalon.util.thread.ThreadPool;
import org.apache.log.Logger;
import org.apache.phoenix.BlockContext;
+import org.apache.phoenix.engine.facilities.ThreadManager;
/**
* Context via which Blocks communicate with container.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultBlockContext
@@ -32,8 +32,8 @@
this( logger, threadManager, null );
}
- public DefaultBlockContext( final Logger logger,
- final ThreadManager threadManager,
+ public DefaultBlockContext( final Logger logger,
+ final ThreadManager threadManager,
final Context context )
{
super( context );
@@ -63,7 +63,7 @@
/**
* Retrieve thread manager by category.
- * ThreadManagers are given names so that you can manage different thread
+ * ThreadManagers are given names so that you can manage different thread
* count to different components.
*
* @param category the category
1.4 +7 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/ShutdownPhase.java
Index: ShutdownPhase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/ShutdownPhase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ShutdownPhase.java 2001/04/15 05:40:53 1.3
+++ ShutdownPhase.java 2001/04/15 13:29:58 1.4
@@ -15,9 +15,10 @@
import org.apache.avalon.Stoppable;
import org.apache.avalon.atlantis.ApplicationException;
import org.apache.avalon.util.thread.ThreadContext;
-import org.apache.avalon.util.thread.ThreadManager;
+import org.apache.phoenix.engine.facilities.ThreadManager;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.engine.blocks.BlockVisitor;
+import org.apache.phoenix.engine.facilities.ClassLoaderManager;
/**
*
@@ -33,10 +34,13 @@
public void compose( final ComponentManager componentManager )
throws ComponentManagerException
{
- m_classLoader = (ClassLoader)componentManager.lookup(
"java.lang.ClassLoader" );
+ final ClassLoaderManager classLoaderManager =
(ClassLoaderManager)componentManager.
+ lookup( "org.apache.phoenix.engine.facilities.ClassLoaderManager" );
+ m_classLoader = classLoaderManager.getClassLoader();
+
m_threadManager = (ThreadManager)componentManager.
- lookup( "org.apache.avalon.util.thread.ThreadManager" );
+ lookup( "org.apache.phoenix.engine.facilities.ThreadManager" );
}
/**
1.5 +10 -6
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/StartupPhase.java
Index: StartupPhase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/StartupPhase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StartupPhase.java 2001/04/15 08:13:32 1.4
+++ StartupPhase.java 2001/04/15 13:29:58 1.5
@@ -30,7 +30,7 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.util.thread.ThreadContext;
-import org.apache.avalon.util.thread.ThreadManager;
+import org.apache.phoenix.engine.facilities.ThreadManager;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
import org.apache.phoenix.engine.SarContextResources;
@@ -38,6 +38,7 @@
import org.apache.phoenix.engine.blocks.BlockVisitor;
import org.apache.phoenix.engine.blocks.DefaultBlockContext;
import org.apache.phoenix.engine.blocks.RoleEntry;
+import org.apache.phoenix.engine.facilities.ClassLoaderManager;
import org.apache.phoenix.engine.facilities.ConfigurationRepository;
import org.apache.phoenix.metainfo.BlockInfo;
import org.apache.phoenix.metainfo.BlockUtil;
@@ -56,10 +57,10 @@
private ThreadManager m_threadManager;
///Factory used to build instance of Block
- private Factory m_factory;
+ private Factory m_factory;
///base context used to setup hosted blocks
- private DefaultContext m_baseBlockContext;
+ private DefaultContext m_baseBlockContext;
/**
* The container (ie kernel) which this phase is associated with.
@@ -83,15 +84,18 @@
public void compose( final ComponentManager componentManager )
throws ComponentManagerException
{
- m_classLoader = (ClassLoader)componentManager.lookup(
"java.lang.ClassLoader" );
+ final ClassLoaderManager classLoaderManager =
(ClassLoaderManager)componentManager.
+ lookup( "org.apache.phoenix.engine.facilities.ClassLoaderManager" );
+ m_classLoader = classLoaderManager.getClassLoader();
+
m_factory = new SimpleFactory( m_classLoader );
m_container = (Container)componentManager.
lookup( "org.apache.avalon.camelot.Container" );
m_threadManager = (ThreadManager)componentManager.
- lookup( "org.apache.avalon.util.thread.ThreadManager" );
+ lookup( "org.apache.phoenix.engine.facilities.ThreadManager" );
m_repository = (ConfigurationRepository)componentManager.
lookup( "org.apache.phoenix.engine.facilities.ConfigurationRepository"
);
@@ -146,7 +150,7 @@
if( object instanceof Composer )
{
getLogger().debug( "Pre-Composition Stage" );
- final ComponentManager componentManager =
+ final ComponentManager componentManager =
createComponentManager( name, entry );
((Composer)object).compose( componentManager );
getLogger().debug( "Composition successful." );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
