cziegeler 2003/01/29 23:15:30
Modified: sourceresolve/src/java/org/apache/excalibur/source/impl
SourceResolverImpl.java
Log:
Reverting to ServiceSelector
Revision Changes Path
1.26 +6 -7
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/SourceResolverImpl.java
Index: SourceResolverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/SourceResolverImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SourceResolverImpl.java 29 Jan 2003 17:18:03 -0000 1.25
+++ SourceResolverImpl.java 30 Jan 2003 07:15:30 -0000 1.26
@@ -61,8 +61,6 @@
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -72,6 +70,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.source.Source;
@@ -109,7 +108,7 @@
protected ServiceManager m_manager;
/** The special Source factories */
- protected ComponentSelector m_factorySelector;
+ protected ServiceSelector m_factorySelector;
/**
* The base URL
@@ -170,7 +169,7 @@
throws ServiceException
{
m_manager = manager;
- m_factorySelector = (ComponentSelector)m_manager.lookup(
SourceFactory.ROLE + "Selector" );
+ m_factorySelector = (ServiceSelector)m_manager.lookup(
SourceFactory.ROLE + "Selector" );
}
public void dispose()
@@ -304,7 +303,7 @@
factory = (SourceFactory)m_factorySelector.select( protocol
);
source = factory.getSource( systemID, parameters );
}
- catch( final ComponentException ce )
+ catch( final ServiceException ce )
{
// no selector available, use fallback
//throw new SourceException( "Unable to select source
factory for protocol " + protocol, ce );
@@ -382,7 +381,7 @@
factory = (SourceFactory)m_factorySelector.select( scheme );
factory.release( source );
}
- catch( ComponentException ce )
+ catch( ServiceException ce )
{
//no factory available, so use fallback
//throw new CascadingRuntimeException( "Unable to select source
factory for protocol " + protocol, ce );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
