cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r605552 - in /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring: cocoon-core-generators.xml cocoon-core-serializers.xml
Date Wed, 19 Dec 2007 14:37:21 GMT
Author: vgritsenko
Date: Wed Dec 19 06:37:20 2007
New Revision: 605552

URL: http://svn.apache.org/viewvc?rev=605552&view=rev
Log:
set 'content' label on generators

Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml?rev=605552&r1=605551&r2=605552&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml
Wed Dec 19 06:37:20 2007
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-    "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,39 +16,55 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
-<beans default-init-method="init">
+<!--
+  - $Id$
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:pipeline="http://cocoon.apache.org/schema/pipeline"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                           http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd"
+       default-init-method="init">
+
   <bean name="org.apache.cocoon.generation.Generator/filebean"
         class="org.apache.cocoon.generation.FileGeneratorBean"
         scope="prototype">
+    <pipeline:component label="content"/>
     <property name="parser" ref="org.apache.cocoon.core.xml.SAXParser"/>
   </bean>
 
   <bean name="org.apache.cocoon.generation.Generator/file"
         class="org.apache.cocoon.generation.FileGenerator"
         scope="prototype">
+    <pipeline:component label="content"/>
     <property name="parser" ref="org.apache.cocoon.core.xml.SAXParser"/>
   </bean>
 
   <bean name="org.apache.cocoon.generation.Generator/directory"
         class="org.apache.cocoon.generation.DirectoryGenerator"
-        scope="prototype"/>
+        scope="prototype">
+    <pipeline:component label="content"/>
+  </bean>
 
   <bean name="org.apache.cocoon.generation.Generator/xpathdirectory"
         class="org.apache.cocoon.generation.XPathDirectoryGenerator"
         scope="prototype">
+    <pipeline:component label="content"/>
     <property name="parser" ref="org.apache.cocoon.core.xml.DOMParser"/>
     <property name="XPathProcessor" ref="org.apache.excalibur.xml.xpath.XPathProcessor"/>
   </bean>
 
   <bean name="org.apache.cocoon.generation.Generator/traversable"
         class="org.apache.cocoon.generation.TraversableGenerator"
-        scope="prototype"/>
+        scope="prototype">
+    <pipeline:component label="content"/>
+  </bean>
 
   <bean name="org.apache.cocoon.generation.Generator/xpathtraversable"
         class="org.apache.cocoon.generation.XPathTraversableGenerator"
         scope="prototype">
+    <pipeline:component label="content"/>
     <property name="parser" ref="org.apache.cocoon.core.xml.DOMParser"/>
     <property name="XPathProcessor" ref="org.apache.excalibur.xml.xpath.XPathProcessor"/>
   </bean>
-</beans>
\ No newline at end of file
+</beans>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml?rev=605552&r1=605551&r2=605552&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml
Wed Dec 19 06:37:20 2007
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
-
-<!--+
-    | Serializers consume SAX events and produce a character stream. Every
-    | pipeline needs to be terminated by a serializer.
-    +-->
+<!--
+  - Serializers consume SAX events and produce a character stream. Every
+  - pipeline needs to be terminated by a serializer.
+  -
+  - $Id$
+  -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:pipeline="http://cocoon.apache.org/schema/pipeline"
@@ -30,7 +30,8 @@
        default-init-method="init">
 
   <!-- Abstract parent bean that sets the default encoding from the settings bean -->
-  <bean name="org.apache.cocoon.serialization.AbstractTextSerializer" class="org.apache.cocoon.serialization.AbstractTextSerializer"
abstract="true">
+  <bean name="org.apache.cocoon.serialization.AbstractTextSerializer" class="org.apache.cocoon.serialization.AbstractTextSerializer"
+        scope="prototype" abstract="true">
     <property name="defaultEncoding">
       <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
         <property name="targetBeanName" value="org.apache.cocoon.configuration.Settings"/>
@@ -47,50 +48,50 @@
   <bean name="org.apache.cocoon.serialization.Serializer/html" class="org.apache.cocoon.serialization.HTMLSerializer"
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="text/html"/>
-	<property name="format">
-	  <props>
-	    <prop key="doctype-public">-//W3C//DTD HTML 4.01 Transitional//EN</prop>
-	    <prop key="doctype-system">http://www.w3.org/TR/html4/loose.dtd</prop>
-	  </props>
-	</property>
+    <property name="format">
+      <props>
+        <prop key="doctype-public">-//W3C//DTD HTML 4.01 Transitional//EN</prop>
+        <prop key="doctype-system">http://www.w3.org/TR/html4/loose.dtd</prop>
+      </props>
+    </property>
   </bean>
 
   <bean name="org.apache.cocoon.serialization.Serializer/wml" class="org.apache.cocoon.serialization.XMLSerializer"
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="text/vnd.wap.wml"/>
-	<property name="format">
-	  <props>
-	    <prop key="doctype-public">-//WAPFORUM//DTD WML 1.1//EN</prop>
-	    <prop key="doctype-system">http://www.wapforum.org/DTD/wml_1.1.xml</prop>
-	    <prop key="encoding">ASCII</prop>
-	    <prop key="omit-xml-declaration">yes</prop>
-	  </props>
-	</property>
+    <property name="format">
+      <props>
+        <prop key="doctype-public">-//WAPFORUM//DTD WML 1.1//EN</prop>
+        <prop key="doctype-system">http://www.wapforum.org/DTD/wml_1.1.xml</prop>
+        <prop key="encoding">ASCII</prop>
+        <prop key="omit-xml-declaration">yes</prop>
+      </props>
+    </property>
   </bean>
 
   <!--+
       | Compact HTML for Small Information Appliances,
       | based on http://www.w3.org/TR/1998/NOTE-compactHTML-19980209/
-      + -->
+      +-->
   <bean name="org.apache.cocoon.serialization.Serializer/chtml" class="org.apache.cocoon.serialization.HTMLSerializer"
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="text/html"/>
-	<property name="format">
-	  <props>
-	    <prop key="doctype-public">-//W3C//DTD Compact HTML 1.0 Draft//EN</prop>
-	  </props>
-	</property>
+    <property name="format">
+      <props>
+        <prop key="doctype-public">-//W3C//DTD Compact HTML 1.0 Draft//EN</prop>
+      </props>
+    </property>
   </bean>
 
   <bean name="org.apache.cocoon.serialization.Serializer/svgxml" class="org.apache.cocoon.serialization.XMLSerializer"
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="image/svg+xml"/>
-	<property name="format">
-	  <props>
-	    <prop key="doctype-public">-//W3C//DTD SVG 1.0//EN</prop>
-	    <prop key="doctype-system">http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</prop>
-	  </props>
-	</property>
+    <property name="format">
+      <props>
+        <prop key="doctype-public">-//W3C//DTD SVG 1.0//EN</prop>
+        <prop key="doctype-system">http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</prop>
+      </props>
+    </property>
   </bean>
 
   <!--+
@@ -111,25 +112,25 @@
   <bean name="org.apache.cocoon.serialization.Serializer/xhtml" class="org.apache.cocoon.serialization.XMLSerializer"
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="text/html"/>
-	<property name="format">
-	  <props>
-	    <prop key="doctype-public">-//W3C//DTD XHTML 1.0 Strict//EN</prop>
-	    <prop key="doctype-system">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</prop>
-	    <prop key="encoding">UTF-8</prop>
-	  </props>
-	</property>
+    <property name="format">
+      <props>
+        <prop key="doctype-public">-//W3C//DTD XHTML 1.0 Strict//EN</prop>
+        <prop key="doctype-system">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</prop>
+        <prop key="encoding">UTF-8</prop>
+      </props>
+    </property>
   </bean>
 
   <bean name="org.apache.cocoon.serialization.Serializer/xhtml11" class="org.apache.cocoon.serialization.XMLSerializer"
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="application/xhtml+xml"/>
-	<property name="format">
-	  <props>
-	    <prop key="doctype-public">-//W3C//DTD XHTML 1.1//EN</prop>
-	    <prop key="doctype-system">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</prop>
-	    <prop key="encoding">UTF-8</prop>
-	  </props>
-	</property>
+    <property name="format">
+      <props>
+        <prop key="doctype-public">-//W3C//DTD XHTML 1.1//EN</prop>
+        <prop key="doctype-system">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</prop>
+        <prop key="encoding">UTF-8</prop>
+      </props>
+    </property>
   </bean>
 
   <bean name="org.apache.cocoon.serialization.Serializer/text" class="org.apache.cocoon.serialization.TextSerializer"
@@ -141,4 +142,5 @@
         scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
     <pipeline:component mime-type="model/vrml"/>
   </bean>
-</beans>
\ No newline at end of file
+</beans>
+        
\ No newline at end of file



Mime
View raw message