bloritsch 2002/09/11 12:58:49
Modified: container/src/java/org/apache/excalibur/container/classloader
ComponentClassLoader.java
container/src/java/org/apache/excalibur/container/lookup
AbstractServiceManager.java
Added: container/src/test/org/apache/excalibur/container/classloader
empty.jar full.jar
container/src/test/org/apache/excalibur/container/classloader/test
ComponentClassLoaderTestCase.java
Log:
fix package name, and add testcase code
Revision Changes Path
1.2 +1 -1
jakarta-avalon-excalibur/container/src/java/org/apache/excalibur/container/classloader/ComponentClassLoader.java
Index: ComponentClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/container/src/java/org/apache/excalibur/container/classloader/ComponentClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentClassLoader.java 11 Sep 2002 17:38:49 -0000 1.1
+++ ComponentClassLoader.java 11 Sep 2002 19:58:49 -0000 1.2
@@ -6,7 +6,7 @@
* the LICENSE.txt file.
*/
-package org.apache.excalibur.container.lookup;
+package org.apache.excalibur.container.classloader;
import java.util.HashSet;
import java.util.Iterator;
1.2 +1 -1
jakarta-avalon-excalibur/container/src/java/org/apache/excalibur/container/lookup/AbstractServiceManager.java
Index: AbstractServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/container/src/java/org/apache/excalibur/container/lookup/AbstractServiceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractServiceManager.java 9 Sep 2002 15:25:22 -0000 1.1
+++ AbstractServiceManager.java 11 Sep 2002 19:58:49 -0000 1.2
@@ -59,7 +59,7 @@
}
protected abstract boolean serviceExists( String role );
- protected abstract Object obtainService( String role );
+ protected abstract Object obtainService( String role ) throws ServiceException;
public abstract void release( Object service );
/**
1.1
jakarta-avalon-excalibur/container/src/test/org/apache/excalibur/container/classloader/empty.jar
<<Binary file>>
1.1
jakarta-avalon-excalibur/container/src/test/org/apache/excalibur/container/classloader/full.jar
<<Binary file>>
1.1
jakarta-avalon-excalibur/container/src/test/org/apache/excalibur/container/classloader/test/ComponentClassLoaderTestCase.java
Index: ComponentClassLoaderTestCase.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.container.classloader.test;
import junit.framework.TestCase;
import java.net.URL;
import java.util.Set;
import java.util.HashSet;
import org.apache.excalibur.container.classloader.ComponentClassLoader;
/**
* A testcase for the @link{ComponentClassLoader}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
*/
public class ComponentClassLoaderTestCase extends TestCase
{
private Set m_blocks;
private Set m_services;
private Set m_types;
public ComponentClassLoaderTestCase()
{
this( "ComponentClassLoaderTestCase" );
}
public ComponentClassLoaderTestCase( String name )
{
super( name );
m_blocks = new HashSet();
m_blocks.add("org.apache.avalon.test.EphemeralComponent");
m_blocks.add("org.apache.avalon.test.AnotherTest");
m_types = new HashSet();
m_types.add("org.apache.avalon.test.EphemeralComponent");
m_types.add("org.apache.avalon.test.YetAnotherTest");
m_types.add("org.apache.avalon.test.HooHa");
m_services = new HashSet();
m_services.add("org.apache.avalon.test.EphemeralComponent");
m_services.add("org.apache.avalon.test.Nothing");
}
public void testEmptyManifest()
{
URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/empty.jar" );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
assertEquals( loader.getServices().length, 0 );
assertEquals( loader.getBlocks().length, 0 );
assertEquals( loader.getTypes().length, 0 );
}
public void testBlocksManifest()
{
URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/all.jar" );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
String[] blocks = loader.getBlocks();
assertEquals( blocks.length, m_blocks.size() );
for ( int i = 0; i < blocks.length; i++ )
{
assertTrue( m_blocks.contains( blocks[i] ) );
}
}
public void testServicesManifest()
{
URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/all.jar" );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
String[] services = loader.getServices();
assertEquals( services.length, m_services.size() );
for ( int i = 0; i < services.length; i++ )
{
assertTrue( m_services.contains( services[i] ) );
}
}
public void testTypesManifest()
{
URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/all.jar" );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
String[] types = loader.getTypes();
assertEquals( types.length, m_types.size() );
for ( int i = 0; i < types.length; i++ )
{
assertTrue( m_types.contains( types[i] ) );
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
