cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r586261 - /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/
Date Fri, 19 Oct 2007 04:41:49 GMT
Author: vgritsenko
Date: Thu Oct 18 21:41:43 2007
New Revision: 586261

URL: http://svn.apache.org/viewvc?rev=586261&view=rev
Log:
fixing those pesky spring xml files

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-linkRewritingReader.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-consumer-source-factory.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-serializer.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-servlet-source-factory.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-transformer.xml

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-linkRewritingReader.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-linkRewritingReader.xml?rev=586261&r1=586260&r2=586261&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-linkRewritingReader.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-linkRewritingReader.xml
Thu Oct 18 21:41:43 2007
@@ -20,11 +20,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <bean name="org.apache.cocoon.reading.Reader/servletLinkRewriter"
-          class="org.apache.cocoon.servletservice.components.LinkRewriterReader" init-method="init">
+          class="org.apache.cocoon.servletservice.components.LinkRewriterReader">
         <property name="inputModule" ref="org.apache.cocoon.components.modules.input.InputModule/servlet"/>
         <!-- Set character encoding of processed files. Defaults to "UTF-8" -->
         <!-- <property name="encoding" value="UTF-8"/> -->
-        <!-- Set HTTP expires. Defaults t -1 -->
+        <!-- Set HTTP expires. Defaults to -1 -->
         <!-- <property name="expires" value="-1" -->
     </bean>
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-consumer-source-factory.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-consumer-source-factory.xml?rev=586261&r1=586260&r2=586261&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-consumer-source-factory.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-consumer-source-factory.xml
Thu Oct 18 21:41:43 2007
@@ -15,17 +15,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <!-- SVN $Id: cocoon-servlet-service-servlet-source-factory.xml 503416 2007-02-04 14:43:01Z
danielf $ -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <!--+
-      | Source Factories
-      |
-      | Each source factory adds a special uri schemes to the system.
-      +-->
-  <bean name="org.apache.excalibur.source.SourceFactory/service-consumer" class="org.apache.cocoon.servletservice.postable.components.ServletServiceConsumerSourceFactory">
+  <!--
+    - Source Factories
+    -
+    - Each source factory adds a special uri schemes to the system.
+    -->
+  <bean name="org.apache.excalibur.source.SourceFactory/service-consumer"
+        class="org.apache.cocoon.servletservice.postable.components.ServletServiceConsumerSourceFactory">
     <property name="processInfoProvider" ref="org.apache.cocoon.processing.ProcessInfoProvider"/>
   </bean>
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml?rev=586261&r1=586260&r2=586261&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-generator.xml
Thu Oct 18 21:41:43 2007
@@ -20,7 +20,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean name="org.apache.cocoon.generation.Generator/servletService"
-      class="org.apache.cocoon.servletservice.postable.components.ServletServiceGenerator"
init-method="init" scope="prototype">
+        class="org.apache.cocoon.servletservice.postable.components.ServletServiceGenerator"
scope="prototype">
       <property name="saxParser" ref="org.apache.cocoon.core.xml.SAXParser"/>
   </bean>
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-serializer.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-serializer.xml?rev=586261&r1=586260&r2=586261&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-serializer.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-serializer.xml
Thu Oct 18 21:41:43 2007
@@ -22,13 +22,13 @@
                            http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd">
 
   <bean name="org.apache.cocoon.serialization.Serializer/servletService"
-    class="org.apache.cocoon.servletservice.postable.components.ServletServiceSerializer"
init-method="init" scope="prototype">
+        class="org.apache.cocoon.servletservice.postable.components.ServletServiceSerializer"
scope="prototype">
     <!--
-    * This method returns dummy mime type to satisfy pipeline's requirement to have mime
type determined at setup phase.
-    * In this serializer case it's not possible to satisfy this requirement so dummy value
is returned and real is set in the 
-    * method org.apache.cocoon.servletservice.postable.components.ServletServiceSerializer#endDocument()
-    * See http://article.gmane.org/gmane.text.xml.cocoon.devel/73261 for post explaining
current (hacky) solution
-    * -->
+      - This method returns dummy mime type to satisfy pipeline's requirement to have mime
type determined at setup phase.
+      - In this serializer case it's not possible to satisfy this requirement so dummy value
is returned and real is set in the
+      - method org.apache.cocoon.servletservice.postable.components.ServletServiceSerializer#endDocument()
+      - See http://article.gmane.org/gmane.text.xml.cocoon.devel/73261 for post explaining
current (hacky) solution
+      -->
     <pipeline:component mime-type="application/dummy-mime-type"/>
   </bean>
 </beans>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-servlet-source-factory.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-servlet-source-factory.xml?rev=586261&r1=586260&r2=586261&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-servlet-source-factory.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-servlet-source-factory.xml
Thu Oct 18 21:41:43 2007
@@ -20,11 +20,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <!--+
-      | Source Factories
-      |
-      | Each source factory adds a special uri schemes to the system.
-      +-->
+  <!--
+    - 'servlet:' Source Factory
+    -->
   <bean name="org.apache.excalibur.source.SourceFactory/servlet" class="org.apache.cocoon.servletservice.components.ServletSourceFactory">
     <property name="store" ref="org.apache.excalibur.store.Store"/>
   </bean>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-transformer.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-transformer.xml?rev=586261&r1=586260&r2=586261&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-transformer.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-transformer.xml
Thu Oct 18 21:41:43 2007
@@ -20,7 +20,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean name="org.apache.cocoon.transformation.Transformer/servletService"
-      class="org.apache.cocoon.servletservice.postable.components.ServletServiceTransformer"
init-method="init" scope="prototype">
+        class="org.apache.cocoon.servletservice.postable.components.ServletServiceTransformer"
scope="prototype">
     <property name="saxParser" ref="org.apache.cocoon.core.xml.SAXParser"/>
   </bean>
 



Mime
View raw message