mcconnell 2003/01/19 07:45:10
Modified: assembly/src/java/org/apache/avalon/assembly/appliance
DefaultAppliance.java
assembly/src/java/org/apache/avalon/assembly/engine
EngineClassLoader.java
assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration
DefaultConfigurationService.java
Log:
Revisions to the logging strategy inside the system context.
Revision Changes Path
1.25 +18 -12
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultAppliance.java 18 Jan 2003 16:19:31 -0000 1.24
+++ DefaultAppliance.java 19 Jan 2003 15:45:10 -0000 1.25
@@ -479,11 +479,6 @@
executeAssembly( graph );
}
- if( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "assembly complete" );
- }
-
if( isContextEnabled() )
{
Map map = buildContextMap();
@@ -496,10 +491,21 @@
if( getLogger().isDebugEnabled() )
{
Appliance[] providers = graph.getProviderGraph( this );
- StringBuffer buffer = new StringBuffer( "providers: " );
+ StringBuffer buffer =
+ new StringBuffer(
+ "assembled: " + this.toString()
+ + " providers: (" + providers.length + ") " );
+
for( int k=0; k<providers.length; k++ )
{
- buffer.append( ", " + providers[k] );
+ if( k > 0 )
+ {
+ buffer.append( ", " + providers[k] );
+ }
+ else
+ {
+ buffer.append( providers[k].toString() );
+ }
}
getLogger().debug( buffer.toString() );
}
@@ -517,7 +523,7 @@
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "disassemble" );
+ getLogger().debug( "disassemble: " + this );
}
Appliance[] consumers = getDependencyGraph().getConsumerGraph( this );
@@ -748,14 +754,14 @@
{
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "appliance termination" );
+ getLogger().debug( "termination: " + this );
}
m_handler.terminate();
}
private void executeAssembly( DependencyGraph graph ) throws AssemblyException
{
- getLogger().debug( "assembly" );
+ getLogger().debug( "assembly: " + this );
m_visited.add( this );
ContextDescriptor context = getType().getContext();
String ext = context.getAttribute(
"urn:assembly:lifecycle.context.strategy" );
@@ -808,7 +814,7 @@
if( getServiceProvider( role ) == null )
{
- getLogger().debug( "resolving role: [" + role + "] ");
+ getLogger().debug( "resolving role: [" + role + "] in " + this );
//
// select the preferred provider for the dependency - the dependency
1.26 +4 -2
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/EngineClassLoader.java
Index: EngineClassLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/EngineClassLoader.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- EngineClassLoader.java 15 Jan 2003 09:09:24 -0000 1.25
+++ EngineClassLoader.java 19 Jan 2003 15:45:10 -0000 1.26
@@ -901,7 +901,8 @@
throw new NullPointerException( "context" );
}
- Logger logger;
+ Logger logger = getLogger();
+ /*
if( nested )
{
logger = getLogger().getChildLogger( context.getName() );
@@ -910,6 +911,7 @@
{
logger = getLogger();
}
+ */
String classname = context.getApplianceFactoryClassname();
ApplianceFactory factory;
1.6 +18 -10
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/DefaultConfigurationService.java
Index: DefaultConfigurationService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/DefaultConfigurationService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultConfigurationService.java 18 Jan 2003 20:56:21 -0000 1.5
+++ DefaultConfigurationService.java 19 Jan 2003 15:45:10 -0000 1.6
@@ -59,6 +59,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.excalibur.configuration.ConfigurationUtil;
/**
* The default configuration service provides support for the configuration of a
@@ -72,9 +73,13 @@
{
/**
* Configure and or Parameterise a supplied object in accordance with the
- * supplied appliance criteria.
+ * supplied appliance criteria. The implementation applies the Avalon 4
+ * configuration strategy in which a component can receive both a {@link
Configuration}
+ * instance and a {@link Parameters} instance based on the components
implementation
+ * of the respective {@link Configurable} and {@link Parameterize} interfaces.
+ *
* @param appliance the appliace
- * @param object the object to configure
+ * @param object the object to configure and or parameterize
*/
public void configure( Appliance appliance, Object object )
throws Exception
@@ -90,16 +95,20 @@
if( object instanceof Configurable )
{
- if( getLogger().isDebugEnabled() )
- {
- final String message = appliance.toString();
- getLogger().debug( message );
- }
Configuration config = appliance.getConfiguration();
if( config == null )
{
config = new DefaultConfiguration( "configuration", null );
}
+
+ if( getLogger().isDebugEnabled() )
+ {
+ final String message =
+ "configure: " + appliance + "\n"
+ + ConfigurationUtil.list( config );
+ getLogger().debug( message );
+ }
+
((Configurable)object).configure( config );
}
@@ -107,7 +116,7 @@
{
if( getLogger().isDebugEnabled() )
{
- final String message = appliance.toString();
+ final String message = "parameterize: " + appliance.toString();
getLogger().debug( message );
}
Parameters params = appliance.getParameters();
@@ -117,6 +126,5 @@
}
((Parameterizable)object).parameterize( params );
}
-
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
