forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre LibreConfigHelper.java XPathAttributeReader.java
Date Wed, 29 Jan 2003 17:25:51 GMT
jefft       2003/01/29 09:25:50

  Modified:    .        Tag: PDF_IMAGE_BRANCH .cvsignore
               src/java/components/org/apache/cocoon/transformation Tag:
                        PDF_IMAGE_BRANCH IdGeneratorTransformer.java
                        XPathTransformer.java
               src/resources/conf Tag: PDF_IMAGE_BRANCH cocoon.xconf
                        sitemap.xmap
               src/resources/convert/cocoon Tag: PDF_IMAGE_BRANCH
                        sitemap.xmap
               src/resources/editor Tag: PDF_IMAGE_BRANCH editor.xmap
               src/resources/schema/relaxng Tag: PDF_IMAGE_BRANCH
                        sitemap-v06.rng
               src/scratchpad/src/java/org/apache/forrest/components/generator
                        Tag: PDF_IMAGE_BRANCH
                        XNIConfigurableFileGenerator.java
               src/scratchpad/src/java/org/apache/forrest/yer/hierarchy
                        Tag: PDF_IMAGE_BRANCH HierarchyReader.java
               src/scratchpad/src/java/org/apache/forrest/yer/libre Tag:
                        PDF_IMAGE_BRANCH LibreConfigHelper.java
                        XPathAttributeReader.java
  Added:       lib/core Tag: PDF_IMAGE_BRANCH cocoon-20030126-vm1.3.jar
                        cocoon-scratchpad-20030126-vm1.3.jar
                        fop-20030126-vm1.3.jar fop-block-20030126-vm1.3.jar
                        jimi-1.0.jar
  Removed:     lib/core Tag: PDF_IMAGE_BRANCH cocoon-20021226-vm1.3.jar
                        cocoon-scratchpad-20021226-vm1.3.jar fop-0.20.4.jar
                        fop-block-20021226-vm1.3.jar
  Log:
  Branch of Forrest using an updated Cocoon (with incompatible sitemap syntax) and images-in-PDFs
support
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.6.1   +2 -2      xml-forrest/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/xml-forrest/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.2.6.1
  diff -u -r1.2 -r1.2.6.1
  --- .cvsignore	7 Jul 2002 09:47:51 -0000	1.2
  +++ .cvsignore	29 Jan 2003 17:25:43 -0000	1.2.6.1
  @@ -1,3 +1,3 @@
  +.projrc
  +.vimrc
   build
  -dist
  -build.number
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +4548 -0   xml-forrest/lib/core/Attic/cocoon-20030126-vm1.3.jar
  
  	<<Binary file>>
  
  
  1.1.2.1   +911 -0    xml-forrest/lib/core/Attic/cocoon-scratchpad-20030126-vm1.3.jar
  
  	<<Binary file>>
  
  
  1.1.2.1   +7058 -0   xml-forrest/lib/core/Attic/fop-20030126-vm1.3.jar
  
  	<<Binary file>>
  
  
  1.1.2.1   +39 -0     xml-forrest/lib/core/Attic/fop-block-20030126-vm1.3.jar
  
  	<<Binary file>>
  
  
  1.1.2.1   +1759 -0   xml-forrest/lib/core/Attic/jimi-1.0.jar
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      xml-forrest/src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java
  
  Index: IdGeneratorTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- IdGeneratorTransformer.java	12 Jan 2003 12:25:40 -0000	1.1
  +++ IdGeneratorTransformer.java	29 Jan 2003 17:25:48 -0000	1.1.2.1
  @@ -56,7 +56,7 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
  +import org.apache.excalibur.xml.xpath.XPathProcessor;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  
  
  
  1.1.2.1   +6 -7      xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java
  
  Index: XPathTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- XPathTransformer.java	12 Jan 2003 12:25:40 -0000	1.1
  +++ XPathTransformer.java	29 Jan 2003 17:25:48 -0000	1.1.2.1
  @@ -50,11 +50,11 @@
   */
   package org.apache.cocoon.transformation;
   
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.dom.DOMParser;
  +import org.apache.excalibur.xml.xpath.XPathProcessor;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.caching.Cacheable;
   import org.apache.cocoon.caching.CacheValidity;
  @@ -129,8 +129,7 @@
   
       /** XPath Processor */
       private XPathProcessor processor = null;
  -    /** DOM Parser */
  -    private Parser parser = null;
  +    private DOMParser parser = null;
   
       /** XPath specifying nodes to include. Defaults to the root node */
       protected String include = null;
  @@ -156,9 +155,9 @@
               getLogger().error("cannot obtain XPathProcessor", e);
           }
           try {
  -            this.parser = (Parser)this.manager.lookup(Parser.ROLE);
  +            this.parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
           } catch (Exception e) {
  -            getLogger().error("cannot obtain Parser", e);
  +            getLogger().error("cannot obtain DOMParser", e);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +5 -5      xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- cocoon.xconf	8 Jan 2003 05:44:34 -0000	1.10
  +++ cocoon.xconf	29 Jan 2003 17:25:49 -0000	1.10.2.1
  @@ -13,21 +13,21 @@
   
   <!-- ===================== General Components =========================== -->
   
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser" 
  +  <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser" 
                 logger="core.xml-parser" pool-grow="4" pool-max="32" pool-min="8">
   
     <!-- Parser:
       The default parser used in Apache Cocoon is
  -    org.apache.avalon.excalibur.xml.JaxpParser. Apache Cocoon requires a 
  +    org.apache.excalibur.xml.impl.JaxpParser. Apache Cocoon requires a 
       JAXP 1.1 parser.
       If you have problems because your servlet environment uses its own
       parser not conforming to JAXP 1.1 try using the alternative
       XercesParser instead of the JaxpParser. To activate the XercesParser,
       change the class attribute to
  -      class="org.apache.avalon.excalibur.xml.XercesParser"
  +      class="org.apache.excalibur.xml.impl.XercesParser"
       You will also need to add a system property to your JVM,
       probably on the startup of your servlet engine like this:
  -    -Dorg.apache.avalon.excalibur.xml.Parser=org.apache.avalon.excalibur.xml.XercesParser
  +    -Dorg.apache..excalibur.xml.sax.SAXParser=org.apache.excalibur.xml.impl.XercesParser
   
       Configuration for the JaxpParser (not the XercesParser!):
       - validate (boolean, default = false): This parameter causes the parser 
  @@ -144,7 +144,7 @@
   
     <!-- Xpath Processor:
     -->
  -  <xpath-processor class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"
logger="core.xpath-processor"/>
  +  <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl" logger="core.xpath-processor"/>
   
     <!-- URL Factory:
       The url factory adds special url protocols to the system, they are then
  
  
  
  1.58.2.1  +7 -7      xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.58
  retrieving revision 1.58.2.1
  diff -u -r1.58 -r1.58.2.1
  --- sitemap.xmap	25 Jan 2003 10:39:41 -0000	1.58
  +++ sitemap.xmap	29 Jan 2003 17:25:49 -0000	1.58.2.1
  @@ -128,16 +128,16 @@
        The different pipeline implementations
        @todo use map:pipe and map:pipes with next cocoon CVS update
     -->
  -      <map:pipelines default="caching">
  -         <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"
/>
  +      <map:pipes default="caching">
  +         <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"
/>
   
  -         <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"
/>
  +         <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"
/>
   
   <!-- The following two can be used for profiling:
  -     <map:pipeline name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  -     <map:pipeline name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  +     <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  +     <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
        -->
  -      </map:pipelines>
  +      </map:pipes>
      </map:components>
   
   <!-- =========================== Views =================================== -->
  @@ -298,7 +298,7 @@
   
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
  -
  +               <map:parameter name="nopdf" value="true" />
                  <map:parameter name="path" value="/forrest-issues.xml" />
               </map:call>
            </map:match>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +6 -6      xml-forrest/src/resources/convert/cocoon/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/convert/cocoon/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- sitemap.xmap	21 Nov 2002 00:49:28 -0000	1.1
  +++ sitemap.xmap	29 Jan 2003 17:25:50 -0000	1.1.4.1
  @@ -86,14 +86,14 @@
     <!--
        The different pipeline implementations
     -->
  -  <map:pipelines default="caching">
  -     <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  -     <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  +  <map:pipes default="caching">
  +     <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  +     <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
        <!-- The following two can be used for profiling:
  -     <map:pipeline name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  -     <map:pipeline name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  +     <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  +     <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
        -->
  -  </map:pipelines>
  +  </map:pipes>
     
    </map:components>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +6 -6      xml-forrest/src/resources/editor/editor.xmap
  
  Index: editor.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/editor/editor.xmap,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- editor.xmap	23 Jan 2003 17:38:50 -0000	1.5
  +++ editor.xmap	29 Jan 2003 17:25:50 -0000	1.5.2.1
  @@ -39,14 +39,14 @@
     <!--
        The different pipeline implementations
     -->
  -  <map:pipelines default="caching">
  -     <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  -     <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  +  <map:pipes default="caching">
  +     <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  +     <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
        <!-- The following two can be used for profiling:
  -     <map:pipeline name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  -     <map:pipeline name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  +     <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  +     <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
        -->
  -  </map:pipelines>
  +  </map:pipes>
         
     </map:components>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +36 -4     xml-forrest/src/resources/schema/relaxng/sitemap-v06.rng
  
  Index: sitemap-v06.rng
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/relaxng/sitemap-v06.rng,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- sitemap-v06.rng	12 Jan 2003 12:09:39 -0000	1.4
  +++ sitemap-v06.rng	29 Jan 2003 17:25:50 -0000	1.4.2.1
  @@ -313,6 +313,10 @@
       </zeroOrMore>
     </define>
   
  +<!-- CH: contents confirmed by inspection of Web3RfcTransformer.java -->
  +  <define name="web3RfcTransformer.contents">
  +    <optional><element name="system"><text/></element></optional>
  +  </define>
     <define name="IdGeneratorTransformer.contents">
       <zeroOrMore>
         <element name="element">
  @@ -410,7 +414,7 @@
             <ref name="map.flow-interpreters"/>
           </optional>
           <optional>
  -          <ref name="map.pipelines"/>
  +          <ref name="map.pipes"/>
           </optional>
         </interleave>
       </element>
  @@ -475,6 +479,7 @@
             <ref name="i18nTransformer.contents"/>
             <ref name="encodeURLTransformer.contents"/>
             <ref name="linkRewriterTransformer.contents"/>
  +          <ref name="web3RfcTransformer.contents"/>
             <ref name="IdGeneratorTransformer.contents"/>
             <optional><ref name="mapping"/></optional>
           </interleave>
  @@ -953,6 +958,36 @@
       <ref name="component.attr"/>
     </define>
   
  +<!-- Pipes ======================================== -->
  +  <define name="map.pipes">
  +    <element name="map:pipes">
  +      <ref name="map.pipes.attlist"/>
  +      <zeroOrMore> 
  +        <ref name="map.pipe"/>
  +      </zeroOrMore>
  +    </element>
  +  </define>
  +  <define name="map.pipes.attlist" combine="interleave">
  +    <ref name="universal.attr"/>
  +    <ref name="default.attr"/>
  +  </define>
  +
  +  <define name="map.pipe">
  +    <element name="map:pipe">
  +      <ref name="map.pipe.attlist"/>
  +      <empty/>
  +    </element>
  +  </define>
  +  <define name="map.pipe.attlist" combine="interleave">
  +    <ref name="universal.attr"/>
  +    <ref name="name.attr"/>
  +    <ref name="src.attr"/>
  +    <ref name="component.attr"/>
  +    <optional>
  +       <ref name="autoCachingPoint"/>
  +     </optional>
  +  </define>
  +
   <!-- =============================================================== -->
   <!-- Views -->
   <!-- =============================================================== -->
  @@ -1112,9 +1147,6 @@
           <zeroOrMore>
             <ref name="map.handle-errors"/>
           </zeroOrMore>
  -        <optional>
  -          <ref name="autoCachingPoint"/>
  -        </optional>
         </optional>
   
         <!-- Schematron rules for map:pipeline follow -->
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.6.1   +5 -4      xml-forrest/src/scratchpad/src/java/org/apache/forrest/components/generator/XNIConfigurableFileGenerator.java
  
  Index: XNIConfigurableFileGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/components/generator/XNIConfigurableFileGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.5.6.1
  diff -u -r1.5 -r1.5.6.1
  --- XNIConfigurableFileGenerator.java	4 Nov 2002 10:53:53 -0000	1.5
  +++ XNIConfigurableFileGenerator.java	29 Jan 2003 17:25:50 -0000	1.5.6.1
  @@ -63,7 +63,8 @@
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.avalon.excalibur.xml.EntityResolver;
  +import org.apache.excalibur.xml.EntityResolver;
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.xerces.xni.parser.XMLParserConfiguration;
  @@ -233,7 +234,7 @@
         getLogger().error("Some strange thing just happened!!", e);
         throw new ProcessingException("XNIConfigurable.generate()",e);
       } finally {
  -      this.manager.release(catalogResolver);
  +      this.manager.release((Component)catalogResolver);
       }
     }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +3 -3      xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyReader.java
  
  Index: HierarchyReader.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/hierarchy/HierarchyReader.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- HierarchyReader.java	9 Jan 2003 00:06:45 -0000	1.4
  +++ HierarchyReader.java	29 Jan 2003 17:25:50 -0000	1.4.2.1
  @@ -88,7 +88,7 @@
    *  http://xml.org/sax/features/namespace-prefixes</code> set to true.
    *  @link http://saxproject.org/?selected=namespaces
    *
  - * [FIXME: consider implementing org.apache.avalon.excalibur.xml in some
  + * [FIXME: consider implementing org.apache.excalibur.xml in some
    *  sister class of this or something... more catchup on avalon needed.]
    * @author $Author$
    * @version CVS $Id$
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.6.1   +19 -8     xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfigHelper.java
  
  Index: LibreConfigHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/LibreConfigHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.4.6.1
  diff -u -r1.4 -r1.4.6.1
  --- LibreConfigHelper.java	5 Nov 2002 05:52:41 -0000	1.4
  +++ LibreConfigHelper.java	29 Jan 2003 17:25:50 -0000	1.4.6.1
  @@ -59,8 +59,9 @@
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.excalibur.xml.Parser;
  -import org.apache.avalon.excalibur.xml.EntityResolver;
  +import org.apache.excalibur.xml.sax.SAXParser;
  +import org.apache.excalibur.xml.dom.DOMParser;
  +import org.apache.excalibur.xml.EntityResolver;
   import org.apache.xml.resolver.tools.CatalogResolver;
   //import org.apache.cocoon.components.resolver.Resolver;
   import org.apache.forrest.yer.hierarchy.HierarchyConfig;
  @@ -71,7 +72,7 @@
   //import org.xml.sax.EntityResolver;
   
   import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.SAXParser;
  +// import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.FactoryConfigurationError;
   import javax.xml.parsers.ParserConfigurationException;
   import javax.xml.parsers.DocumentBuilder;
  @@ -113,7 +114,7 @@
       LibreConfigBuilder lcb = new LibreConfigBuilder(parentCfg, this);
       if (this.manager != null) {
         try {
  -        Parser parser = getExcaliburParser();
  +        SAXParser parser = getExcaliburSAXParser();
           parser.parse(new InputSource(fromStream), lcb);
         } catch(SAXException e) {
           e.printStackTrace();
  @@ -134,10 +135,20 @@
       return lcb.getLibreConfig();
     }
   
  -  public Parser getExcaliburParser(){
  +  public SAXParser getExcaliburSAXParser(){
       if (this.manager == null) return null;
       try {
  -      return (Parser)this.manager.lookup(Parser.ROLE);
  +      return (SAXParser)this.manager.lookup(SAXParser.ROLE);
  +    } catch(ComponentException e) {
  +      e.printStackTrace();
  +    }
  +    return null;
  +  }
  +
  +  public DOMParser getExcaliburDOMParser(){
  +    if (this.manager == null) return null;
  +    try {
  +      return (DOMParser)this.manager.lookup(DOMParser.ROLE);
       } catch(ComponentException e) {
         e.printStackTrace();
       }
  @@ -155,7 +166,7 @@
         // but namespace-aware.
         spf.setNamespaceAware(true);
         spf.setValidating(false);
  -      SAXParser sp = spf.newSAXParser();
  +      javax.xml.parsers.SAXParser sp = spf.newSAXParser();
         parser = sp.getXMLReader();
         parser.setEntityResolver(getCatalogResolver());
       } catch(FactoryConfigurationError error) {
  
  
  
  1.3.6.1   +3 -3      xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/XPathAttributeReader.java
  
  Index: XPathAttributeReader.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/libre/XPathAttributeReader.java,v
  retrieving revision 1.3
  retrieving revision 1.3.6.1
  diff -u -r1.3 -r1.3.6.1
  --- XPathAttributeReader.java	5 Nov 2002 05:52:41 -0000	1.3
  +++ XPathAttributeReader.java	29 Jan 2003 17:25:50 -0000	1.3.6.1
  @@ -61,7 +61,7 @@
   import org.w3c.dom.Node;
   import org.w3c.dom.DOMException;
   import org.apache.xpath.XPathAPI;
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.dom.DOMParser;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  @@ -129,7 +129,7 @@
     public Document getDOMDocument(InputStream inXML)  {
   
       Document doc = null;
  -    Parser excaliburParser = this.helper.getExcaliburParser();
  +    DOMParser excaliburParser = this.helper.getExcaliburDOMParser();
       if (excaliburParser != null) {
         try {
           doc = excaliburParser.parseDocument(new InputSource(inXML));
  
  
  

Mime
View raw message