Author: dkulp
Date: Tue Jun 3 09:56:26 2008
New Revision: 662837
URL: http://svn.apache.org/viewvc?rev=662837&view=rev
Log:
Delay processing the JAXB configuration beans until they are actually requested.
Added:
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
(with props)
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=662837&r1=662836&r2=662837&view=diff
==============================================================================
---
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Tue Jun 3 09:56:26 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() {
Added:
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java?rev=662837&view=auto
==============================================================================
---
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
(added)
+++
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
Tue Jun 3 09:56:26 2008
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.configuration.spring;
+
+import java.io.StringReader;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.staxutils.StaxUtils;
+
+/**
+ *
+ */
+public final class JAXBBeanFactory {
+ private JAXBBeanFactory() {
+ //nothing
+ }
+
+ public static Object createJAXBBean(JAXBContext context,
+ String s,
+ Class<?> c) {
+
+ StringReader reader = new StringReader(s);
+ XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
+ Unmarshaller u;
+ try {
+ Object obj;
+ 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();
+
+ }
+ return obj;
+ } catch (JAXBException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
Propchange:
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java?rev=662837&r1=662836&r2=662837&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
(original)
+++
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
Tue Jun 3 09:56:26 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 {
