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/components/resolver Resolver.java ResolverImpl.java resolver.xconf
Date Thu, 14 Feb 2002 15:47:54 GMT
cziegeler    02/02/14 07:47:54

  Modified:    src/documentation cocoon.xconf
               src/java/org/apache/cocoon cocoon.roles
               src/java/org/apache/cocoon/components/resolver Resolver.java
                        ResolverImpl.java resolver.xconf
  Log:
  Fixed resolver: now using avalon resolver role
  
  Revision  Changes    Path
  1.8       +4 -4      xml-cocoon2/src/documentation/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/cocoon.xconf,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- cocoon.xconf	5 Feb 2002 14:51:47 -0000	1.7
  +++ cocoon.xconf	14 Feb 2002 15:47:53 -0000	1.8
  @@ -14,10 +14,10 @@
     <!-- ==================== General Components ========================== -->
   
     <!-- Parser -->
  -  <parser class="org.apache.cocoon.components.parser.JaxpParser"
  +  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
             logger="core.parser">
       <parameter name="validate" value="false"/>
  -  </parser>
  +  </xml-parser>
   
     <!-- ============================ STORE ============================ -->
     <!-- Used by compiled sitemap engine -->
  @@ -59,11 +59,11 @@
     <!-- ============================ STORE END ========================= -->
   
     <!-- Entity resolution catalogs -->
  -  <resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
  +  <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
               logger="core.resolver">
       <parameter name="catalog" value="/resources/entities/catalog"/>
       <parameter name="verbosity" value="1"/>
  -  </resolver>
  +  </entity-resolver>
   
     <!-- XSLT Processor -->
     <xslt-processor class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"
  
  
  
  1.11      +8 -4      xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- cocoon.roles	14 Feb 2002 09:30:13 -0000	1.10
  +++ cocoon.roles	14 Feb 2002 15:47:53 -0000	1.11
  @@ -17,6 +17,10 @@
           shorthand="xml-parser"
           default-class="org.apache.avalon.excalibur.xml.JaxpParser"/>
   
  +  <role name="org.apache.avalon.excalibur.xml.EntityResolver"
  +        shorthand="entity-resolver"
  +        default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
  +
     <role name="org.apache.cocoon.components.xslt.XSLTProcessor"
           shorthand="xslt-processor"
           default-class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"/>
  @@ -82,10 +86,6 @@
           shorthand="jsp-engine"
           default-class="org.apache.cocoon.components.jsp.JSPEngineImpl"/>
   
  -  <role name="org.apache.cocoon.components.resolver.Resolver"
  -        shorthand="resolver"
  -        default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
  -
     <role name="org.apache.cocoon.components.classloader.ClassLoaderManager"
           shorthand="classloader"
           default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
  @@ -188,6 +188,10 @@
           default-class="org.apache.cocoon.sitemap.DefaultSitemapComponentSelector"/>
   
     <!-- DEPRECATED, use the xml-parser instead ! -->
  +
  +  <role name="org.apache.cocoon.components.resolver.Resolver"
  +        shorthand="resolver"
  +        default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
   
     <role name="org.apache.cocoon.components.parser.Parser"
           shorthand="parser"
  
  
  
  1.5       +2 -1      xml-cocoon2/src/java/org/apache/cocoon/components/resolver/Resolver.java
  
  Index: Resolver.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/Resolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Resolver.java	4 Feb 2002 12:27:38 -0000	1.4
  +++ Resolver.java	14 Feb 2002 15:47:54 -0000	1.5
  @@ -62,10 +62,11 @@
   
   /**
    * A component that uses catalogs for resolving entities.
  + * @deprecated Use the Avalon Excalibur EntityResolver instead
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:crossley@indexgeo.com.au">David Crossley</a>
  - * @version CVS $Id: Resolver.java,v 1.4 2002/02/04 12:27:38 cziegeler Exp $
  + * @version CVS $Id: Resolver.java,v 1.5 2002/02/14 15:47:54 cziegeler Exp $
    */
   public interface Resolver extends Component, EntityResolver {
   
  
  
  
  1.8       +11 -4     xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
  
  Index: ResolverImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ResolverImpl.java	4 Feb 2002 12:27:38 -0000	1.7
  +++ ResolverImpl.java	14 Feb 2002 15:47:54 -0000	1.8
  @@ -54,6 +54,7 @@
    */
   package org.apache.cocoon.components.resolver;
   
  +import org.apache.avalon.excalibur.xml.EntityResolver;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -95,11 +96,17 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:crossley@indexgeo.com.au">David Crossley</a>
  - * @version CVS $Id: ResolverImpl.java,v 1.7 2002/02/04 12:27:38 cziegeler Exp $
  + * @version CVS $Id: ResolverImpl.java,v 1.8 2002/02/14 15:47:54 cziegeler Exp $
    */
  -public class ResolverImpl extends AbstractLoggable
  -        implements Resolver, Contextualizable, Composable, Parameterizable,
  -                    ThreadSafe, Disposable {
  +public class ResolverImpl
  +  extends AbstractLoggable
  +  implements EntityResolver,
  +             Resolver,
  +             Contextualizable,
  +             Composable,
  +             Parameterizable,
  +             ThreadSafe,
  +             Disposable {
   
       /** The catalog resolver */
       protected CatalogResolver catalogResolver = new CatalogResolver();
  
  
  
  1.3       +2 -2      xml-cocoon2/src/java/org/apache/cocoon/components/resolver/resolver.xconf
  
  Index: resolver.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/resolver.xconf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- resolver.xconf	3 Feb 2002 02:25:16 -0000	1.2
  +++ resolver.xconf	14 Feb 2002 15:47:54 -0000	1.3
  @@ -29,8 +29,8 @@
      <parameter name="verbosity" value="2"/>
   
     ************************************************************************** -->
  -  <resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
  +  <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
               logger="core.resolver">
      <parameter name="catalog" value="/resources/entities/catalog"/>
      <parameter name="verbosity" value="1"/>
  -  </resolver>
  +  </entity-resolver>
  
  
  

----------------------------------------------------------------------
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