cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon cocoon.roles
Date Wed, 12 Mar 2003 10:15:46 GMT
cziegeler    2003/03/12 02:15:45

  Modified:    src/java/org/apache/cocoon/components/resolver
                        DefaultResolver.java
               lib      jars.xml
               src/webapp/WEB-INF cocoon.xconf
               src/java/org/apache/cocoon cocoon.roles
  Added:       lib/core excalibur-xmlutil-20030312.jar
               .        javadoc1171998660
  Removed:     lib/core excalibur-xmlutil-20030306.jar
  Log:
  Finishing removing dependencies to the deprecated stuff
  
  Revision  Changes    Path
  1.1                  cocoon-2.1/lib/core/excalibur-xmlutil-20030312.jar
  
  	<<Binary file>>
  
  
  1.1                  cocoon-2.1/javadoc1171998660
  
  Index: javadoc1171998660
  ===================================================================
  org.apache.cocoon
  org.apache.cocoon.acting
  org.apache.cocoon.bean
  org.apache.cocoon.bean.destination
  org.apache.cocoon.caching
  org.apache.cocoon.caching.impl
  org.apache.cocoon.components
  org.apache.cocoon.components.classloader
  org.apache.cocoon.components.crawler
  org.apache.cocoon.components.flow
  org.apache.cocoon.components.flow.javascript
  org.apache.cocoon.components.flow.schedulerwrapper
  org.apache.cocoon.components.language
  org.apache.cocoon.components.language.generator
  org.apache.cocoon.components.language.markup
  org.apache.cocoon.components.language.markup.xsp
  org.apache.cocoon.components.language.programming
  org.apache.cocoon.components.language.programming.java
  org.apache.cocoon.components.language.programming.javascript
  org.apache.cocoon.components.modules.input
  org.apache.cocoon.components.modules.output
  org.apache.cocoon.components.notification
  org.apache.cocoon.components.pipeline
  org.apache.cocoon.components.pipeline.impl
  org.apache.cocoon.components.request
  org.apache.cocoon.components.request.multipart
  org.apache.cocoon.components.resolver
  org.apache.cocoon.components.sax
  org.apache.cocoon.components.source
  org.apache.cocoon.components.source.helpers
  org.apache.cocoon.components.source.impl
  org.apache.cocoon.components.store.impl
  org.apache.cocoon.components.treeprocessor
  org.apache.cocoon.components.treeprocessor.sitemap
  org.apache.cocoon.components.treeprocessor.variables
  org.apache.cocoon.components.validation
  org.apache.cocoon.components.validation.schematron
  org.apache.cocoon.components.xmlform
  org.apache.cocoon.components.xscript
  org.apache.cocoon.environment
  org.apache.cocoon.environment.commandline
  org.apache.cocoon.environment.http
  org.apache.cocoon.environment.wrapper
  org.apache.cocoon.generation
  org.apache.cocoon.i18n
  org.apache.cocoon.matching
  org.apache.cocoon.matching.helpers
  org.apache.cocoon.matching.modular
  org.apache.cocoon.reading
  org.apache.cocoon.selection
  org.apache.cocoon.serialization
  org.apache.cocoon.servlet
  org.apache.cocoon.sitemap
  org.apache.cocoon.transformation
  org.apache.cocoon.transformation.helpers
  org.apache.cocoon.util
  org.apache.cocoon.util.log
  org.apache.cocoon.xml
  org.apache.cocoon.xml.dom
  org.apache.cocoon.xml.xlink
  org.apache.cocoon.components.parser
  org.apache.cocoon.components.store
  org.apache.cocoon.components.url
  org.apache.cocoon.components.xpath
  org.apache.cocoon.components.xslt
  
  
  
  1.2       +14 -1     cocoon-2.1/src/java/org/apache/cocoon/components/resolver/DefaultResolver.java
  
  Index: DefaultResolver.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/resolver/DefaultResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultResolver.java	12 Mar 2003 09:35:38 -0000	1.1
  +++ DefaultResolver.java	12 Mar 2003 10:15:44 -0000	1.2
  @@ -58,6 +58,12 @@
    * This component simply inherits from the excalibur implementation and
    * adds the context: protocol to each relative uri.
    *
  + * The catalog is by default loaded from "WEB-INF/entities/catalog".
  + * This can be configured by the "catalog" parameter in the cocoon.xconf:
  + * &lt;entity-resolver&gt;
  + *   &lt;parameter name="catalog" value="mycatalog"/&gt;
  + * &lt;/entity-resolver&gt;
  + * 
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @version CVS $Id$
    * @since 2.1
  @@ -74,5 +80,12 @@
               file = "context://" + file;
           }
           super.parseCatalog( file );
  +    }
  +    
  +    /**
  +     * Default catalog path
  +     */
  +    protected String defaultCatalog() {
  +        return "/WEB-INF/entities/catalog";
       }
   }
  
  
  
  1.2       +1 -1      cocoon-2.1/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jars.xml	9 Mar 2003 00:01:46 -0000	1.1
  +++ jars.xml	12 Mar 2003 10:15:44 -0000	1.2
  @@ -178,7 +178,7 @@
   	<description>Part of jakarta-avalon, it is a set of classes and patterns that
          support high level server development.</description>
   	<used-by>Cocoon</used-by>
  -	<lib>core/excalibur-xmlutil-20030306.jar</lib>
  +	<lib>core/excalibur-xmlutil-20030312.jar</lib>
   	<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
    </file>
    <file>
  
  
  
  1.5       +51 -50    cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cocoon.xconf	12 Mar 2003 09:35:37 -0000	1.4
  +++ cocoon.xconf	12 Mar 2003 10:15:44 -0000	1.5
  @@ -192,6 +192,57 @@
   <!-- ================================= XML ================================ -->
   
     <!--+
  +      | Source Factories
  +      |
  +      | Each source factory adds a special uri protocol to the system.
  +      +-->
  +  <source-factories>
  +    <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory"
name="resource"/>
  +    <component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory"
name="context"/>
  +    <component-instance class="org.apache.cocoon.components.source.impl.SitemapSourceFactory"
name="cocoon"/>
  +    <component-instance class="org.apache.cocoon.components.source.impl.FileSourceFactory"
name="file"/>
  +    <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
  +  </source-factories>
  +  <!--+
  +      | Entity resolution catalogs
  +      |
  +      | The default catalog is distributed at /WEB-INF/entities/catalog
  +      | This is the contextual pathname for Cocoon resources.
  +      | You can override this path, if necessary, using the "catalog" parameter:
  +      |
  +      |    <parameter name="catalog" value="/WEB-INF/entities/catalog"/>
  +      |
  +      | However, it is probably desirable to leave this default catalog config
  +      | and declare your own local catalogs, which are loaded in addition to
  +      | the system catalog.
  +      |
  +      | There are various ways to do local configuration (see "Entity Catalogs"
  +      | documentation). One way is via the CatalogManager.properties file.
  +      | As an additional method, you can specify the "local-catalog" parameter here.
  +      |
  +      | local-catalog:
  +      |   The full filesystem pathname to a single local catalog file.
  +      |
  +      |  <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
  +      |
  +      | verbosity:
  +      | The level of messages for status/debug (messages go to standard output)
  +      | The following messages are provided ...
  +      |  0 = none
  +      |  1 = ? (... not sure yet)
  +      |  2 = 1+, Loading catalog, Resolved public, Resolved system
  +      |  3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
  +      |  10 = 3+, List all catalog entries when loading a catalog
  +      |    (Cocoon also logs the "Resolved public" messages.)
  +      |
  +      |     <parameter name="verbosity" value="2"/>
  +      +-->
  +  <entity-resolver logger="core.resolver">
  +   <parameter name="catalog" value="/WEB-INF/entities/catalog"/>
  +   <parameter name="verbosity" value="1"/>
  +  </entity-resolver>
  +
  +  <!--+
         | XML Parser
         |
         | The default parser used in Apache Cocoon is
  @@ -244,44 +295,6 @@
       <!--parameter name="document-builder-factory" value="???"/-->
     </xml-parser>
   
  -  <!--+
  -      | Entity resolution catalogs
  -      |
  -      | The default catalog is distributed at /WEB-INF/entities/catalog
  -      | This is the contextual pathname for Cocoon resources.
  -      | You can override this path, if necessary, using the "catalog" parameter:
  -      |
  -      |    <parameter name="catalog" value="/WEB-INF/entities/catalog"/>
  -      |
  -      | However, it is probably desirable to leave this default catalog config
  -      | and declare your own local catalogs, which are loaded in addition to
  -      | the system catalog.
  -      |
  -      | There are various ways to do local configuration (see "Entity Catalogs"
  -      | documentation). One way is via the CatalogManager.properties file.
  -      | As an additional method, you can specify the "local-catalog" parameter here.
  -      |
  -      | local-catalog:
  -      |   The full filesystem pathname to a single local catalog file.
  -      |
  -      |  <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
  -      |
  -      | verbosity:
  -      | The level of messages for status/debug (messages go to standard output)
  -      | The following messages are provided ...
  -      |  0 = none
  -      |  1 = ? (... not sure yet)
  -      |  2 = 1+, Loading catalog, Resolved public, Resolved system
  -      |  3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
  -      |  10 = 3+, List all catalog entries when loading a catalog
  -      |    (Cocoon also logs the "Resolved public" messages.)
  -      |
  -      |     <parameter name="verbosity" value="2"/>
  -      +-->
  -  <entity-resolver logger="core.resolver">
  -   <parameter name="catalog" value="/WEB-INF/entities/catalog"/>
  -   <parameter name="verbosity" value="1"/>
  -  </entity-resolver>
   
     <!--+
         | XSLT Processor
  @@ -377,18 +390,6 @@
   
   <!-- ========================= Protocol Handlers =========================== -->
   
  -  <!--+
  -      | Source Factories
  -      |
  -      | Each source factory adds a special uri protocol to the system.
  -      +-->
  -  <source-factories>
  -    <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory"
name="resource"/>
  -    <component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory"
name="context"/>
  -    <component-instance class="org.apache.cocoon.components.source.impl.SitemapSourceFactory"
name="cocoon"/>
  -    <component-instance class="org.apache.cocoon.components.source.impl.FileSourceFactory"
name="file"/>
  -    <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
  -  </source-factories>
   
   <!-- ================ Internationalization Catalogs =================== -->
   
  
  
  
  1.4       +10 -10    cocoon-2.1/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cocoon.roles	12 Mar 2003 09:35:36 -0000	1.3
  +++ cocoon.roles	12 Mar 2003 10:15:45 -0000	1.4
  @@ -14,10 +14,19 @@
   
   <role-list>
   
  +  <role name="org.apache.excalibur.source.SourceFactorySelector"
  +        shorthand="source-factories"
  +        default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
  +  </role>
  +
  +  <role name="org.apache.excalibur.source.SourceResolver"
  +        shorthand="source-resolver"
  +        default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
  +
     <!-- The entity resolver used by most parsers -->
     <role name="org.apache.excalibur.xml.EntityResolver"
           shorthand="entity-resolver"
  -        default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
  +        default-class="org.apache.cocoon.components.resolver.DefaultResolver"/>
   
     <!-- Parser:
     
  @@ -111,15 +120,6 @@
       <hint shorthand="j2ee" class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
       <hint shorthand="informix" class="org.apache.avalon.excalibur.datasource.InformixDataSource"/>
     </role>
  -
  -  <role name="org.apache.excalibur.source.SourceFactorySelector"
  -        shorthand="source-factories"
  -        default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
  -  </role>
  -
  -  <role name="org.apache.excalibur.source.SourceResolver"
  -        shorthand="source-resolver"
  -        default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
   
     <role name="org.apache.excalibur.xmlizer.XMLizer"
           shorthand="xmlizer"
  
  
  

Mime
View raw message