cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation SimpleFormInstanceExtractionTransformer.java

[jo...@apache.org]

joerg       2003/10/27 13:36:55

  Modified:    src/java/org/apache/cocoon/transformation
                        SimpleFormInstanceExtractionTransformer.java
  Log:
  Composable => Serviceable
  
  Revision  Changes    Path
  1.2       +11 -11    cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
  
  Index: SimpleFormInstanceExtractionTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleFormInstanceExtractionTransformer.java	9 Mar 2003 00:09:39 -0000	1.1
  +++ SimpleFormInstanceExtractionTransformer.java	27 Oct 2003 21:36:55 -0000	1.2
  @@ -53,14 +53,14 @@
   import java.io.IOException;
   import java.util.Map;
   
  -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.component.Composable;
   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.avalon.framework.service.Serviceable;
   
   import org.apache.avalon.excalibur.pool.Recyclable;
   
  @@ -89,7 +89,7 @@
    * @version CVS $Id$
    */
   public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer 
  -    implements Configurable, Composable, Recyclable {
  +    implements Configurable, Serviceable, Recyclable {
   
       protected class ElementData {
           public String uri = null;
  @@ -130,7 +130,7 @@
       String outputModuleName = "request-attr";
       Configuration outputConf = null;
   
  -    ComponentManager manager = null;
  +    ServiceManager manager = null;
       Map objectModel = null;
   
       public void configure(Configuration config) throws ConfigurationException {
  @@ -151,7 +151,7 @@
           this.outputModuleName = this.outputConf.getAttribute("name",this.outputModuleName);
       }
   
  -    public void compose(ComponentManager manager) throws ComponentException {
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
       }
   
  @@ -248,14 +248,14 @@
        */
       public void handleExtractedDocument(Document doc) {
           
  -        ComponentSelector outputSelector = null;
  +        ServiceSelector outputSelector = null;
           OutputModule output = null;
   
           try {
               if (getLogger().isDebugEnabled())
                   getLogger().debug("wrote ['"+this.instanceName+"'] to "+output+" using "+outputConf);
  -            outputSelector = (ComponentSelector) this.manager.lookup(OUTPUT_MODULE_SELECTOR);
  -            if (outputSelector.hasComponent(this.outputModuleName)) {
  +            outputSelector = (ServiceSelector) this.manager.lookup(OUTPUT_MODULE_SELECTOR);
  +            if (outputSelector.isSelectable(this.outputModuleName)) {
                   output = (OutputModule) outputSelector.select(this.outputModuleName);
               }
               output.setAttribute(outputConf, this.objectModel, this.instanceName, new DocumentWrapper(doc));