You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/08/06 10:44:22 UTC
cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/reading DatabaseReader.java
cziegeler 2003/08/06 01:44:22
Modified: src/blocks/databases/java/org/apache/cocoon/reading
DatabaseReader.java
Log:
Changing to service selector
Revision Changes Path
1.4 +4 -7 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatabaseReader.java 11 Jul 2003 18:32:25 -0000 1.3
+++ DatabaseReader.java 6 Aug 2003 08:44:22 -0000 1.4
@@ -62,14 +62,13 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
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.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -77,11 +76,9 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
-
import org.xml.sax.SAXException;
/**
@@ -96,7 +93,7 @@
implements Configurable, Disposable, CacheableProcessingComponent
{
- private ComponentSelector dbselector;
+ private ServiceSelector dbselector;
private String dsn;
private long lastModified = System.currentTimeMillis();
private InputStream resource = null; // because HSQL doesn't yet implement getBlob()
@@ -109,7 +106,7 @@
public void service(final ServiceManager manager) throws ServiceException {
super.service(manager);
- this.dbselector = (ComponentSelector) manager.lookup(DataSourceComponent.ROLE + "Selector");
+ this.dbselector = (ServiceSelector) manager.lookup(DataSourceComponent.ROLE + "Selector");
}
/**