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/blocks/php/java/org/apache/cocoon/generation PhpGenerator.java
Date Tue, 14 Jan 2003 10:04:26 GMT
cziegeler    2003/01/14 02:04:25

  Modified:    src/documentation cocoon.xconf
               src/blocks/jsp/java/org/apache/cocoon/generation
                        JspGenerator.java
               src/java/org/apache/cocoon Constants.java Cocoon.java
               src/documentation/xdocs/userdocs/concepts catalog.xml
               src/deprecated/java/org/apache/cocoon/xml XMLizable.java
               src/documentation/xdocs/installing updating.xml
               src/documentation/xdocs/tutorial RMIGenerator.java
                        tutorial-rmi-generator.xml
               src/blocks/databases/java/org/apache/cocoon/transformation
                        SQLTransformer.java
               src/blocks/php/java/org/apache/cocoon/generation
                        PhpGenerator.java
  Log:
  Updating to changed interfaces of excalibur
  
  Revision  Changes    Path
  1.18      +1 -2      xml-cocoon2/src/documentation/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/cocoon.xconf,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- cocoon.xconf	6 Dec 2002 15:17:09 -0000	1.17
  +++ cocoon.xconf	14 Jan 2003 10:04:23 -0000	1.18
  @@ -14,8 +14,7 @@
   <!-- ===================== General Components =========================== -->
   
     <!-- Parser:  -->
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
  -              logger="core.xml-parser">
  +  <xml-parser logger="core.xml-parser">
       <parameter name="validate" value="false"/>
     </xml-parser>
   
  
  
  
  1.2       +2 -2      xml-cocoon2/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JspGenerator.java	3 Dec 2002 17:08:12 -0000	1.1
  +++ JspGenerator.java	14 Jan 2003 10:04:24 -0000	1.2
  @@ -50,13 +50,13 @@
   */
   package org.apache.cocoon.generation;
   
  -import org.apache.avalon.excalibur.xml.Parser;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.jsp.JSPEngine;
   import org.apache.cocoon.environment.http.HttpEnvironment;
  +import org.apache.excalibur.xml.sax.Parser;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  
  
  
  1.14      +3 -3      xml-cocoon2/src/java/org/apache/cocoon/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Constants.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Constants.java	5 Dec 2002 09:23:36 -0000	1.13
  +++ Constants.java	14 Jan 2003 10:04:24 -0000	1.14
  @@ -138,10 +138,10 @@
       String DEFAULT_CONF_FILE   = "cocoon.xconf";
   
       /** The name of the property holding the class for a XML parser */
  -    String PARSER_PROPERTY = "org.apache.avalon.excalibur.xml.Parser";
  +    String PARSER_PROPERTY = "org.apache.excalibur.xml.sax.Parser";
   
       /** The name of the class for the default XML parser to use */
  -    String DEFAULT_PARSER  = "org.apache.avalon.excalibur.xml.JaxpParser";
  +    String DEFAULT_PARSER  = "org.apache.excalibur.xml.sax.JaxpParser";
   
       /** The name of the property holding the class for a XML parser
        *  @deprecated This will be removed in future release */
  
  
  
  1.48      +2 -2      xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Cocoon.java	14 Jan 2003 09:00:28 -0000	1.47
  +++ Cocoon.java	14 Jan 2003 10:04:24 -0000	1.48
  @@ -253,7 +253,7 @@
           if ( !Constants.DEFAULT_PARSER.equals( parser ) ) {
               this.getLogger().warn("Deprecated property " +Constants.DEPRECATED_PARSER_PROPERTY+
" is used. Please use "+Constants.PARSER_PROPERTY+" instead.");
               if ( "org.apache.cocoon.components.parser.XercesParser".equals(parser) ) {
  -                parser = "org.apache.avalon.excalibur.xml.XercesParser";
  +                parser = "org.apache.excalibur.xml.sax.XercesParser";
               } else {
                   this.getLogger().warn("Unknown value for deprecated property: " +
                                         Constants.DEPRECATED_PARSER_PROPERTY + ", value:
" + parser +
  
  
  
  1.8       +1 -1      xml-cocoon2/src/documentation/xdocs/userdocs/concepts/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/catalog.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- catalog.xml	7 Jul 2002 04:48:43 -0000	1.7
  +++ catalog.xml	14 Jan 2003 10:04:24 -0000	1.8
  @@ -528,7 +528,7 @@
      The SAX <code>Parser</code> interface provides an <code>entityResolver</code>
      hook to allow an application to resolve the external entities. This is
      enabled via 
  -   <code>org.apache.avalon.excalibur.xml.EntityResolver</code>
  +   <code>org.apache.excalibur.xml.EntityResolver</code>
     </p>
   
     <p>
  
  
  
  1.2       +2 -2      xml-cocoon2/src/deprecated/java/org/apache/cocoon/xml/XMLizable.java
  
  Index: XMLizable.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/deprecated/java/org/apache/cocoon/xml/XMLizable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLizable.java	26 Dec 2002 18:38:58 -0000	1.1
  +++ XMLizable.java	14 Jan 2003 10:04:24 -0000	1.2
  @@ -58,7 +58,7 @@
    * This interface can be implemented by classes willing to provide an XML representation
    * of their current state as SAX events.
    *
  - * @deprecated Use org.apache.avalon.excalibur.xml.XMLizable instead
  + * @deprecated Use org.apache.excalibur.xml.sax.XMLizable instead
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @version CVS $Id$
  
  
  
  1.8       +2 -2      xml-cocoon2/src/documentation/xdocs/installing/updating.xml
  
  Index: updating.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/updating.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- updating.xml	1 Jul 2002 08:21:09 -0000	1.7
  +++ updating.xml	14 Jan 2003 10:04:24 -0000	1.8
  @@ -47,7 +47,7 @@
        manually update swap the hint names.</p>
       <p>From within your source code you should not lookup the
         <em>org.apache.cocoon.components.parser.Parser.ROLE</em> anymore; use
  -      <em>org.apache.avalon.excalibur.xml.Parser.ROLE</em> instead.
  +      <em>org.apache.excalibur.xml.sax.Parser.ROLE</em> instead.
       </p>
     </s2>
     <s2 title="XML Entity Resolver">
  @@ -57,7 +57,7 @@
        manually update swap the hint names.</p>
       <p>From within your source code you should not lookup the
         <em>org.apache.cocoon.components.resolver.Resolver.ROLE</em> anymore;
use
  -      <em>org.apache.avalon.excalibur.xml.EntityResolver.ROLE</em> instead.
  +      <em>org.apache.excalibur.xml.EntityResolver.ROLE</em> instead.
       </p>
     </s2>
     <s2 title="Stores">
  
  
  
  1.2       +1 -1      xml-cocoon2/src/documentation/xdocs/tutorial/RMIGenerator.java
  
  Index: RMIGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/tutorial/RMIGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RMIGenerator.java	13 May 2002 18:09:53 -0000	1.1
  +++ RMIGenerator.java	14 Jan 2003 10:04:25 -0000	1.2
  @@ -24,7 +24,7 @@
   import org.apache.avalon.framework.component.ComponentException; 
   
   // needed for obtaining parser in Cocoon 
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.sax.Parser;
   
   /**
    * <p>
  
  
  
  1.6       +3 -3      xml-cocoon2/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml
  
  Index: tutorial-rmi-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tutorial-rmi-generator.xml	21 Jul 2002 22:56:11 -0000	1.5
  +++ tutorial-rmi-generator.xml	14 Jan 2003 10:04:25 -0000	1.6
  @@ -677,7 +677,7 @@
   				<p>We would still like to point the reader to an alternative solution, i.e. the
solution that is used throughout Cocoon 2. We will give the code fragments here and we will
then explain what it does.</p>
   <source><![CDATA[
   ...
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.sax.Parser;
   ...
   Parser parser = null;
   
  @@ -704,7 +704,7 @@
   						<li><code>void parse(InputSource in, ContentHandler consumer)</code>:
the implementation of this method should parse the <strong>InputSource</strong>
and send the SAX events to the <strong>consumer</strong>. The consumer can be
an <strong>XMLConsumer</strong> or an object that implements <strong>LexicalHandler</strong>
as well.
   						</li>
   					</ul>
  -					<p>This interface defines a variable <strong>ROLE</strong> of the
type String that is given the value <strong>org.apache.avalon.excalibur.xml.Parser</strong>.
This variable is used to ask the <strong>ComponentManager</strong>, which is accessed
by <strong>this.manager</strong>, to <strong>lookup</strong> a <strong>Component</strong>
that has that role. The returned Component is then casted to a <strong>Parser</strong>
type. We can then apply the parse method to any <strong>org.xml.sax.InputSource</strong>
object and to an object that implements the <strong>ContentHandler</strong> interface.
Finally, we have to tell the ComponentManager that we are finished using the parser. This
allows the ComponentManager to handle the End-Of-Life Lifecycle events associated with this
Component.
  +					<p>This interface defines a variable <strong>ROLE</strong> of the
type String that is given the value <strong>org.apache.excalibur.xml.sax.Parser</strong>.
This variable is used to ask the <strong>ComponentManager</strong>, which is accessed
by <strong>this.manager</strong>, to <strong>lookup</strong> a <strong>Component</strong>
that has that role. The returned Component is then casted to a <strong>Parser</strong>
type. We can then apply the parse method to any <strong>org.xml.sax.InputSource</strong>
object and to an object that implements the <strong>ContentHandler</strong> interface.
Finally, we have to tell the ComponentManager that we are finished using the parser. This
allows the ComponentManager to handle the End-Of-Life Lifecycle events associated with this
Component.
   				</p>
   				
   				<p><strong>NOTE:</strong> if you want to use this method to obtain
a parser, it would be better to extend the <strong>ComposerGenerator</strong>
class, instead of the <strong>AbstractGenerator</strong> class. The ComposerGenerator
is defined to make use of a <strong>ComponentManager</strong>, while this is not
the case for the <strong>AbstractGenerator</strong> class. You should envisage
the given code as part of a class that extends the <strong>ComposerGenerator</strong>
class or one of its children.
  @@ -1044,7 +1044,7 @@
   import org.apache.avalon.framework.component.ComponentException;
   
   // needed for obtaining parser in Cocoon
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.sax.Parser;
   
   import test.ServerFunctions;
   
  
  
  
  1.8       +3 -3      xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SQLTransformer.java	9 Jan 2003 17:09:42 -0000	1.7
  +++ SQLTransformer.java	14 Jan 2003 10:04:25 -0000	1.8
  @@ -51,12 +51,12 @@
   package org.apache.cocoon.transformation;
   
   import org.apache.avalon.excalibur.datasource.DataSourceComponent;
  -import org.apache.avalon.excalibur.xml.Parser;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.*;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.sax.XMLDeserializer;
  @@ -64,7 +64,7 @@
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.util.Tokenizer;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
  -import org.apache.avalon.framework.logger.Logger;
  +import org.apache.excalibur.xml.sax.Parser;
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
  
  
  
  1.3       +2 -2      xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation/PhpGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PhpGenerator.java	9 Jan 2003 14:52:01 -0000	1.2
  +++ PhpGenerator.java	14 Jan 2003 10:04:25 -0000	1.3
  @@ -65,12 +65,12 @@
   import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.logger.Logger;
   
  -import org.apache.avalon.excalibur.xml.Parser;
   
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.http.HttpEnvironment;
   
   import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.xml.sax.Parser;
   
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message