You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2002/08/18 14:06:12 UTC
cvs commit: jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component ExcaliburComponentManager.java ExcaliburComponentSelector.java
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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>