avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component ExcaliburComponentManager.java ExcaliburComponentSelector.java
Date Sun, 18 Aug 2002 12:06:12 GMT
leif        2002/08/18 05:06:12

  Modified:    component/src/java/org/apache/avalon/excalibur/component
                        ExcaliburComponentManager.java
                        ExcaliburComponentSelector.java
  Log:
  When resolving an instrumentable name, make the selector fall back on the
  configuration node name.
  
  Revision  Changes    Path
  1.12      +4 -1      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java
  
  Index: ExcaliburComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ExcaliburComponentManager.java	6 Aug 2002 16:28:37 -0000	1.11
  +++ ExcaliburComponentManager.java	18 Aug 2002 12:06:12 -0000	1.12
  @@ -744,6 +744,9 @@
                                                       final LogkitLoggerManager logkitManager
)
           throws Exception
       {
  +        // The instrumentable name will be set by first looking for a name set using
  +        //  the instrumentable attribute.  If missing, the name of the configuration
  +        //  element is used.
           String instrumentableName =
               configuration.getAttribute( "instrumentable", configuration.getName() );
           
  
  
  
  1.12      +6 -2      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java
  
  Index: ExcaliburComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ExcaliburComponentSelector.java	6 Aug 2002 16:28:38 -0000	1.11
  +++ ExcaliburComponentSelector.java	18 Aug 2002 12:06:12 -0000	1.12
  @@ -621,8 +621,12 @@
                                                       final LogkitLoggerManager logkitManager
)
           throws Exception
       {
  +        // The instrumentable name will be set by first looking for a name set using
  +        //  the instrumentable attribute.  If missing, the name attribute is used.
  +        //  Finally, the name of the configuration element is used.
           String instrumentableName =
  -            configuration.getAttribute( "instrumentable", configuration.getAttribute( "name"
) );
  +            configuration.getAttribute( "instrumentable",
  +            configuration.getAttribute( "name", configuration.getName() ) );
   
           return ComponentHandler.getComponentHandler( componentClass,
                                                        configuration,
  
  
  

--
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