mcconnell 2003/04/24 05:39:15
Modified: merlin/merlin-core/src/test/org/apache/avalon/merlin
AbstractTestCase.java
merlin/merlin-core/src/test/org/apache/avalon/playground
ContextualizationHandler.java
Log:
Sync. of test cases.
Revision Changes Path
1.3 +1 -1
avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/merlin/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/merlin/AbstractTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTestCase.java 16 Apr 2003 14:45:54 -0000 1.2
+++ AbstractTestCase.java 24 Apr 2003 12:39:15 -0000 1.3
@@ -60,7 +60,7 @@
import junit.framework.TestCase;
/**
- * A testcase for the @link{DefaultTypeManager}.
+ * A testcase for the @link{DefaultTypeRepository}.
*
* @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
*/
1.3 +8 -5
avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/ContextualizationHandler.java
Index: ContextualizationHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/ContextualizationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextualizationHandler.java 16 Apr 2003 14:45:55 -0000 1.2
+++ ContextualizationHandler.java 24 Apr 2003 12:39:15 -0000 1.3
@@ -76,17 +76,19 @@
/**
* Handle the contextualization stage of a component lifecycle.
+ * @param loader the classloader
+ * @param directive the context directitive
* @param object the object to contextualize
- * @param context the deployment context
+ * @param map the map of context entries
* @exception ContextException if a contextualization error occurs
*/
public void contextualize(
- ContextDirective directive, Object object, Map map )
+ ClassLoader loader, ContextDirective directive, Object object, Map map
)
throws ContextException
{
if( object instanceof Contextualizable )
{
- Object context = createContextArgument( directive,
StandardContext.class, map );
+ Object context = createContextArgument( loader, directive,
StandardContext.class, map );
if( context instanceof StandardContext )
{
( (Contextualizable)object ).contextualize(
(StandardContext) context );
@@ -116,7 +118,8 @@
* @param map the context entry map
* @return the context argument value
*/
- public Object createContextArgument( ContextDirective directive, Class
clazz, Map map )
+ public Object createContextArgument(
+ ClassLoader loader, ContextDirective directive, Class clazz, Map map )
throws ContextException
{
if( directive == null )
@@ -138,7 +141,7 @@
{
try
{
- base =
Thread.currentThread().getContextClassLoader().loadClass( classname );
+ base = loader.loadClass( classname );
}
catch( ClassNotFoundException cnfe )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
