geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r518506 - in /geronimo/xbean/trunk: pom.xml xbean-spring/src/main/java/org/apache/xbean/spring/context/impl/QNameHelper.java
Date Thu, 15 Mar 2007 08:12:06 GMT
Author: gnodet
Date: Thu Mar 15 01:12:05 2007
New Revision: 518506

URL: http://svn.apache.org/viewvc?view=rev&rev=518506
Log:
XBEAN-84: xbean-spring qname support is broken on spring 2.0.3

Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/impl/QNameHelper.java

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?view=diff&rev=518506&r1=518505&r2=518506
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Thu Mar 15 01:12:05 2007
@@ -201,7 +201,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
-                <version>2.0.2</version>
+                <version>2.0.3</version>
             </dependency>
             
             <dependency>

Modified: geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/impl/QNameHelper.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/impl/QNameHelper.java?view=diff&rev=518506&r1=518505&r2=518506
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/impl/QNameHelper.java
(original)
+++ geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/impl/QNameHelper.java
Thu Mar 15 01:12:05 2007
@@ -20,6 +20,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
+import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.ManagedList;
 import org.w3c.dom.Element;
@@ -97,6 +98,9 @@
                 if (value instanceof String) {
                     propertyValues.removePropertyValue(propertyValue);
                     addPropertyValue(propertyValues, name, createQName(element, (String)
value));
+                } else if (value instanceof TypedStringValue) {
+                    propertyValues.removePropertyValue(propertyValue);
+                    addPropertyValue(propertyValues, name, createQName(element, ((TypedStringValue)
value).getValue()));
                 }
             }
         } else if (descriptor.getPropertyType().isAssignableFrom(QName[].class)) {



Mime
View raw message