crossley    01/11/02 05:34:33

  Modified:    src/org/apache/cocoon/components/parser Tag:
                        cocoon_20_branch JaxpParser.java
  Log:
  Sync with 2.1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.6   +13 -23    
xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java
  
  Index: JaxpParser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java,v
  retrieving revision 1.3.2.5
  retrieving revision 1.3.2.6
  diff -u -r1.3.2.5 -r1.3.2.6
  --- JaxpParser.java   2001/10/10 09:18:01     1.3.2.5
  +++ JaxpParser.java   2001/11/02 13:34:33     1.3.2.6
  @@ -8,29 +8,17 @@
   package org.apache.cocoon.components.parser;
   
   import org.apache.avalon.framework.component.ComponentException;
  -
   import org.apache.avalon.framework.component.ComponentManager;
  -
   import org.apache.avalon.framework.component.Composable;
  -
   import org.apache.avalon.framework.thread.SingleThreaded;
  -
   import org.apache.cocoon.components.resolver.Resolver;
  -
   import org.apache.cocoon.util.ClassUtils;
  -
   import org.apache.cocoon.xml.AbstractXMLProducer;
  -
   import org.w3c.dom.DOMImplementation;
  -
   import org.w3c.dom.Document;
  -
   import org.xml.sax.*;
   
  -
  -
   import javax.xml.parsers.*;
  -
   import java.io.IOException;
   
   /**
  @@ -38,7 +26,8 @@
    * If only we can get rid of the need for the Document...
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
  - * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/10/10 09:18:01 $
  + * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
  + * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/11/02 13:34:33 $
    */
   public class JaxpParser extends AbstractXMLProducer
   implements Parser, ErrorHandler, Composable, SingleThreaded {
  @@ -53,7 +42,7 @@
       protected ComponentManager manager;
   
       /** the Entity Resolver */
  -    protected Resolver resolver = null;
  +    protected Resolver resolver;
   
       public JaxpParser ()
       throws SAXException, ParserConfigurationException {
  @@ -66,15 +55,16 @@
       /**
        * Get the Entity Resolver from the component manager
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  -      try {
  -        this.manager = manager;
  -        getLogger().debug("Looking up " + Resolver.ROLE);
  -        this.resolver = (Resolver)manager.lookup(Resolver.ROLE);
  -      } catch(ComponentException e) {
  -        // This exception is ok during initialization/startup.
  -        getLogger().debug("Error in JaxpParser: Cannot find " + Resolver.ROLE);
  -      }
  +    public void compose(ComponentManager manager)
  +    throws ComponentException {
  +        try {
  +            this.manager = manager;
  +            getLogger().debug("Looking up " + Resolver.ROLE);
  +            this.resolver = (Resolver)manager.lookup(Resolver.ROLE);
  +        } catch(ComponentException e) {
  +            // This exception is ok during initialization/startup.
  +            getLogger().debug("Error in JaxpParser: Cannot find " + Resolver.ROLE);
  +        }
       }
   
       public void parse(InputSource in)
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to