You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/07/11 20:32:25 UTC
cvs commit: cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/reading AxisRPCReader.java
joerg 2003/07/11 11:32:25
Modified: src/blocks/databases/java/org/apache/cocoon/reading
DatabaseReader.java
. status.xml
src/blocks/axis/java/org/apache/cocoon/reading
AxisRPCReader.java
Log:
all reader accessing Avalon components now extend the ServiceableReader instead of deprecated ComposerReader
Revision Changes Path
1.3 +10 -14 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseReader.java 19 Mar 2003 15:42:16 -0000 1.2
+++ DatabaseReader.java 11 Jul 2003 18:32:25 -0000 1.3
@@ -60,16 +60,15 @@
import java.sql.Timestamp;
import java.util.Map;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
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.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -93,9 +92,10 @@
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @version CVS $Id$
*/
-public class DatabaseReader
- extends ComposerReader
- implements Configurable, Disposable, CacheableProcessingComponent {
+public class DatabaseReader extends ServiceableReader
+ implements Configurable, Disposable, CacheableProcessingComponent
+{
+
private ComponentSelector dbselector;
private String dsn;
private long lastModified = System.currentTimeMillis();
@@ -107,12 +107,8 @@
private boolean doCommit = false;
private boolean defaultCache = true;
- /**
- * Compose the object so that we get the <code>Component</code>s we need from
- * the <code>ComponentManager</code>.
- */
- public void compose(final ComponentManager manager) throws ComponentException {
- super.compose(manager);
+ public void service(final ServiceManager manager) throws ServiceException {
+ super.service(manager);
this.dbselector = (ComponentSelector) manager.lookup(DataSourceComponent.ROLE + "Selector");
}
1.88 +6 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- status.xml 11 Jul 2003 14:29:15 -0000 1.87
+++ status.xml 11 Jul 2003 18:32:25 -0000 1.88
@@ -184,6 +184,11 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="JH" type="update">
+ All Reader accessing Avalon components now extend the ServiceableReader
+ instead of deprecated ComposerReader. It pertains the JSPReader, the
+ DatabaseReader and the AxisRPCReader.
+ </action>
<action dev="GR" type="add">
Added a WebDAV block, with an initial implementation of
a modifiable and traversable WebDAV source.
1.4 +7 -15 cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/reading/AxisRPCReader.java
Index: AxisRPCReader.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/reading/AxisRPCReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisRPCReader.java 18 Jun 2003 11:18:35 -0000 1.3
+++ AxisRPCReader.java 11 Jul 2003 18:32:25 -0000 1.4
@@ -63,12 +63,12 @@
import javax.xml.soap.SOAPException;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
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.axis.AxisFault;
import org.apache.axis.Constants;
@@ -113,9 +113,10 @@
*
* @version CVS $Id$
*/
-public class AxisRPCReader extends ComposerReader
+public class AxisRPCReader extends ServiceableReader
implements Configurable, Disposable
{
+
// soap server reference
private SoapServer m_server;
@@ -130,17 +131,8 @@
m_isDevelompent = config.getChild("development-stage").getValueAsBoolean(m_isDevelompent );
}
- /**
- * Compose this reader
- *
- * @param manager a <code>ComponentManager</code> instance
- * @exception ComponentException if an error occurs
- */
- public void compose(final ComponentManager manager)
- throws ComponentException
- {
- super.compose(manager);
-
+ public void service(final ServiceManager manager) throws ServiceException {
+ super.service(manager);
// set soap server reference
m_server = (SoapServer) manager.lookup(SoapServer.ROLE);
}