Author: dkulp
Date: Sat Jul 24 17:42:57 2010
New Revision: 978913
URL: http://svn.apache.org/viewvc?rev=978913&view=rev
Log:
Fix test failure
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
cxf/trunk/rt/databinding/jaxb/src/main/resources/org/apache/cxf/endpoint/dynamic/simple-binding.xjb
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=978913&r1=978912&r2=978913&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Sat Jul 24 17:42:57 2010
@@ -42,7 +42,9 @@ import java.util.logging.Logger;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
@@ -73,6 +75,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.staxutils.StaxUtils;
/**
* This class reads a WSDL and creates a dynamic client from it.
*
@@ -420,13 +423,15 @@ public class DynamicClientFactory {
compiler.parseSchema(key, el);
num++;
}
-
if (simpleBindingEnabled) {
String id = "/org/apache/cxf/endpoint/dynamic/simple-binding.xjb";
- LOG.info("Loading the JAXB 2.1 simple binding for client.");
- InputSource source = new
InputSource(getClass().getResourceAsStream(id));
- source.setSystemId(id);
- compiler.parseSchema(source);
+ LOG.fine("Loading the JAXB 2.1 simple binding for client.");
+ try {
+ Document doc =
StaxUtils.read(getClass().getResourceAsStream(id));
+ compiler.parseSchema(id, doc.getDocumentElement());
+ } catch (XMLStreamException e) {
+ LOG.log(Level.WARNING, "Could not parse simple-binding.xsd",
e);
+ }
}
}
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/resources/org/apache/cxf/endpoint/dynamic/simple-binding.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/resources/org/apache/cxf/endpoint/dynamic/simple-binding.xjb?rev=978913&r1=978912&r2=978913&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/main/resources/org/apache/cxf/endpoint/dynamic/simple-binding.xjb
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/main/resources/org/apache/cxf/endpoint/dynamic/simple-binding.xjb
Sat Jul 24 17:42:57 2010
@@ -23,7 +23,7 @@
-->
<jaxb:bindings
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0"
- xmlns:xjc= "http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
+ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
<jaxb:globalBindings generateElementProperty="false">
<xjc:simple />
