Re: [PATCH] Upgrade "container.spring" in Jeremy's sandbox to Spring 2.0-M5 level

[Raymond Feng]

Hi, Ken.

Thank you for pointing it out. Maybe it won't accept files with extension 
"patch"?

Anyway, here's the patch again.

Raymond

----- Original Message ----- 
From: "Kenneth Tam" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Thursday, June 08, 2006 5:47 PM
Subject: Re: [PATCH] Upgrade "container.spring" in Jeremy's sandbox to 
Spring 2.0-M5 level


I think the patch got lost :)

On 6/8/06, Raymond Feng <[EMAIL PROTECTED]> wrote:


Hi,

Here's a patch to upgrade the container.spring to Spring 2.0-M5 level.
Please review and apply.

Thanks,
Raymond
---------------------------------------------------------------------
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Index: 
src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java
===================================================================
--- 
src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java
       (revision 412487)
+++ 
src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java
       (working copy)
@@ -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;

Index: 
src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
===================================================================
--- 
src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
       (revision 412487)
+++ 
src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
       (working copy)
@@ -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 
createBeanDefinitionDocumentReader() {
        return new SCARootDefinitionParser(componentType);
    }

Index: pom.xml
===================================================================
--- pom.xml     (revision 412487)
+++ pom.xml     (working copy)
@@ -39,7 +39,7 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring</artifactId>
-            <version>2.0-m4</version>
+            <version>2.0-m5</version>
            <scope>compile</scope>
        </dependency>


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]