cvs commit: cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context SimpleSessionContext.java

[bloritsch]

bloritsch    2003/03/12 07:01:01

  Modified:    src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context
                        SimpleSessionContext.java
  Log:
  many compilation fixes, as well as re-implementing my change to make cornerstone 
unnecessary
  
  Revision  Changes    Path
  1.2       +5 -4      
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java
  
  Index: SimpleSessionContext.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleSessionContext.java 9 Mar 2003 00:06:10 -0000       1.1
  +++ SimpleSessionContext.java 12 Mar 2003 15:01:00 -0000      1.2
  @@ -59,11 +59,11 @@
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
   import org.apache.cocoon.xml.dom.DOMUtil;
  +import org.apache.excalibur.xml.xpath.NodeListImpl;
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceParameters;
   import org.apache.excalibur.source.SourceResolver;
  -import org.apache.excalibur.xml.xpath.NodeListImpl;
   import org.apache.xml.utils.PrefixResolverDefault;
   import org.apache.xpath.XPath;
   import org.apache.xpath.XPathContext;
  @@ -496,7 +496,7 @@
           Source source = null;
           try {
               source = SourceUtil.getSource(this.loadResource, null, parameters, 
resolver);
  -            Document doc = SourceUtil.toDOM(source);
  +            Document doc = SourceUtil.toDOM(source, manager);
               DocumentFragment df = doc.createDocumentFragment();
               df.appendChild(doc.getDocumentElement());
               this.setXML(path, df);
  @@ -532,7 +532,8 @@
                               parameters,
                               frag,
                               resolver,
  -                            "xml");
  +                            "xml",
  +                            manager);
       }
   
   }