Author: andreasmyth
Date: Thu Oct 12 14:34:58 2006
New Revision: 463442
URL: http://svn.apache.org/viewvc?view=rev&rev=463442
Log:
Removed old cfg resources.
Upgraded to Spring 2.0 FINAL.
Removed:
incubator/cxf/trunk/common/common/src/test/resources/META-INF/config-metadata-mappings.xml
incubator/cxf/trunk/common/common/src/test/resources/config-metadata/
incubator/cxf/trunk/common/metacode/src/main/resources/META-INF/config-metadata-mappings.xml
incubator/cxf/trunk/common/metacode/src/main/resources/config-metadata/
incubator/cxf/trunk/rt/management/src/main/resources/META-INF/config-metadata-mappings.xml
incubator/cxf/trunk/rt/management/src/main/resources/config-metadata/
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JaxbBeanDefinitionParserDelegate.java
incubator/cxf/trunk/pom.xml
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JaxbBeanDefinitionParserDelegate.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JaxbBeanDefinitionParserDelegate.java?view=diff&rev=463442&r1=463441&r2=463442
==============================================================================
---
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JaxbBeanDefinitionParserDelegate.java
(original)
+++
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JaxbBeanDefinitionParserDelegate.java
Thu Oct 12 14:34:58 2006
@@ -22,6 +22,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
import org.springframework.beans.factory.xml.XmlReaderContext;
@@ -31,7 +32,7 @@
super(readerContext);
}
- public Object parsePropertySubElement(Element elem, String
defaultTypeClassName) {
+ public Object parsePropertySubElement(Element elem, BeanDefinition bd,
String defaultTypeClassName) {
if (elem.getTagName().equals(VALUE_ELEMENT)) {
for (Node nd = elem.getFirstChild(); nd != null; nd =
nd.getNextSibling()) {
@@ -40,7 +41,7 @@
}
}
}
- return super.parsePropertySubElement(elem, defaultTypeClassName);
+ return super.parsePropertySubElement(elem, bd, defaultTypeClassName);
}
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=463442&r1=463441&r2=463442
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Thu Oct 12 14:34:58 2006
@@ -152,7 +152,7 @@
<jaxws.version>2.0</jaxws.version>
<jetty.version>5.1.9</jetty.version>
<saaj.version>1.3</saaj.version>
- <spring.version>2.0-rc2</spring.version>
+ <spring.version>2.0</spring.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<derby.version>10.1.1.0</derby.version>
