proyal 2002/10/24 04:25:10
Modified: fortress/src/java/org/apache/excalibur/fortress
AbstractContainer.java
fortress/src/java/org/apache/excalibur/fortress/util
ConfigurableRoleManager.java ContextManager.java
ExcaliburRoleManager.java
Log:
Patch from "Eung-ju Park" <[EMAIL PROTECTED]>
* Pass context classloader to role manager
Revision Changes Path
1.63 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- AbstractContainer.java 3 Oct 2002 03:21:13 -0000 1.62
+++ AbstractContainer.java 24 Oct 2002 11:25:10 -0000 1.63
@@ -170,7 +170,7 @@
{
try
{
- m_roleManager = new ExcaliburRoleManager();
+ m_roleManager = new ExcaliburRoleManager( null, m_classLoader );
ContainerUtil.enableLogging( m_roleManager,
getLogger().getChildLogger( "roles" ) );
ContainerUtil.initialize( m_roleManager );
}
1.13 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ConfigurableRoleManager.java
Index: ConfigurableRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ConfigurableRoleManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ConfigurableRoleManager.java 13 Aug 2002 07:57:27 -0000 1.12
+++ ConfigurableRoleManager.java 24 Oct 2002 11:25:10 -0000 1.13
@@ -85,7 +85,7 @@
*/
public ConfigurableRoleManager( RoleManager parent )
{
- super( parent, Thread.currentThread().getContextClassLoader() );
+ super( parent, null );
}
/**
1.44 +6 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ContextManager.java 2 Oct 2002 01:52:21 -0000 1.43
+++ ContextManager.java 24 Oct 2002 11:25:10 -0000 1.44
@@ -567,13 +567,16 @@
Logger rmLogger = loggerManager.getLoggerForCategory(
roleConfig.getAttribute( "logger", "system.roles" ) );
+ // Lookup the context class loader
+ ClassLoader classLoader = (ClassLoader)containerManagerContext.get(
CONTEXT_CLASSLOADER );
+
// Create a parent role manager with all the default roles
- ExcaliburRoleManager erm = new ExcaliburRoleManager();
+ ExcaliburRoleManager erm = new ExcaliburRoleManager( null, classLoader );
erm.enableLogging( rmLogger.getChildLogger( "defaults" ) );
erm.initialize();
// Create a role manager with the configured roles
- ConfigurableRoleManager rm = new ConfigurableRoleManager( erm );
+ ConfigurableRoleManager rm = new ConfigurableRoleManager( erm, classLoader
);
rm.enableLogging( rmLogger );
rm.configure( roleConfig );
1.19 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ExcaliburRoleManager.java 2 Oct 2002 01:52:21 -0000 1.18
+++ ExcaliburRoleManager.java 24 Oct 2002 11:25:10 -0000 1.19
@@ -82,7 +82,7 @@
*/
public ExcaliburRoleManager( RoleManager parent )
{
- this( parent, Thread.currentThread().getContextClassLoader() );
+ this( parent, null );
}
/**
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
