cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/source/impl BlobSource.java

[sylvain]

sylvain     2004/03/11 07:34:30

  Modified:    
src/blocks/databases/java/org/apache/cocoon/components/source/impl
                        BlobSource.java
  Log:
  A ServiceManager returns a ServlceSelector
  
  Revision  Changes    Path
  1.6       +4 -4      
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java
  
  Index: BlobSource.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BlobSource.java   5 Mar 2004 13:01:55 -0000       1.5
  +++ BlobSource.java   11 Mar 2004 15:34:30 -0000      1.6
  @@ -29,9 +29,9 @@
   import java.sql.Types;
   import java.util.Iterator;
   
  -import org.apache.avalon.framework.component.ComponentSelector;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   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.excalibur.datasource.DataSourceComponent;
  @@ -311,12 +311,12 @@
   
       private Connection getConnection() throws SourceException {
   
  -        ComponentSelector selector = null;
  +        ServiceSelector selector = null;
           DataSourceComponent datasource = null;
   
           try {
               try {
  -                selector = 
(ComponentSelector)this.manager.lookup(DataSourceComponent.ROLE + "Selector");
  +                selector = 
(ServiceSelector)this.manager.lookup(DataSourceComponent.ROLE + "Selector");
   
                   datasource = 
(DataSourceComponent)selector.select(this.datasourceName);