cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context RequestSessionContext.java SimpleSessionContext.java
Date Thu, 06 Mar 2003 15:06:34 GMT
cziegeler    2003/03/06 07:06:34

  Modified:    src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
                        DOMUtil.java
               src/java/org/apache/cocoon/webapps/session/context Tag:
                        cocoon_2_0_3_branch RequestSessionContext.java
                        SimpleSessionContext.java
  Removed:     src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
                        NodeListImpl.java
               src/java/org/apache/cocoon/components/xpath Tag:
                        cocoon_2_0_3_branch XPathUtil.java
  Log:
  Sync with 2.1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.3  +7 -7      xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java
  
  Index: DOMUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java,v
  retrieving revision 1.11.2.2
  retrieving revision 1.11.2.3
  diff -u -r1.11.2.2 -r1.11.2.3
  --- DOMUtil.java	7 Feb 2003 07:24:15 -0000	1.11.2.2
  +++ DOMUtil.java	6 Mar 2003 15:06:32 -0000	1.11.2.3
  @@ -51,10 +51,11 @@
   package org.apache.cocoon.xml.dom;
   
   import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.xml.sax.SAXParser;
  +import org.apache.excalibur.xml.xpath.NodeListImpl;
  +import org.apache.excalibur.xml.xpath.XPathProcessor;
  +import org.apache.excalibur.xml.xpath.XPathUtil;
   import org.apache.xpath.XPathAPI;
  -import org.apache.cocoon.components.xpath.XPathUtil;
  -import org.apache.cocoon.components.xpath.XPathProcessor;
  -import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.xml.XMLizable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
  @@ -253,7 +254,7 @@
        * has more than one root node. This xml is parsed by the
        * specified parser instance and a DOM DocumentFragment is created.
        */
  -    public static DocumentFragment getDocumentFragment(Parser parser,
  +    public static DocumentFragment getDocumentFragment(SAXParser parser,
                                                          Reader stream)
       throws ProcessingException {
           DocumentFragment frag = null;
  @@ -297,8 +298,7 @@
               builder.startElement("", "root", "root", new AttributesImpl());
   
               IncludeXMLConsumer filter = new IncludeXMLConsumer(builder, builder);
  -            parser.setConsumer(filter);
  -            parser.parse(input);
  +            parser.parse(input, filter);
   
               builder.endElement("", "root", "root");
               builder.endDocument();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.3   +5 -5      xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/Attic/RequestSessionContext.java
  
  Index: RequestSessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/Attic/RequestSessionContext.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- RequestSessionContext.java	7 Feb 2003 07:04:57 -0000	1.8.2.2
  +++ RequestSessionContext.java	6 Mar 2003 15:06:33 -0000	1.8.2.3
  @@ -59,7 +59,6 @@
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Request;
  @@ -68,6 +67,7 @@
   import org.apache.cocoon.xml.IncludeXMLConsumer;
   import org.apache.cocoon.xml.dom.DOMUtil;
   import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.xml.sax.SAXParser;
   import org.w3c.dom.Document;
   import org.w3c.dom.DocumentFragment;
   import org.w3c.dom.Element;
  @@ -185,9 +185,9 @@
   
           Element root = contextData.getDocumentElement();
   
  -        Parser parser = null;
  +        SAXParser parser = null;
           try {
  -            parser = (Parser) manager.lookup( Parser.ROLE );
  +            parser = (SAXParser) manager.lookup( SAXParser.ROLE );
               this.buildParameterXML(root, parser);
           } catch (ComponentException ce) {
               throw new ProcessingException("Unable to lookup parser.", ce);
  @@ -384,7 +384,7 @@
       /**
        * Build parameter XML
        */
  -    private void buildParameterXML(Element root, Parser parser)
  +    private void buildParameterXML(Element root, SAXParser parser)
       throws ProcessingException {
           Document doc = root.getOwnerDocument();
           // include all parameters
  
  
  
  1.4.2.3   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/Attic/SimpleSessionContext.java
  
  Index: SimpleSessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/Attic/SimpleSessionContext.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- SimpleSessionContext.java	7 Feb 2003 07:04:57 -0000	1.4.2.2
  +++ SimpleSessionContext.java	6 Mar 2003 15:06:33 -0000	1.4.2.3
  @@ -59,10 +59,10 @@
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
   import org.apache.cocoon.xml.dom.DOMUtil;
  -import org.apache.cocoon.xml.dom.NodeListImpl;
   import org.apache.cocoon.environment.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.xml.xpath.NodeListImpl;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.xml.utils.PrefixResolverDefault;
   import org.apache.xpath.XPath;
  
  
  

Mime
View raw message