cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r161495 - cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
Date Fri, 15 Apr 2005 16:05:54 GMT
Author: vgritsenko
Date: Fri Apr 15 09:05:53 2005
New Revision: 161495

URL: http://svn.apache.org/viewcvs?view=rev&rev=161495
Log:
Move source resolver config to protocols section
Add/update some logger attributes.

Modified:
    cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf

Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf?view=diff&r1=161494&r2=161495
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf Fri Apr 15 09:05:53 2005
@@ -204,19 +204,20 @@
       <input-module name="defaults"/>
     </component-instance>
 
-    <!-- The 'defaults', 'myxml' and 'slashdot' input modules are used
-         in the samples -->
+    <!--+
+        | Following three modules definitions, 'defaults', 'myxml', and
+        | 'slashdot', are used only in the samples.
+        +-->
     <component-instance logger="core.modules.input" name="defaults"     class="org.apache.cocoon.components.modules.input.DefaultsModule">
       <values>
         <skin>defaultSkin</skin>
         <base-url>http://localhost:8080/cocoon</base-url>
       </values>
     </component-instance>
-
-    <component-instance class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.xml" name="myxml">
+    <component-instance logger="core.modules.input" name="myxml"        class="org.apache.cocoon.components.modules.input.XMLFileModule">
       <file src="context://samples/modules/forrestconf.xml"/>
     </component-instance>
-    <component-instance class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.xml" name="slashdot">
+    <component-instance logger="core.modules.input" name="slashdot"     class="org.apache.cocoon.components.modules.input.XMLFileModule">
       <file src="http://slashdot.org/slashdot.rss"/>
     </component-instance>
 
@@ -244,37 +245,12 @@
   <output-modules>
     <component-instance logger="core.modules.output" name="request-attr" class="org.apache.cocoon.components.modules.output.RequestAttributeOutputModule"/>
     <component-instance logger="core.modules.output" name="request-attr-map" class="org.apache.cocoon.components.modules.output.RequestAttributeMap"/>
-    <component-instance logger="core.modules.output" name="session-attr"   class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule"/>
+    <component-instance logger="core.modules.output" name="session-attr" class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule"/>
   </output-modules>
 
 <!-- ================================= XML ================================ -->
 
   <!--+
-      | Source Factories
-      |
-      | Each source factory adds a special uri schemes 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"/>
-    <!--+
-        | The "file:" source protocol is modifiable (can be written to) and
-        | traversable (directory structures can be crawled).
-        +-->
-    <component-instance class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/>
-    <component-instance class="org.apache.cocoon.components.source.impl.PartSourceFactory"
name="upload"/>
-    <component-instance class="org.apache.cocoon.components.source.impl.ModuleSourceFactory"
name="module"/>
-    <component-instance class="org.apache.cocoon.components.source.impl.XModuleSourceFactory"
name="xmodule"/>
-
-    <!--+
-        | The "*" protocol handles all uri schemes that are not explicitely
-        | specified. This includes all JDK standard protocols.
-        +-->
-    <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
@@ -364,7 +340,7 @@
       |     would appear in the serialized output again.
       +-->
   <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
-             logger="core.xml-parser" pool-max="32">
+              logger="core.xml-parser" pool-max="32">
     <parameter name="validate" value="false"/>
     <parameter name="namespace-prefixes" value="false"/>
     <parameter name="stop-on-warning" value="true"/>
@@ -389,7 +365,7 @@
       |          * incremental processing is a 'static' thing in Xalan: if you
       |            enable it on one xslt-processor, enable it on all.
       +-->
-  <xslt-processor logger="core.xslt-processor">
+  <xslt-processor logger="core.xslt">
      <parameter name="use-store" value="true"/>
      <parameter name="incremental-processing" value="false"/>
   </xslt-processor>
@@ -399,7 +375,7 @@
       | For Interpreted Xalan use:
       | <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
       +-->
-  <component logger="core.xslt-processor"
+  <component logger="core.xslt"
              role="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc"
              class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl">
      <parameter name="use-store" value="true"/>
@@ -409,7 +385,7 @@
   <!--+
       | Xalan XSLT Processor
       +-->
-  <component logger="core.xslt-processor"
+  <component logger="core.xslt"
              role="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan"
              class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl">
      <parameter name="use-store" value="true"/>
@@ -423,7 +399,7 @@
       |  <parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
       | For new (7+) Saxon use:
       |  <parameter name="transformer-factory" value="net.sf.saxon.TransformerFactoryImpl"/>
-  <component logger="core.xslt-processor"
+  <component logger="core.xslt"
              role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
              class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl">
      <parameter name="use-store" value="true"/>
@@ -431,11 +407,15 @@
   </component>
       +-->
 
-  <!-- Xpath Processor: -->
-  <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl" logger="core.xpath-processor"/>
+  <!--+
+      | Xpath Processor (Based on Xalan)
+      +-->
+  <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl" logger="core.xpath"/>
 
-  <!-- The XMLizers converts different mime-types to XML -->
-  <xmlizer>
+  <!--+
+      | The XMLizers converts different mime-types to XML
+      +-->
+  <xmlizer logger="core.xmlizer">
     <parser role="org.apache.excalibur.xml.sax.SAXParser" mime-type="text/xml"/>
   </xmlizer>
 
@@ -535,6 +515,31 @@
 
 <!-- ========================= Protocol Handlers =========================== -->
 
+  <!--+
+      | Source Factories
+      |
+      | Each source factory adds a special uri schemes to the system.
+      +-->
+  <source-factories>
+    <component-instance name="resource" class="org.apache.excalibur.source.impl.ResourceSourceFactory"/>
+    <component-instance name="context" class="org.apache.cocoon.components.source.impl.ContextSourceFactory"/>
+    <component-instance name="cocoon" class="org.apache.cocoon.components.source.impl.SitemapSourceFactory"/>
+
+    <!--+
+        | The "file:" source protocol is modifiable (can be written to) and
+        | traversable (directory structures can be crawled).
+        +-->
+    <component-instance name="file" class="org.apache.excalibur.source.impl.FileSourceFactory"/>
+    <component-instance name="upload" class="org.apache.cocoon.components.source.impl.PartSourceFactory"/>
+    <component-instance name="module" class="org.apache.cocoon.components.source.impl.ModuleSourceFactory"/>
+    <component-instance name="xmodule" class="org.apache.cocoon.components.source.impl.XModuleSourceFactory"/>
+
+    <!--+
+        | The "*" protocol handles all uri schemes that are not explicitely
+        | specified. This includes all JDK standard protocols.
+        +-->
+    <component-instance name="*" class="org.apache.excalibur.source.impl.URLSourceFactory"/>
+  </source-factories>
 
 <!-- ================ Internationalization Catalogs =================== -->
 
@@ -546,7 +551,7 @@
       | 'catalogue_name' value.
       | If 'cache-at-startup' is true then BundleFactory preloads bundles.
       +-->
-  <i18n-bundles logger="core.i18n-bundles">
+  <i18n-bundles logger="core.i18n">
     <catalogue-name>messages</catalogue-name>
     <catalogue-location>context://samples/i18n/translations</catalogue-location>
     <cache-at-startup>true</cache-at-startup>
@@ -562,14 +567,14 @@
   <!--+
       | XML compiler/decompiler
       |
-      | these components are used to process SAX events and produce a binary
+      | These components are used to process SAX events and produce a binary
       | representation that is much more compact and efficient for
       | subsequent parsing. These are used by the cache system to save
       | the intermediate results of the pipeline stages reducing the overhead
       | of xml parsing/serialization.
       +-->
-  <xml-serializer class="org.apache.cocoon.components.sax.XMLByteStreamCompiler" logger="core.xml-serializer"
pool-max="32"/>
-  <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml-deserializer" pool-max="32"/>
+  <xml-serializer class="org.apache.cocoon.components.sax.XMLByteStreamCompiler" logger="core.xml.serializer"
pool-max="32"/>
+  <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml.deserializer" pool-max="32"/>
 
   <!--+
       | The Cache Manager is a component that can be used to cache content.
@@ -587,7 +592,7 @@
   <!--+
       | Runnable manager
       |
-      | this component manages commands (Runnables) executed in background using
+      | This component manages commands (Runnables) executed in background using
       | preconfigured pools of worker threads
       +-->
   <runnable-manager logger="core.runnable">



Mime
View raw message