You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/22 02:35:33 UTC
cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl DefaultContainer.xinfo
mcconnell 2003/06/21 17:35:33
Modified: merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
StandardBlock.java StandardBlock.xinfo
merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl
DefaultContainer.xinfo
Log:
Enhancement to logging info output and sync. with appliance implementation changes.
Revision Changes Path
1.13 +23 -1 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.java
Index: StandardBlock.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StandardBlock.java 18 Jun 2003 11:28:12 -0000 1.12
+++ StandardBlock.java 22 Jun 2003 00:35:33 -0000 1.13
@@ -630,6 +630,7 @@
for( int i=0; i<appliances.length; i++ )
{
+ int n = appliances.length;
Appliance appliance = appliances[i];
if( appliance != this )
{
@@ -639,7 +640,7 @@
{
final String message =
"activating component ("
- + (i+1) + ":" + appliances.length + ") : "
+ + (i+1) + ":" + n + ") : "
+ appliance;
getLogger().debug( message );
}
@@ -668,6 +669,27 @@
throw new BlockException( error, e );
}
}
+ }
+ else
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ final String message =
+ "bypassing lazy component ("
+ + (i+1) + ":" + n + ") : "
+ + appliance;
+ getLogger().debug( message );
+ }
+ }
+ }
+ else
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ final String message =
+ "ignoring self reference ("
+ + (i+1) + ":" + n + ")";
+ getLogger().debug( message );
}
}
}
1.7 +0 -2 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.xinfo
Index: StandardBlock.xinfo
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.xinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardBlock.xinfo 19 Jun 2003 11:27:10 -0000 1.6
+++ StandardBlock.xinfo 22 Jun 2003 00:35:33 -0000 1.7
@@ -23,8 +23,6 @@
<entry key="urn:assembly:engine"
type="org.apache.avalon.assembly.engine.impl.EngineClassLoader"/>
- <entry key="urn:assembly:lifestyle.service"
- type="org.apache.avalon.assembly.lifestyle.LifestyleService"/>
<entry key="org.apache.excalibur.mpool.PoolManager"
type="org.apache.excalibur.mpool.PoolManager"/>
<entry key="urn:assembly:appliance.system"
1.5 +1 -0 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.xinfo
Index: DefaultContainer.xinfo
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContainer.xinfo 24 Apr 2003 12:37:35 -0000 1.4
+++ DefaultContainer.xinfo 22 Jun 2003 00:35:33 -0000 1.5
@@ -17,6 +17,7 @@
<info>
<name>container</name>
<version>1.0</version>
+ <lifestyle>singleton</lifestyle>
<attributes>
<attribute key="urn:assembly:appliance.class"
value="org.apache.avalon.merlin.block.impl.StandardBlock"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org