cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r417551 - in /cocoon/trunk/core: cocoon-core/META-INF/MANIFEST.MF cocoon-core/META-INF/components.xml cocoon-webapp/META-INF/components.xml
Date Tue, 27 Jun 2006 18:52:42 GMT
Author: danielf
Date: Tue Jun 27 11:52:42 2006
New Revision: 417551

URL: http://svn.apache.org/viewvc?rev=417551&view=rev
Log:
Updating MANIFEST.MF and service declarations for changing to Spring 2.0

Modified:
    cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF
    cocoon/trunk/core/cocoon-core/META-INF/components.xml
    cocoon/trunk/core/cocoon-webapp/META-INF/components.xml

Modified: cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF?rev=417551&r1=417550&r2=417551&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF (original)
+++ cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF Tue Jun 27 11:52:42 2006
@@ -17,6 +17,7 @@
  lib/commons-cli-1.0.jar,
  lib/commons-collections-3.1.jar,
  lib/commons-io-1.2.jar,
+ lib/commons-jci-r306555.jar,
  lib/commons-jexl-1.0.jar,
  lib/commons-jxpath-1.2.jar,
  lib/commons-lang-2.1.jar,
@@ -42,11 +43,11 @@
  lib/log4j-1.2.13.jar,
  lib/mx4j-3.0.1.jar,
  lib/oro-2.0.8.jar,
- lib/spring-aop-1.2.6.jar,
- lib/spring-beans-1.2.6.jar,
- lib/spring-context-1.2.6.jar,
- lib/spring-core-1.2.6.jar,
- lib/spring-web-1.2.6.jar,
+ lib/spring-aop-2.0-rc1.jar,
+ lib/spring-beans-2.0-rc1.jar,
+ lib/spring-context-2.0-rc1.jar,
+ lib/spring-core-2.0-rc1.jar,
+ lib/spring-web-2.0-rc1.jar,
  lib/standard-1.0.6.jar,
  lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.8.0.jar,

Modified: cocoon/trunk/core/cocoon-core/META-INF/components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/META-INF/components.xml?rev=417551&r1=417550&r2=417551&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/META-INF/components.xml (original)
+++ cocoon/trunk/core/cocoon-core/META-INF/components.xml Tue Jun 27 11:52:42 2006
@@ -46,10 +46,9 @@
     <scr:property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
     <scr:property name="sitemapPath" value="/COB-INF/sitemap.xmap"/>            
 
-    <scr:reference name="interface org.springframework.web.context.WebApplicationContext.ROOT"
+    <scr:reference name="org.springframework.web.context.WebApplicationContext.ROOT"
       interface="org.apache.cocoon.core.osgi.CocoonSpringBeanRegistry"
-      target="(component.name=org.apache.cocoon.core.osgi.SpringEcmFactory)"
-      bind="setBeanFactory"/>         
+      target="(component.name=org.apache.cocoon.core.osgi.SpringEcmFactory)"/>       
 
   </scr:component>
 
   <!--scr:component name="org.apache.cocoon.core.osgi.SpringBridge">

Modified: cocoon/trunk/core/cocoon-webapp/META-INF/components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/META-INF/components.xml?rev=417551&r1=417550&r2=417551&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/META-INF/components.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/META-INF/components.xml Tue Jun 27 11:52:42 2006
@@ -26,7 +26,7 @@
   </scr:component>
   
   <!-- A BeanFactory that manages the beans of this bundle and provide them as services
-->
-  <scr:component name="org.apache.cocoon.webapp.SpringEcmFactory">
+  <scr:component name="org.apache.cocoon.webapp.SpringEcmFactory" immediate="true">
     <scr:implementation class="org.apache.cocoon.core.osgi.OSGiSpringECMFactory"/>
     <scr:property name="configFile" value="/META-INF/xconf/webapp.xconf"/>
     <scr:service>
@@ -49,10 +49,9 @@
     <scr:property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
     <scr:property name="sitemapPath" value="/src/main/webapp/sitemap.xmap"/>      
     
 
-    <scr:reference name="interface org.springframework.web.context.WebApplicationContext.ROOT"
+    <scr:reference name="org.springframework.web.context.WebApplicationContext.ROOT"
       interface="org.apache.cocoon.core.osgi.CocoonSpringBeanRegistry"
-      target="(component.name=org.apache.cocoon.webapp.SpringEcmFactory)"
-      bind="setBeanFactory"/>         
+      target="(component.name=org.apache.cocoon.webapp.SpringEcmFactory)"/>         
   </scr:component>
 
 </components>



Mime
View raw message