You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2007/10/04 12:36:00 UTC
svn commit: r581838 - /cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml

Author: danielf
Date: Thu Oct  4 03:35:58 2007
New Revision: 581838

URL: http://svn.apache.org/viewvc?rev=581838&view=rev
Log:
Using the new Spring-OSGi map instead of the bean-map as the bean map doesn't work when the services are defined in another bundle.

Modified:
    cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml

Modified: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml?rev=581838&r1=581837&r2=581838&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml Thu Oct  4 03:35:58 2007
@@ -25,14 +25,26 @@
 <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/DefaultExpressionFactory.xml"/>
   <import resource="../cocoon/spring/JavaScriptCompiler.xml"/>
   <import resource="../cocoon/spring/JexlCompiler.xml"/>
   <import resource="../cocoon/spring/JXPathCompiler.xml"/>
   <import resource="../cocoon/spring/RhinoScope.xml"/>
+
+  <osgi:service ref="org.apache.cocoon.el.ExpressionCompiler/js" interface="org.apache.cocoon.el.ExpressionCompiler"/>
+  <osgi:service ref="org.apache.cocoon.el.ExpressionCompiler/jexl" interface="org.apache.cocoon.el.ExpressionCompiler"/>
+  <osgi:service ref="org.apache.cocoon.el.ExpressionCompiler/jxpath" interface="org.apache.cocoon.el.ExpressionCompiler"/>
+  <osgi:service ref="org.apache.cocoon.el.ExpressionCompiler/default" interface="org.apache.cocoon.el.ExpressionCompiler"/>
+
+  <bean id="org.apache.cocoon.el.ExpressionFactory" class="org.apache.cocoon.el.impl.DefaultExpressionFactory">
+    <property name="expressionCompilers">
+	  <cosgi:map interface="org.apache.cocoon.el.ExpressionCompiler"/>
+    </property>
+  </bean>
 
   <osgi:service ref="org.apache.cocoon.el.ExpressionFactory" interface="org.apache.cocoon.el.ExpressionFactory"/>
 </beans>