Author: dkulp
Date: Wed Jun 4 07:54:29 2008
New Revision: 663138
URL: http://svn.apache.org/viewvc?rev=663138&view=rev
Log:
Merged revisions 662837 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r662837 | dkulp | 2008-06-03 12:56:26 -0400 (Tue, 03 Jun 2008) | 2 lines
Delay processing the JAXB configuration beans until they are actually
requested.
........
Added:
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
- copied unchanged from r662837,
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=663138&r1=663137&r2=663138&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Wed Jun 4 07:54:29 2008
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.configuration.spring;
+import java.io.StringWriter;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.logging.Logger;
@@ -27,6 +28,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -37,6 +39,7 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.CacheMap;
import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.staxutils.StaxUtils;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -243,13 +246,13 @@
QName name,
String propertyName,
Class<?> c) {
- Node data = null;
+ Element data = null;
NodeList nl = parent.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
Node n = nl.item(i);
if (n.getNodeType() == Node.ELEMENT_NODE &&
name.getLocalPart().equals(n.getLocalName())
&& name.getNamespaceURI().equals(n.getNamespaceURI())) {
- data = n;
+ data = (Element)n;
break;
}
}
@@ -259,7 +262,6 @@
}
JAXBContext context = null;
- Object obj = null;
try {
String pkg = getJaxbPackage();
if (null != c && c.getPackage() != null) {
@@ -270,25 +272,38 @@
context = JAXBContext.newInstance(pkg,
getClass().getClassLoader());
packageContextCache.put(pkg, context);
}
- Unmarshaller u = context.createUnmarshaller();
- if (c != null) {
- obj = u.unmarshal(data, c);
- } else {
- obj = u.unmarshal(data);
- }
-
- if (obj instanceof JAXBElement<?>) {
- JAXBElement<?> el = (JAXBElement<?>)obj;
- obj = el.getValue();
-
+ try {
+ StringWriter writer = new StringWriter();
+ XMLStreamWriter xmlWriter =
StaxUtils.createXMLStreamWriter(writer);
+ StaxUtils.copy(data, xmlWriter);
+ xmlWriter.flush();
+
+ BeanDefinitionBuilder jaxbbean
+ =
BeanDefinitionBuilder.rootBeanDefinition(JAXBBeanFactory.class);
+
jaxbbean.getRawBeanDefinition().setFactoryMethodName("createJAXBBean");
+ jaxbbean.addConstructorArg(context);
+ jaxbbean.addConstructorArg(writer.toString());
+ jaxbbean.addConstructorArg(c);
+ bean.addPropertyValue(propertyName,
jaxbbean.getBeanDefinition());
+ } catch (Exception ex) {
+ Unmarshaller u = context.createUnmarshaller();
+ Object obj;
+ if (c != null) {
+ obj = u.unmarshal(data, c);
+ } else {
+ obj = u.unmarshal(data);
+ }
+ if (obj instanceof JAXBElement<?>) {
+ JAXBElement<?> el = (JAXBElement<?>)obj;
+ obj = el.getValue();
+ }
+ if (obj != null) {
+ bean.addPropertyValue(propertyName, obj);
+ }
}
} catch (JAXBException e) {
throw new RuntimeException("Could not parse configuration.", e);
}
-
- if (obj != null) {
- bean.addPropertyValue(propertyName, obj);
- }
}
protected String getJaxbPackage() {
Modified:
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java?rev=663138&r1=663137&r2=663138&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
Wed Jun 4 07:54:29 2008
@@ -32,6 +32,8 @@
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
[EMAIL PROTECTED]("Not valid as the parser shouldn't be generating the beans
themselves, thats the"
+ + "job of the factory later on. Need to update this test to
do that.")
public class BeanDefinitionParsersTest extends Assert {
@Test
public void testDest()throws Exception {
