cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor TreeProcessor.java

[cziegeler]

cziegeler    2004/01/07 07:41:38

  Modified:    src/java/org/apache/cocoon/components/cprocessor
                        TreeProcessor.java
  Log:
  Setting the systemId for parsing
  
  Revision  Changes    Path
  1.10      +3 -3      
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java
  
  Index: TreeProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TreeProcessor.java        7 Jan 2004 15:39:14 -0000       1.9
  +++ TreeProcessor.java        7 Jan 2004 15:41:38 -0000       1.10
  @@ -81,6 +81,7 @@
   import org.apache.cocoon.components.ChainedConfiguration;
   import org.apache.cocoon.components.pipeline.ProcessingPipeline;
   import org.apache.cocoon.components.sax.XMLTeePipe;
  +import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.EnvironmentHelper;
  @@ -95,12 +96,12 @@
   import org.apache.excalibur.xml.sax.SAXParser;
   import org.apache.excalibur.xml.xslt.XSLTProcessor;
   import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
   
   /**
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Unico Hommes</a>
  + * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
    * 
    * @avalon.component
    * @avalon.service type=Processor
  @@ -395,7 +396,7 @@
               final LocationAugmentationPipe pipe = new 
LocationAugmentationPipe();
               pipe.setConsumer(XMLUtils.getConsumer(transformHandler));
               
  -            parser.parse(new InputSource(source.getInputStream()),pipe);
  +            parser.parse(SourceUtil.getInputSource(source), pipe);
               if ( domBuilder != null ) {
                   this.getLogger().debug("Configuration from sitemap: " + 
this.m_source.getURI());
                   
this.getLogger().debug(XMLUtils.serializeNodeToXML(domBuilder.getDocument()));
  @@ -497,7 +498,6 @@
                           for(int m = 0; m < childs.length; m++) {
                               //FIXME - get the role
                               final String r = childs[m].getName();
  -                            //final String r = 
this.roleManager.getRoleForName(childs[m].getName());
                               this.sitemapComponentConfigurations.put(r, new 
ChainedConfiguration(childs[m], 
                                       
(ChainedConfiguration)this.sitemapComponentConfigurations.get(r)));
                           }