cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From giac...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/transformation AbstractTransformer.java LogTransformer.java SQLTransformer.java XIncludeTransformer.java XalanTransformer.java
Date Sat, 02 Sep 2000 21:12:42 GMT
giacomo     00/09/02 14:12:41

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: xml-cocoon2 sitemap.xsl
               src/org/apache/cocoon/environment Tag: xml-cocoon2
                        AbstractEnvironment.java Environment.java
               src/org/apache/cocoon/generation Tag: xml-cocoon2
                        AbstractGenerator.java DirectoryGenerator.java
                        ServletGenerator.java
               src/org/apache/cocoon/matching Tag: xml-cocoon2 Matcher.java
               src/org/apache/cocoon/reading Tag: xml-cocoon2
                        AbstractReader.java ResourceReader.java
               src/org/apache/cocoon/selection Tag: xml-cocoon2
                        Selector.java
               src/org/apache/cocoon/sitemap Tag: xml-cocoon2
                        SitemapModelComponent.java
               src/org/apache/cocoon/transformation Tag: xml-cocoon2
                        AbstractTransformer.java LogTransformer.java
                        SQLTransformer.java XIncludeTransformer.java
                        XalanTransformer.java
  Log:
  Replaced all Dictionaries with Maps
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.29  +6 -6      xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
  retrieving revision 1.1.2.28
  retrieving revision 1.1.2.29
  diff -u -r1.1.2.28 -r1.1.2.29
  --- sitemap.xsl	2000/09/02 19:28:12	1.1.2.28
  +++ sitemap.xsl	2000/09/02 21:12:34	1.1.2.29
  @@ -11,7 +11,7 @@
   
   <!--
    * @author &lt;a href="mailto:Giacomo.Pati@pwr.ch"&gt;Giacomo Pati&lt;/a&gt;
  - * @version CVS $Revision: 1.1.2.28 $ $Date: 2000/09/02 19:28:12 $
  + * @version CVS $Revision: 1.1.2.29 $ $Date: 2000/09/02 21:12:34 $
   -->
   
   <!-- Sitemap Core logicsheet for the Java language -->
  @@ -40,7 +40,7 @@
   
       import java.util.List; 
       import java.util.ArrayList; 
  -    import java.util.Dictionary; 
  +    import java.util.Map; 
   
       import org.apache.avalon.Configurable;
       import org.apache.avalon.Configuration;
  @@ -125,7 +125,7 @@
             </xsl:call-template>
           </xsl:variable>
           <xsl:value-of select="java:getClassSource($factory-loader,string($factory),string($matcher-name),string(@pattern),$config)"/>
  -        private List <xsl:value-of select="$matcher-name"/> (String pattern, Dictionary
objectModel) {
  +        private List <xsl:value-of select="$matcher-name"/> (String pattern, Map
objectModel) {
             <xsl:value-of select="java:getMethodSource($factory-loader,string($factory),string($matcher-name),string(@pattern),$config)"/>
           }
         </xsl:for-each>
  @@ -145,7 +145,7 @@
             </xsl:call-template>
           </xsl:variable>
           <xsl:value-of select="java:getClassSource($factory-loader,string($factory),string($selector-name),string(@pattern),$config)"/>
  -        private boolean <xsl:value-of select="$selector-name"/> (String pattern,
Dictionary objectModel) {
  +        private boolean <xsl:value-of select="$selector-name"/> (String pattern,
Map objectModel) {
             <xsl:value-of select="java:getMethodSource($factory-loader,string($factory),string($selector-name),string(@pattern),$config)"/>
           }
         </xsl:for-each>
  @@ -257,7 +257,7 @@
         List listOfLists = (List)(new ArrayList());
         List list = null;
         Parameters param = null; 
  -      Dictionary objectModel = environment.getObjectModel(); 
  +      Map objectModel = environment.getObjectModel(); 
         String cocoon_view = environment.getView();
         <xsl:for-each select="/map:sitemap/map:pipelines/map:pipeline">
           <xsl:variable name="pipeline-position" select="position()"/>
  @@ -286,7 +286,7 @@
       <xsl:for-each select="/map:sitemap/map:pipelines/map:pipeline">
         <xsl:variable name="pipeline-position" select="position()"/>
         <xsl:if test="(./map:handle-errors)">
  -        private boolean error_process_<xsl:value-of select="$pipeline-position"/>
(Environment environment, Dictionary objectModel, Exception e) 
  +        private boolean error_process_<xsl:value-of select="$pipeline-position"/>
(Environment environment, Map objectModel, Exception e) 
           throws Exception { 
             ResourcePipeline pipeline = new ResourcePipeline ();
             pipeline.setComponentManager (this.manager);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +6 -6      xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- AbstractEnvironment.java	2000/08/31 15:56:15	1.1.2.3
  +++ AbstractEnvironment.java	2000/09/02 21:12:35	1.1.2.4
  @@ -13,8 +13,8 @@
   import java.io.OutputStream;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.Dictionary;
  -import java.util.Hashtable;
  +import java.util.Map;
  +import java.util.HashMap;
   
   import javax.servlet.ServletContext;
   import javax.servlet.http.HttpServletRequest;
  @@ -40,7 +40,7 @@
       protected URL context = null;
   
       /** The servlet object model */
  -    protected Hashtable objectModel = null;
  +    protected HashMap objectModel = null;
   
       /**
        * Constructs the abstract enviornment
  @@ -58,7 +58,7 @@
           this.uri = uri;
           this.view = view;
           this.context = context.toURL();
  -        this.objectModel = new Hashtable();
  +        this.objectModel = new HashMap();
       }
   
       // Sitemap methods
  @@ -117,9 +117,9 @@
       // Object model method
   
       /**
  -     * Returns a Dictionary containing environment specific objects
  +     * Returns a Map containing environment specific objects
        */
  -    public Dictionary getObjectModel() {
  +    public Map getObjectModel() {
           return this.objectModel;
       }
   
  
  
  
  1.1.2.11  +3 -3      xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- Environment.java	2000/08/31 16:44:11	1.1.2.10
  +++ Environment.java	2000/09/02 21:12:35	1.1.2.11
  @@ -11,7 +11,7 @@
   import java.io.IOException;
   import java.io.OutputStream;
   import java.net.MalformedURLException;
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXException;
  @@ -20,7 +20,7 @@
    * Base interface for an environment abstraction
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/08/31 16:44:11 $
  + * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/09/02 21:12:35 $
    */
   
   public interface Environment extends EntityResolver {
  @@ -63,7 +63,7 @@
       /**
        * Get the underlying object model
        */
  -    public Dictionary getObjectModel();
  +    public Map getObjectModel();
   
   }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +6 -6      xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java
  
  Index: AbstractGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- AbstractGenerator.java	2000/08/04 21:11:40	1.1.2.4
  +++ AbstractGenerator.java	2000/09/02 21:12:36	1.1.2.5
  @@ -7,7 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.apache.avalon.utils.Parameters;
   
  @@ -19,25 +19,25 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:40 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/02 21:12:36 $
    */
   public abstract class AbstractGenerator extends AbstractXMLProducer
   implements Generator {
   
       /** The current <code>EntityResolver</code>. */
       protected EntityResolver resolver=null;
  -    /** The current <code>Dictionary</code> objectModel. */
  -    protected Dictionary objectModel=null;
  +    /** The current <code>Map</code> objectModel. */
  +    protected Map objectModel=null;
       /** The current <code>Parameters</code>. */
       protected Parameters parameters=null;
       /** The source URI associated with the request or <b>null</b>. */
       protected String source=null;
   
       /**
  -     * Set the <code>EntityResolver</code>, object model <code>Dictionary</code>,
  +     * Set the <code>EntityResolver</code>, object model <code>Map</code>,
        * the source and sitemap <code>Parameters</code> used to process the request.
        */
  -    public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters
par) {
  +    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters
par) {
           this.resolver=resolver;
           this.objectModel=objectModel;
           this.source=src;
  
  
  
  1.1.2.8   +4 -4      xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
  
  Index: DirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- DirectoryGenerator.java	2000/08/29 22:17:51	1.1.2.7
  +++ DirectoryGenerator.java	2000/09/02 21:12:36	1.1.2.8
  @@ -13,7 +13,7 @@
   import java.net.URL;
   import java.text.SimpleDateFormat;
   import java.util.Date;
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
  @@ -55,7 +55,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/29 22:17:51 $ */
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/09/02 21:12:36 $ */
    
   public class DirectoryGenerator extends ComposerGenerator {
   
  @@ -90,13 +90,13 @@
        * @param   resolver
        *      the EntityResolver object
        * @param   objectModel
  -     *      a <code>Dictionary</code> containing model object
  +     *      a <code>Map</code> containing model object
        * @param   src
        *      the URI for this request (?)
        * @param   par
        *      configuration parameters
        */
  -    public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters
par) {
  +    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters
par) {
           super.setup(resolver, objectModel, src, par);
       
           String dateFormatString = par.getParameter("dateFormat", null);
  
  
  
  1.1.2.2   +3 -3      xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
  
  Index: ServletGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ServletGenerator.java	2000/08/04 21:11:47	1.1.2.1
  +++ ServletGenerator.java	2000/09/02 21:12:36	1.1.2.2
  @@ -7,7 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.generation;
   
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import javax.servlet.ServletContext; 
   import javax.servlet.http.HttpServletRequest; 
  @@ -22,7 +22,7 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/08/04 21:11:47 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/09/02 21:12:36 $
    */
   public abstract class ServletGenerator extends ComposerGenerator
   implements Composer {
  @@ -31,7 +31,7 @@
       protected HttpServletResponse response=null;
       protected ServletContext context=null;
   
  -    public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters
par) {
  +    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters
par) {
         super.setup(resolver, objectModel, src, par);
         this.request = (HttpServletRequest) objectModel.get("request");
         this.response = (HttpServletResponse) objectModel.get("response");
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +4 -4      xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java
  
  Index: Matcher.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Matcher.java	2000/08/04 21:11:53	1.1.2.6
  +++ Matcher.java	2000/09/02 21:12:37	1.1.2.7
  @@ -8,14 +8,14 @@
   package org.apache.cocoon.matching;
   
   import java.util.List;
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.apache.avalon.Component;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:53 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/02 21:12:37 $
    */
   public interface Matcher extends Component {
       /**
  @@ -25,7 +25,7 @@
        * @param pattern     The pattern to match against. Depending on the
        *                    implementation the pattern can contain wildcards
        *                    or regular expressions.
  -     * @param objectModel The <code>Dictionary</code> with object of the 
  +     * @param objectModel The <code>Map</code> with object of the 
        *                    calling environment which can be used
        *                    to select values this matchers matches against.
        * @return Map        The returned <code>Map</code> object with
  @@ -33,7 +33,7 @@
        *                    contained in the pattern.
        *                    If the return value is null there was no match.
        */
  -    public List match (String pattern, Dictionary objectModel);
  +    public List match (String pattern, Map objectModel);
   }
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +6 -6      xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
  
  Index: AbstractReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- AbstractReader.java	2000/08/16 05:08:15	1.1.2.3
  +++ AbstractReader.java	2000/09/02 21:12:38	1.1.2.4
  @@ -8,7 +8,7 @@
   package org.apache.cocoon.reading;
   
   import java.io.OutputStream;
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.apache.avalon.utils.Parameters;
   
  @@ -17,13 +17,13 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/08/16 05:08:15 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/09/02 21:12:38 $
    */
   public abstract class AbstractReader implements Reader {
       /** The current <code>EntityResolver</code>. */
       protected EntityResolver resolver=null;
  -    /** The current <code>Dictionary</code> of the object model. */
  -    protected Dictionary objectModel=null;
  +    /** The current <code>Map</code> of the object model. */
  +    protected Map objectModel=null;
       /** The current <code>Parameters</code>. */
       protected Parameters parameters=null;
       /** The source URI associated with the request or <b>null</b>. */
  @@ -32,10 +32,10 @@
       protected OutputStream out=null;
   
       /**
  -     * Set the <code>EntityResolver</code> the object model <code>Dictionary</code>,
  +     * Set the <code>EntityResolver</code> the object model <code>Map</code>,
        * the source and sitemap <code>Parameters</code> used to process the request.
        */
  -    public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters
par) {
  +    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters
par) {
           this.resolver=resolver;
           this.objectModel=objectModel;
           this.source=src;
  
  
  
  1.1.2.4   +1 -2      xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
  
  Index: ResourceReader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- ResourceReader.java	2000/08/16 05:08:16	1.1.2.3
  +++ ResourceReader.java	2000/09/02 21:12:38	1.1.2.4
  @@ -14,7 +14,6 @@
   import java.net.URL;
   import java.net.MalformedURLException;
   import java.util.Hashtable;
  -import java.util.Dictionary;
   
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.ServletContext;
  @@ -26,7 +25,7 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/08/16 05:08:16 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/09/02 21:12:38 $
    */
   public class ResourceReader extends AbstractReader {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +5 -5      xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java
  
  Index: Selector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Selector.java	2000/08/04 21:11:59	1.1.2.5
  +++ Selector.java	2000/09/02 21:12:39	1.1.2.6
  @@ -7,26 +7,26 @@
    *****************************************************************************/
   package org.apache.cocoon.selection;
   
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.apache.avalon.Component;
   
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:11:59 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/09/02 21:12:39 $
    */
   public interface Selector extends Component {
       /**
  -     * Selectors test pattern against some objects in a <code>Dictionary</code>
  +     * Selectors test pattern against some objects in a <code>Map</code>
        * model and signals success with the returned boolean value
        * @param expression  The expression to test.
  -     * @param objectModel The <code>Dictionary</code> containing object of
the 
  +     * @param objectModel The <code>Map</code> containing object of the 
        *                    calling environment which may be used
        *                    to select values to test the expression.
        * @return boolean    Signals successfull test.
        */
  -    public boolean select (String expression, Dictionary objectModel);
  +    public boolean select (String expression, Map objectModel);
   }
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +4 -4      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java
  
  Index: SitemapModelComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- SitemapModelComponent.java	2000/08/04 21:12:12	1.1.2.1
  +++ SitemapModelComponent.java	2000/09/02 21:12:39	1.1.2.2
  @@ -8,7 +8,7 @@
   package org.apache.cocoon.sitemap;
   
   import java.io.IOException;
  -import java.util.Dictionary;
  +import java.util.Map;
   
   import org.apache.avalon.Component;
   import org.apache.avalon.utils.Parameters;
  @@ -21,14 +21,14 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/08/04 21:12:12 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/09/02 21:12:39 $
    */
   public interface SitemapModelComponent extends Component {
   
       /**
  -     * Set the <code>EntityResolver</code>, objectModel <code>Dictionary</code>,
  +     * Set the <code>EntityResolver</code>, objectModel <code>Map</code>,
        * the source and sitemap <code>Parameters</code> used to process the request.
        */
  -    public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters
par)
  +    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters
par)
       throws ProcessingException, SAXException, IOException;
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +1 -3      xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractTransformer.java
  
  Index: AbstractTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractTransformer.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- AbstractTransformer.java	2000/08/04 21:12:13	1.1.2.4
  +++ AbstractTransformer.java	2000/09/02 21:12:40	1.1.2.5
  @@ -7,8 +7,6 @@
    *****************************************************************************/
   package org.apache.cocoon.transformation;
   
  -import java.util.Dictionary;
  -
   import org.apache.cocoon.xml.AbstractXMLProducer;
   
   import org.xml.sax.Attributes;
  @@ -19,7 +17,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:13 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/02 21:12:40 $
    */
   public abstract class AbstractTransformer extends AbstractXMLProducer
   implements Transformer {
  
  
  
  1.1.2.5   +3 -3      xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
  
  Index: LogTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- LogTransformer.java	2000/08/04 21:12:13	1.1.2.4
  +++ LogTransformer.java	2000/09/02 21:12:40	1.1.2.5
  @@ -20,7 +20,7 @@
   import java.io.FileWriter;
   import java.io.IOException;
   import java.util.Date;
  -import java.util.Dictionary;
  +import java.util.Map;
   
   /**
    *
  @@ -45,7 +45,7 @@
    * 
    * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
    *         (PWR Organisation &amp; Entwicklung)
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:13 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/02 21:12:40 $
    *
    */
   public class LogTransformer extends AbstractTransformer {
  @@ -66,7 +66,7 @@
   
       /** BEGIN SitemapComponent methods **/
   
  -    public void setup(EntityResolver resolver, Dictionary objectModel,
  +    public void setup(EntityResolver resolver, Map objectModel,
                         String source, Parameters parameters) 
               throws ProcessingException, SAXException, IOException {
           if (logfile == null) {
  
  
  
  1.1.2.8   +3 -3      xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- SQLTransformer.java	2000/08/29 18:22:57	1.1.2.7
  +++ SQLTransformer.java	2000/09/02 21:12:40	1.1.2.8
  @@ -16,7 +16,7 @@
   import java.sql.SQLException;
   import java.util.Properties;
   import java.util.Vector;
  -import java.util.Dictionary;
  +import java.util.Map;
   import java.util.Enumeration;
   
   import org.apache.avalon.utils.Parameters;
  @@ -37,7 +37,7 @@
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
    * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
    *         (PWR Organisation & Entwicklung)
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/29 18:22:57 $ $Author: giacomo $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/09/02 21:12:40 $ $Author: giacomo $
    */
   
   public class SQLTransformer extends AbstractTransformer {
  @@ -93,7 +93,7 @@
   
       /** BEGIN SitemapComponent methods **/
   
  -    public void setup(EntityResolver resolver, Dictionary objectModel,
  +    public void setup(EntityResolver resolver, Map objectModel,
                         String source, Parameters parameters) 
       throws ProcessingException, SAXException, IOException {
           current_state = STATE_OUTSIDE;
  
  
  
  1.1.2.5   +3 -3      xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- XIncludeTransformer.java	2000/08/04 21:12:14	1.1.2.4
  +++ XIncludeTransformer.java	2000/09/02 21:12:40	1.1.2.5
  @@ -14,7 +14,7 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.util.Stack;
  -import java.util.Dictionary;
  +import java.util.Map;
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
  @@ -42,7 +42,7 @@
    * by the SAX event FSM yet.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:14 $ $Author: giacomo $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/02 21:12:40 $ $Author: giacomo $
    */
   public class XIncludeTransformer extends AbstractTransformer implements Composer {
   
  @@ -76,7 +76,7 @@
   
   	protected Stack xmlbase_element_name_stack = new Stack();
   
  -    public void setup(EntityResolver resolver, Dictionary objectModel,
  +    public void setup(EntityResolver resolver, Map objectModel,
                         String source, Parameters parameters) 
               throws ProcessingException, SAXException, IOException {}
   	/*
  
  
  
  1.1.2.7   +4 -4      xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java
  
  Index: XalanTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- XalanTransformer.java	2000/08/04 21:12:14	1.1.2.6
  +++ XalanTransformer.java	2000/09/02 21:12:40	1.1.2.7
  @@ -9,7 +9,7 @@
   
   import java.io.IOException;
   import java.util.Enumeration;
  -import java.util.Dictionary;
  +import java.util.Map;
   import java.text.StringCharacterIterator;
   
   import javax.servlet.http.HttpServletRequest;
  @@ -41,7 +41,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:12:14 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/02 21:12:40 $
    */
   public class XalanTransformer extends DocumentHandlerWrapper
   implements Transformer, Composer {
  @@ -52,11 +52,11 @@
       private XSLTProcessor processor=null;
   
       /**
  -     * Set the <code>EntityResolver</code>, the <code>Dictionary</code>
with 
  +     * Set the <code>EntityResolver</code>, the <code>Map</code>
with 
        * the object model, the source and sitemap
        * <code>Parameters</code> used to process the request.
        */
  -    public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters
par)
  +    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters
par)
       throws SAXException, ProcessingException, IOException {
   
           /** The Request object */
  
  
  

Mime
View raw message