mcconnell 2003/08/27 19:14:20
Modified: merlin/composition/src/java/org/apache/avalon/composition/model/impl
Resources.properties Scanner.java
Log:
Improve handling of type verification when dealing with incomplete class defintions.
Revision Changes Path
1.16 +2 -1
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Resources.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Resources.properties 27 Jul 2003 03:15:36 -0000 1.15
+++ Resources.properties 28 Aug 2003 02:14:20 -0000 1.16
@@ -69,8 +69,9 @@
scanner.not-file-protocol.error=URL protocol does not match the required 'file'
protocol: {0}
scanner.type.missing-class.error=Cannot load component type because the type class
{0} does not exist in the classloader.
scanner.type.bad-class.error=Component type [{0}] contains a reference to the class
[{1}] which does not exist in the classloader.
-scanner.extension.bad-class.error=Cannot load component type [{0}] because the type
declares an extension class [{1}] which cannot be loaded to a missing class [{2}].
+scanner.extension.bad-class.error=Cannot load component type [{0}] because the type
declares an extension class [{1}] which cannot be loaded due to a missing class [{2}].
scanner.extension.missing.error=Cannot load component type [{0}] contains because
the extension class it declares [{1}] does not exist in the classloader.
+scanner.type.verification.ncdf.failure=Ignoring component type [{0}] as the
implementation class contains a reference to the class [{1}] which does not exist in
the classloader.
# DefaultImportModel
# ==================
1.14 +10 -1
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Scanner.java
Index: Scanner.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Scanner.java 26 Aug 2003 22:45:24 -0000 1.13
+++ Scanner.java 28 Aug 2003 02:14:20 -0000 1.14
@@ -392,6 +392,15 @@
}
types.add( type );
}
+ catch( NoClassDefFoundError e )
+ {
+ if( getLogger().isWarnEnabled() )
+ {
+ final String error =
+ REZ.getString( "scanner.type.verification.ncdf.failure",
classname, e.getMessage() );
+ getLogger().warn( error );
+ }
+ }
catch( Throwable e )
{
if( getLogger().isWarnEnabled() )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
