donaldp 02/04/18 03:46:13
Modified: lib excalibur-extension-1.0a.jar
src/java/org/apache/avalon/phoenix/components/classloader
DefaultClassLoaderManager.java
Log:
Moved ability to scan multiple manifests into Extension object.
Revision Changes Path
1.3 +106 -102 jakarta-avalon-phoenix/lib/excalibur-extension-1.0a.jar
<<Binary file>>
1.27 +2 -46
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultClassLoaderManager.java 18 Apr 2002 10:30:37 -0000 1.26
+++ DefaultClassLoaderManager.java 18 Apr 2002 10:46:13 -0000 1.27
@@ -163,8 +163,8 @@
throws Exception
{
final Manifest[] manifests = getManifests( classPath );
- final Extension[] available = getAvailable( manifests );
- final Extension[] required = getRequired( manifests );
+ final Extension[] available = Extension.getAvailable( manifests );
+ final Extension[] required = Extension.getRequired( manifests );
if( getLogger().isDebugEnabled() )
{
@@ -212,50 +212,6 @@
final OptionalPackage[] packages =
(OptionalPackage[])dependencies.toArray( new OptionalPackage[ 0
] );
return OptionalPackage.toFiles( packages );
- }
-
- /**
- * Retrieve an array of available extensions from the specified
manifests.
- *
- * @param manifests the manifests to scan
- * @return the extensions
- */
- private Extension[] getAvailable( final Manifest[] manifests )
- {
- final ArrayList availableSet = new ArrayList();
-
- for( int i = 0; i < manifests.length; i++ )
- {
- final Extension[] available = Extension.getAvailable( manifests[
i ] );
- for( int j = 0; j < available.length; j++ )
- {
- availableSet.add( available[ j ] );
- }
- }
-
- return (Extension[])availableSet.toArray( new Extension[ 0 ] );
- }
-
- /**
- * Retrieve an array of required extensions from the specified manifests.
- *
- * @param manifests the manifests to scan
- * @return the extensions
- */
- private Extension[] getRequired( final Manifest[] manifests )
- {
- final ArrayList availableSet = new ArrayList();
-
- for( int i = 0; i < manifests.length; i++ )
- {
- final Extension[] available = Extension.getRequired( manifests[
i ] );
- for( int j = 0; j < available.length; j++ )
- {
- availableSet.add( available[ j ] );
- }
- }
-
- return (Extension[])availableSet.toArray( new Extension[ 0 ] );
}
private Manifest[] getManifests( final String[] classPath )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
