You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2006/06/28 14:02:41 UTC

svn commit: r417738 - in /incubator/tuscany/sandbox/jboynes/sca/containers/container.spring: ./ src/main/java/org/apache/tuscany/container/spring/config/

Author: kentam
Date: Wed Jun 28 05:02:41 2006
New Revision: 417738

URL: http://svn.apache.org/viewvc?rev=417738&view=rev
Log:
Update Spring dep to 2.0-rc1 [patch by Raymond Feng]


Modified:
    incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml
    incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml?rev=417738&r1=417737&r2=417738&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml Wed Jun 28 05:02:41 2006
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
-            <version>2.0-m4</version>
+            <version>2.0-rc1</version>
             <scope>compile</scope>
         </dependency>
 

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java?rev=417738&r1=417737&r2=417738&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java Wed Jun 28 05:02:41 2006
@@ -2,7 +2,7 @@
 
 import org.apache.tuscany.spi.model.CompositeComponentType;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionDocumentReader;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 
 /**
@@ -18,7 +18,7 @@
     }
 
 
-    protected XmlBeanDefinitionParser createXmlBeanDefinitionParser() {
+    protected BeanDefinitionDocumentReader createXmlBeanDefinitionParser() {
         return new SCARootDefinitionParser(componentType);
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java?rev=417738&r1=417737&r2=417738&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java Wed Jun 28 05:02:41 2006
@@ -1,8 +1,7 @@
 package org.apache.tuscany.container.spring.config;
 
 import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.container.spring.config.SCANamespaceHandlerResolver;
-import org.springframework.beans.factory.xml.DefaultXmlBeanDefinitionParser;
+import org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader;
 import org.springframework.beans.factory.xml.NamespaceHandlerResolver;
 
 /**
@@ -11,7 +10,7 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-public class SCARootDefinitionParser extends DefaultXmlBeanDefinitionParser {
+public class SCARootDefinitionParser extends DefaultBeanDefinitionDocumentReader {
 
     private CompositeComponentType componentType;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org