avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container MetaDataContainer.java
Date Sun, 10 Nov 2002 11:58:49 GMT
donaldp     2002/11/10 03:58:49

  Modified:    fortress/src/java/org/apache/excalibur/fortress
                        ContainerConstants.java
               fortress/src/java/org/apache/excalibur/fortress/container
                        AbstractContainer.java
               fortress/src/java/org/apache/excalibur/fortress/util
                        ContextBuilder.java ContextManager.java
               fortress/src/ng/org/apache/excalibur/fortress/container
                        MetaDataContainer.java
  Log:
  Migrate to using Classname of ClassLoader as name of Context key.
  
  Revision  Changes    Path
  1.12      +1 -5      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerConstants.java
  
  Index: ContainerConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerConstants.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ContainerConstants.java	10 Nov 2002 11:55:11 -0000	1.11
  +++ ContainerConstants.java	10 Nov 2002 11:58:49 -0000	1.12
  @@ -49,8 +49,6 @@
   */
   package org.apache.excalibur.fortress;
   
  -
  -
   /**
    * Provides constants used to access the Context object for containers.
    * A container should allow these values to propagate down to child
  @@ -65,6 +63,4 @@
       String WORK_DIRECTORY = "container.workDir";
       String THREADS_CPU = "container.threadsPerCPU";
       String THREAD_TIMEOUT = "container.threadTimeout";
  -
  -    String CONTEXT_CLASSLOADER = ClassLoader.class.getName();
   }
  
  
  
  1.13      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AbstractContainer.java	10 Nov 2002 11:42:40 -0000	1.12
  +++ AbstractContainer.java	10 Nov 2002 11:58:49 -0000	1.13
  @@ -124,7 +124,7 @@
           m_context = context;
           try
           {
  -            m_classLoader = (ClassLoader)context.get( ContainerConstants.CONTEXT_CLASSLOADER
);
  +            m_classLoader = (ClassLoader)context.get( ClassLoader.class.getName() );
           }
           catch( ContextException ce )
           {
  
  
  
  1.29      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ContextBuilder.java	10 Nov 2002 11:43:24 -0000	1.28
  +++ ContextBuilder.java	10 Nov 2002 11:58:49 -0000	1.29
  @@ -128,7 +128,7 @@
           defaultContext.put( CONTEXT_DIRECTORY, new File( "../" ) );
           defaultContext.put( WORK_DIRECTORY, new File( "/tmp" ) );
           defaultContext.put( LOG_CATEGORY, "fortress" );
  -        defaultContext.put( CONTEXT_CLASSLOADER, classLoader );
  +        defaultContext.put( ClassLoader.class.getName(), classLoader );
           defaultContext.put( CONFIGURATION_URI, "conf/system.xconf" );
           defaultContext.put( LOGGER_MANAGER_CONFIGURATION_URI, "conf/logkit.xconf" );
           defaultContext.put( ROLE_MANAGER_CONFIGURATION_URI, "resource://ext/system.roles"
);
  @@ -172,7 +172,7 @@
           ClassLoader classLoader = null;
           try
           {
  -            classLoader = (ClassLoader)context.get( CONTEXT_CLASSLOADER );
  +            classLoader = (ClassLoader)context.get( ClassLoader.class.getName() );
           }
           catch( ContextException ce )
           {
  @@ -217,7 +217,7 @@
   
       public ContextBuilder setContextClassLoader( ClassLoader loader )
       {
  -        context.put( CONTEXT_CLASSLOADER, loader );
  +        context.put( ClassLoader.class.getName(), loader );
           return this;
       }
   
  
  
  
  1.52      +2 -2      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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- ContextManager.java	10 Nov 2002 11:44:16 -0000	1.51
  +++ ContextManager.java	10 Nov 2002 11:58:49 -0000	1.52
  @@ -567,7 +567,7 @@
               roleConfig.getAttribute( "logger", "system.roles" ) );
   
           // Lookup the context class loader
  -        ClassLoader classLoader = (ClassLoader)m_containerManagerContext.get( CONTEXT_CLASSLOADER
);
  +        ClassLoader classLoader = (ClassLoader)m_containerManagerContext.get( ClassLoader.class.getName()
);
   
           // Create a parent role m_manager with all the default roles
           ExcaliburRoleManager erm = new ExcaliburRoleManager( null, classLoader );
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container/MetaDataContainer.java
  
  Index: MetaDataContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container/MetaDataContainer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MetaDataContainer.java	10 Nov 2002 11:56:44 -0000	1.4
  +++ MetaDataContainer.java	10 Nov 2002 11:58:49 -0000	1.5
  @@ -137,7 +137,7 @@
   
           try
           {
  -            m_loader = (ClassLoader)m_context.get( ContainerConstants.CONTEXT_CLASSLOADER
);
  +            m_loader = (ClassLoader)m_context.get( ClassLoader.class.getName() );
           }
           catch( ContextException ce )
           {
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message