cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r582213 - in /cocoon/whiteboard/osgi/core/cocoon-core-osgi: ./ src/main/resources/META-INF/spring/
Date Fri, 05 Oct 2007 11:21:06 GMT
Author: danielf
Date: Fri Oct  5 04:21:04 2007
New Revision: 582213

URL: http://svn.apache.org/viewvc?rev=582213&view=rev
Log:
Exporting most of the beans as OSGi services. The factory-export mode and the Avalon bridge
doesn't work together. Have to fix this later.

Modified:
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml Fri Oct  5 04:21:04 2007
@@ -197,6 +197,7 @@
               org.apache.cocoon.matching;version=${pkgVersion},
               org.apache.cocoon.matching.modular;version=${pkgVersion},
               org.apache.cocoon.objectmodel.helper;version=${pkgVersion},
+              org.apache.cocoon.objectmodel.impl;version=${pkgVersion},
               org.apache.cocoon.processing;version=${pkgVersion},
               org.apache.cocoon.processing.impl;version=${pkgVersion},
               org.apache.cocoon.reading;version=${pkgVersion},
@@ -218,7 +219,6 @@
             </Export-Package>
             <Import-Package>
               org.apache.cocoon.callstack,
-              org.apache.cocoon.objectmodel.impl,
               *
             </Import-Package>
             <Include-Resource>

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
Fri Oct  5 04:21:04 2007
@@ -18,7 +18,7 @@
 <!-- SVN $Id$ -->
 <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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
   
   <bean id="org.apache.cocoon.template.expression.AbstractStringTemplateParser" 
         class="org.apache.cocoon.template.expression.AbstractStringTemplateParser" abstract="true">

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
Fri Oct  5 04:21:04 2007
@@ -19,8 +19,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
   
   <!-- Install the pipeline component custom scope -->
   <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
Fri Oct  5 04:21:04 2007
@@ -20,9 +20,13 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:configurator="http://cocoon.apache.org/schema/configurator"
        xmlns:avalon="http://cocoon.apache.org/schema/avalon"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xmlns:cosgi="http://cocoon.apache.org/schema/osgi"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd
-                           http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd">
+                           http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+                           http://cocoon.apache.org/schema/osgi http://cocoon.apache.org/schema/osgi/spring-osgi.xsd">
 
   <!-- Activate Cocoon Spring Configurator -->
   <configurator:settings readFromClasspath="false" readFromGlobalLocation="false" extractBlockResources="false">
@@ -32,4 +36,157 @@
   <!-- Activate Avalon Bridge -->
   <avalon:bridge location="/META-INF/spring/core.xconf"/>
 
+  <!-- cocoon-core-xpath-processor.xconf -->
+  <osgi:service ref="org.apache.excalibur.xml.xpath.XPathProcessor" interface="org.apache.excalibur.xml.xpath.XPathProcessor"/>
+
+  <!-- cocoon-core-xslt-processor.xconf -->
+  <osgi:service ref="org.apache.excalibur.xml.xslt.XSLTProcessor" interface="org.apache.excalibur.xml.xslt.XSLTProcessor"/>
+
+  <!-- cocoon-core-xslt-xalan.xconf -->
+  <osgi:service ref="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan" interface="org.apache.excalibur.xml.xslt.XSLTProcessor"/>
+
+  <!-- cocoon-core-xslt-xsltc.xconf -->
+  <osgi:service ref="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc" interface="org.apache.excalibur.xml.xslt.XSLTProcessor"/>
+
+  <!-- cocoon-core-continuations-manager.xconf -->
+  <osgi:service ref="org.apache.cocoon.components.flow.ContinuationsManager" interface="org.apache.cocoon.components.flow.ContinuationsManager"/>
+
+  <!--  cocoon-core-modules-input-flowscript.xconf -->
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/flow-attribute"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/flow-attr"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/flow-continuation"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+
+  <!-- cocoon-core-modules-input.xconf -->
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/url-encode"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/url-decode"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/global" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/request" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/baselink"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/session" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/environment-attr"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/request-param"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/raw-request-param"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/request-attr"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/request-scoped-attr"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/request-header"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/session-attr"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/cookie" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/system-property"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/constant"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/concat" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/random" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/digest" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/date" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/nullinput"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/realpath"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/contextpath"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/naming" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/cocoon-properties"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/xmlmeta" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/mapmeta" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/datemeta"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/jxpath" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/simplemap"
interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/locate" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.input.InputModule/chain" interface="org.apache.cocoon.components.modules.input.InputModule"/>
+  
+  <!-- cocoon-core-modules-output.xconf -->
+  <osgi:service ref="org.apache.cocoon.components.modules.output.OutputModule/request-attr"
interface="org.apache.cocoon.components.modules.output.OutputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.output.OutputModule/request-attr-map"
interface="org.apache.cocoon.components.modules.output.OutputModule"/>
+  <osgi:service ref="org.apache.cocoon.components.modules.output.OutputModule/session-attr"
interface="org.apache.cocoon.components.modules.output.OutputModule"/>
+
+  <!-- cocoon-core-fam.xconf -->
+  <osgi:service ref="org.apache.cocoon.classloader.reloading.Monitor" interface="org.apache.cocoon.classloader.reloading.Monitor"/>
+
+  <!-- cocoon-core-i18n-bundles.xconf -->
+  <osgi:service ref="org.apache.cocoon.i18n.BundleFactory" interface="org.apache.cocoon.i18n.BundleFactory"/>
+
+  <!-- cocoon-core-include-cache-manager.xconf -->
+  <osgi:service ref="org.apache.cocoon.transformation.helpers.IncludeCacheManager" interface="org.apache.cocoon.transformation.helpers.IncludeCacheManager"/>
+
+  <!-- cocoon-core-sitemapcomponents.xconf -->
+  <!-- FIXME: The factory-export doesn't work with the Spring-Avalon bridge 
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/imagedirectory" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/request" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/stream" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/status" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/notifying" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/exception" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/content" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/xslt" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/xalan" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/xsltc" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/include" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/xinclude" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/cinclude" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/encodeURL" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/write-source" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/writeDOMsession" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/readDOMsession" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/log" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/paginate" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/jpath" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.transformation.Transformer/filter" interface="org.apache.cocoon.transformation.Transformer"
factory-export="true"/>
+
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/links" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/zip" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/sxw" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/sxc" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/sxd" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/sxi" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  -->
+  <!-- FIXME: This will not work in general as the transformers are not singletons-->
+  <osgi:service ref="org.apache.cocoon.transformation.Transformer/xslt" interface="org.apache.cocoon.transformation.Transformer"/>
+  <osgi:service ref="org.apache.cocoon.transformation.Transformer/include" interface="org.apache.cocoon.transformation.Transformer"/>
+  
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/wildcard" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/regexp" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/request-parameter" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/cookie" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/header" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/parameter" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/sessionstate" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/referer-match" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/mount-table" interface="org.apache.cocoon.matching.Matcher"/>
+  <osgi:service ref="org.apache.cocoon.matching.Matcher/locale" interface="org.apache.cocoon.matching.Matcher"/>
+
+  <osgi:service ref="org.apache.cocoon.selection.Selector/browser" interface="org.apache.cocoon.selection.Selector"/>
+  <!--cosgi:service ref="org.apache.cocoon.selection.Selector/exception" interface="org.apache.cocoon.selection.Selector"
factory-export="true"/-->
+  <osgi:service ref="org.apache.cocoon.selection.Selector/request-method" interface="org.apache.cocoon.selection.Selector"/>
+  <osgi:service ref="org.apache.cocoon.selection.Selector/resource-exists" interface="org.apache.cocoon.selection.Selector"/>
+  <!--cosgi:service ref="org.apache.cocoon.selection.Selector/request-parameter" interface="org.apache.cocoon.selection.Selector"
factory-export="true"/-->
+  <osgi:service ref="org.apache.cocoon.selection.Selector/request-attribute" interface="org.apache.cocoon.selection.Selector"/>
+  <osgi:service ref="org.apache.cocoon.selection.Selector/session-attribute" interface="org.apache.cocoon.selection.Selector"/>
+  <osgi:service ref="org.apache.cocoon.selection.Selector/parameter" interface="org.apache.cocoon.selection.Selector"/>
+  <osgi:service ref="org.apache.cocoon.selection.Selector/header" interface="org.apache.cocoon.selection.Selector"/>
+  <osgi:service ref="org.apache.cocoon.selection.Selector/host" interface="org.apache.cocoon.selection.Selector"/>
+  <!--cosgi:service ref="org.apache.cocoon.selection.Selector/simple" interface="org.apache.cocoon.selection.Selector"
factory-export="true"/-->
+
+  <osgi:service ref="org.apache.cocoon.acting.Action/request" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/req-params" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/form-validator" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/session-state" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/session-isvalid" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/session-validator" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/session-invalidator" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/resource-exists" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/set-header" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/clear-cache" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/clear-persistent-store" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/locale" interface="org.apache.cocoon.acting.Action"/>
+  <osgi:service ref="org.apache.cocoon.acting.Action/log" interface="org.apache.cocoon.acting.Action"/>
+
+  <!-- FIXME: The factory-export doesn't work with the Spring-Avalon bridge 
+  <cosgi:service ref="org.apache.cocoon.components.pipeline.ProcessingPipeline/caching"
interface="org.apache.cocoon.components.pipeline.ProcessingPipeline" factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.components.pipeline.ProcessingPipeline/caching-point"
interface="org.apache.cocoon.components.pipeline.ProcessingPipeline" factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.components.pipeline.ProcessingPipeline/noncaching"
interface="org.apache.cocoon.components.pipeline.ProcessingPipeline" factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.components.pipeline.ProcessingPipeline/expires"
interface="org.apache.cocoon.components.pipeline.ProcessingPipeline" factory-export="true"/>
+  -->
+  <!-- FIXME: This will not work in general as the pipes are not singletons-->
+  <osgi:service ref="org.apache.cocoon.components.pipeline.ProcessingPipeline/noncaching"
interface="org.apache.cocoon.components.pipeline.ProcessingPipeline"/>
+  
+  <!--
+  <osgi:service ref="" interface=""/>
+  -->
 </beans>

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
Fri Oct  5 04:21:04 2007
@@ -42,7 +42,7 @@
   <!--+
       | Include all Avalon configuration files from cocoon-sitemap-components
       +-->
-  <!--include src="/META-INF/cocoon/avalon/cocoon-core-modules-input.xconf"/-->
+  <include src="/META-INF/cocoon/avalon/cocoon-core-modules-input.xconf"/>
   <include src="/META-INF/cocoon/avalon/cocoon-core-modules-input-flowscript.xconf"/>
   <include src="/META-INF/cocoon/avalon/cocoon-core-modules-output.xconf"/>
 

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
Fri Oct  5 04:21:04 2007
@@ -32,4 +32,9 @@
   <import resource="../cocoon/spring/cocoon-core-caching-source.xml"/>
 
   <osgi:reference id="org.apache.cocoon.thread.RunnableManager" interface="org.apache.cocoon.thread.RunnableManager"/>
+
+  <osgi:service ref="org.apache.cocoon.processing.ProcessInfoProvider" interface="org.apache.cocoon.processing.ProcessInfoProvider"/>
+  <osgi:service ref="org.apache.excalibur.source.SourceFactory/cached" interface="org.apache.excalibur.source.SourceFactory"/>
+  <osgi:service ref="org.apache.cocoon.components.source.helpers.DelaySourceRefresher"
interface="org.apache.cocoon.components.source.helpers.DelaySourceRefresher"/>
+  <osgi:service ref="org.apache.excalibur.source.SourceFactory/async-cached" interface="org.apache.excalibur.source.SourceFactory"/>
 </beans>

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml
Fri Oct  5 04:21:04 2007
@@ -25,22 +25,28 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:configurator="http://cocoon.apache.org/schema/configurator"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xmlns:cosgi="http://cocoon.apache.org/schema/osgi"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-                           http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd
-                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-  <configurator:bean-map id="modelProviders" type="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
+                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+                           http://cocoon.apache.org/schema/osgi http://cocoon.apache.org/schema/osgi/spring-osgi.xsd">
 
   <!-- Default implementation of ObjectModel interface in pipelineComponent scope. -->
-  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" scope="pipelineComponent"

+  <!-- FIXME: Problems with setting up the scope
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" scope="call" 
         class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl">
     <aop:scoped-proxy proxy-target-class="false"/>
-    <!-- FIXME
-    <property name="initialEntries" ref="modelProviders"/>
-    -->
+    <property name="initialEntries">
+	  <cosgi:map interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider" mandatory="false"/>
+	</property>
+  </bean>
+  -->
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel"
+        class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl">
+    <property name="initialEntries">
+	  <cosgi:map interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider" mandatory="false"/>
+	</property>
   </bean>
 
   <osgi:service ref="org.apache.cocoon.el.objectmodel.ObjectModel" interface="org.apache.cocoon.el.objectmodel.ObjectModel"/>

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
Fri Oct  5 04:21:04 2007
@@ -25,8 +25,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xmlns:cosgi="http://cocoon.apache.org/schema/osgi"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+                           http://cocoon.apache.org/schema/osgi http://cocoon.apache.org/schema/osgi/spring-osgi.xsd">
 
   <import resource="../cocoon/spring/cocoon-core-generators.xml"/>
   <import resource="../cocoon/spring/cocoon-core-readers.xml"/>
@@ -34,4 +36,25 @@
   
   <osgi:reference id="org.apache.cocoon.core.xml.DOMParser" interface="org.apache.cocoon.core.xml.DOMParser"/>
   <osgi:reference id="org.apache.cocoon.core.xml.SAXParser" interface="org.apache.cocoon.core.xml.SAXParser"/>
+  
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/filebean" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/file" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/directory" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/xpathdirectory" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/traversable" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.generation.Generator/xpathtraversable" interface="org.apache.cocoon.generation.Generator"
factory-export="true"/>
+
+  <cosgi:service ref="org.apache.cocoon.reading.Reader/resource" interface="org.apache.cocoon.reading.Reader"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.reading.Reader/image" interface="org.apache.cocoon.reading.Reader"
factory-export="true"/>
+
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/xml" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/html" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/wml" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/chtml" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/svgxml" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/xhtml" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/xhtml11" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/text" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  <cosgi:service ref="org.apache.cocoon.serialization.Serializer/vrml" interface="org.apache.cocoon.serialization.Serializer"
factory-export="true"/>
+  
 </beans>

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
Fri Oct  5 04:21:04 2007
@@ -34,4 +34,6 @@
   <osgi:reference id="org.apache.excalibur.store.Store_TransientStore" interface="org.apache.excalibur.store.Store"/>
   <!-- The id attribute don't allow for Excalibur style bean names -->
   <alias name="org.apache.excalibur.store.Store_TransientStore" alias="org.apache.excalibur.store.Store/TransientStore"/>
+
+  <osgi:service ref="org.apache.cocoon.caching.Cache" interface="org.apache.cocoon.caching.Cache"/>
 </beans>

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml?rev=582213&r1=582212&r2=582213&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
Fri Oct  5 04:21:04 2007
@@ -25,16 +25,24 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xmlns:cosgi="http://cocoon.apache.org/schema/osgi"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+                           http://cocoon.apache.org/schema/osgi http://cocoon.apache.org/schema/osgi/spring-osgi.xsd">
 
   <import resource="../cocoon/spring/CocoonEntryObjectModelProvider.xml"/>
   <import resource="../cocoon/spring/cocoon-xml-avalon.xml"/>
   <import resource="../cocoon/spring/LegacySitemapStringTemplateParser.xml"/>
-  <import resource="../cocoon/spring/NOPVariableResolver.xml"/>
-  <import resource="../cocoon/spring/PreparedVariableResolver.xml"/>
   <import resource="../cocoon/spring/StringTemplateParserVariableResolver.xml"/>
 
   <osgi:reference id="org.xml.sax.EntityResolver" interface="org.xml.sax.EntityResolver"/>
   <osgi:reference id="org.apache.cocoon.el.ExpressionFactory" interface="org.apache.cocoon.el.ExpressionFactory"/>
+  
+  <osgi:service ref="org.apache.cocoon.el.objectmodel.ObjectModelProvider/cocoon" interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
+  <osgi:service ref="org.apache.cocoon.el.parsing.StringTemplateParser/legacySitemap"
interface="org.apache.cocoon.el.parsing.StringTemplateParser"/>
+  <cosgi:service ref="org.apache.cocoon.components.treeprocessor.variables.StringTemplateParserVariableResolver"
interface="org.apache.cocoon.components.treeprocessor.variables.StringTemplateParserVariableResolver"
factory-export="true"/>
+  <osgi:service ref="org.apache.excalibur.xml.dom.DOMParser" interface="org.apache.excalibur.xml.dom.DOMParser"/>
+  <osgi:service ref="org.apache.excalibur.xml.sax.SAXParser" interface="org.apache.excalibur.xml.sax.SAXParser"/>
+  <osgi:service ref="org.apache.excalibur.xml.EntityResolver" interface="org.apache.excalibur.xml.EntityResolver"/>
+  
 </beans>



Mime
View raw message