mcconnell 2003/10/19 07:05:11
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultAppliance.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Scanner.java
Log:
Housekeeping.
Revision Changes Path
1.8 +5 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultAppliance.java 19 Oct 2003 10:45:53 -0000 1.7
+++ DefaultAppliance.java 19 Oct 2003 14:05:10 -0000 1.8
@@ -470,7 +470,10 @@
{
getLogger().debug(
"deployment ("
- + lifestyle + ") ["
+ + lifestyle
+ + "/"
+ + InfoDescriptor.getCollectionPolicyKey(
m_model.getCollectionPolicy() )
+ + ") ["
+ m_model.getActivationPolicy() + "]" );
}
1.2 +1 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java
Index: Scanner.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scanner.java 24 Sep 2003 09:32:18 -0000 1.1
+++ Scanner.java 19 Oct 2003 14:05:11 -0000 1.2
@@ -380,7 +380,6 @@
String classname = parseResourceName( name );
Class clazz = getComponentClass( classname );
Type type = TYPE_BUILDER.buildType( clazz );
-
try
{
verifyType( type, clazz );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
