You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2003/12/22 10:06:41 UTC
cvs commit: avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl AbstractBlock.java DefaultApplianceRepository.java
niclas 2003/12/22 01:06:41
Modified: merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
AbstractBlock.java DefaultApplianceRepository.java
Log:
Added a little bit logging in the DefaultApplianceRepository, so one can see what happens if the lookup fails.
Revision Changes Path
1.7 +6 -3 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractBlock.java 4 Dec 2003 00:23:21 -0000 1.6
+++ AbstractBlock.java 22 Dec 2003 09:06:41 -0000 1.7
@@ -148,6 +148,7 @@
m_context = context;
final ApplianceRepository parent = context.getApplianceRepository();
m_repository = new DefaultApplianceRepository( parent );
+ m_repository.enableLogging( getLogger() );
m_self.setEnabled( true );
Model[] models = m_context.getContainmentModel().getModels();
@@ -472,7 +473,8 @@
throws IllegalArgumentException
{
Appliance appliance = m_repository.getLocalAppliance( name );
- if( appliance != null ) return appliance;
+ if( appliance != null )
+ return appliance;
final String error = "Unknown name: [" + name + "]";
throw new IllegalArgumentException( error );
}
@@ -879,8 +881,9 @@
}
Logger logger = logging.getLoggerForCategory( path );
- ApplianceRepository repository =
+ DefaultApplianceRepository repository =
new DefaultApplianceRepository( m_repository );
+ repository.enableLogging( getLogger() );
BlockContext context = new DefaultBlockContext(
logger, containment,
1.3 +18 -4 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java
Index: DefaultApplianceRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultApplianceRepository.java 18 Oct 2003 00:34:19 -0000 1.2
+++ DefaultApplianceRepository.java 22 Dec 2003 09:06:41 -0000 1.3
@@ -56,9 +56,13 @@
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.ApplianceRepository;
+
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
+
/**
* The appliance repository interface declares operations through which
* clients may resolve registered appliance instances relative to
@@ -77,7 +81,9 @@
* The parent appliance repository.
*/
private ApplianceRepository m_parent;
-
+
+ private Logger m_Logger;
+
/**
* Table of registered appliance instances keyed by name.
*/
@@ -89,13 +95,18 @@
public DefaultApplianceRepository()
{
- m_parent = null;
+ this( null );
}
public DefaultApplianceRepository( ApplianceRepository parent )
{
m_parent = parent;
}
+
+ public void enableLogging( Logger logger )
+ {
+ m_Logger = logger;
+ }
//------------------------------------------------------------------
// ApplianceRepository
@@ -196,6 +207,9 @@
*/
public Appliance getLocalAppliance( String name )
{
- return (Appliance) m_appliances.get( name );
+ Appliance appl = (Appliance) m_appliances.get( name );
+ if( appl == null && m_Logger != null )
+ m_Logger.debug( "Can't find '" + name + "' in appliance repository: " + m_appliances );
+ return appl;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org